Skip to content

Commit

Permalink
add new event dialogOpen
Browse files Browse the repository at this point in the history
  • Loading branch information
@2betop
2betop committed Dec 19, 2014
1 parent e076358 commit 8cc6e83
Show file tree
Hide file tree
Showing 21 changed files with 73 additions and 31 deletions.
Binary file modified dist/Uploader.swf
View file
Binary file not shown.
8 changes: 6 additions & 2 deletions dist/webuploader.custom.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! WebUploader 0.1.5 */
/*! WebUploader 0.1.6 */


/**
Expand Down Expand Up @@ -539,7 +539,7 @@
/**
* @property {String} version 当前版本号。
*/
version: '0.1.5',
version: '0.1.6',

/**
* @property {jQuery|Zepto} $ 引用依赖的jQuery或者Zepto对象。
Expand Down Expand Up @@ -2021,6 +2021,9 @@
picker.on( 'select', function( files ) {
me.owner.request( 'add-file', [ files ]);
});
picker.on('open', function() {
me.owner.trigger('dialogOpen', picker.button);
});
picker.init();

me.pickers.push( picker );
Expand Down Expand Up @@ -4461,6 +4464,7 @@

label.on( 'click', function() {
input.trigger('click');
owner.trigger('open');
});

label.css({
Expand Down
4 changes: 2 additions & 2 deletions dist/webuploader.custom.min.js
View file

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions dist/webuploader.fis.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! WebUploader 0.1.5 */
/*! WebUploader 0.1.6 */


var jQuery = require('example:widget/ui/jquery/jquery.js')
Expand Down Expand Up @@ -211,7 +211,7 @@ return (function( root, factory ) {
/**
* @property {String} version 当前版本号。
*/
version: '0.1.5',
version: '0.1.6',

/**
* @property {jQuery|Zepto} $ 引用依赖的jQuery或者Zepto对象。
Expand Down Expand Up @@ -1895,6 +1895,9 @@ return (function( root, factory ) {
picker.on( 'select', function( files ) {
me.owner.request( 'add-file', [ files ]);
});
picker.on('open', function() {
me.owner.trigger('dialogOpen', picker.button);
});
picker.init();

me.pickers.push( picker );
Expand Down Expand Up @@ -4861,6 +4864,7 @@ return (function( root, factory ) {

label.on( 'click', function() {
input.trigger('click');
owner.trigger('open');
});

label.css({
Expand Down
7 changes: 5 additions & 2 deletions dist/webuploader.flashonly.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! WebUploader 0.1.5 */
/*! WebUploader 0.1.6 */


/**
Expand Down Expand Up @@ -236,7 +236,7 @@
/**
* @property {String} version 当前版本号。
*/
version: '0.1.5',
version: '0.1.6',

/**
* @property {jQuery|Zepto} $ 引用依赖的jQuery或者Zepto对象。
Expand Down Expand Up @@ -1718,6 +1718,9 @@
picker.on( 'select', function( files ) {
me.owner.request( 'add-file', [ files ]);
});
picker.on('open', function() {
me.owner.trigger('dialogOpen', picker.button);
});
picker.init();

me.pickers.push( picker );
Expand Down
2 changes: 1 addition & 1 deletion dist/webuploader.flashonly.min.js
View file

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions dist/webuploader.html5only.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! WebUploader 0.1.5 */
/*! WebUploader 0.1.6 */


/**
Expand Down Expand Up @@ -236,7 +236,7 @@
/**
* @property {String} version 当前版本号。
*/
version: '0.1.5',
version: '0.1.6',

/**
* @property {jQuery|Zepto} $ 引用依赖的jQuery或者Zepto对象。
Expand Down Expand Up @@ -1920,6 +1920,9 @@
picker.on( 'select', function( files ) {
me.owner.request( 'add-file', [ files ]);
});
picker.on('open', function() {
me.owner.trigger('dialogOpen', picker.button);
});
picker.init();

me.pickers.push( picker );
Expand Down Expand Up @@ -4776,6 +4779,7 @@

label.on( 'click', function() {
input.trigger('click');
owner.trigger('open');
});

label.css({
Expand Down
4 changes: 2 additions & 2 deletions dist/webuploader.html5only.min.js
View file

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions dist/webuploader.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! WebUploader 0.1.5 */
/*! WebUploader 0.1.6 */


/**
Expand Down Expand Up @@ -236,7 +236,7 @@
/**
* @property {String} version 当前版本号。
*/
version: '0.1.5',
version: '0.1.6',

/**
* @property {jQuery|Zepto} $ 引用依赖的jQuery或者Zepto对象。
Expand Down Expand Up @@ -1920,6 +1920,9 @@
picker.on( 'select', function( files ) {
me.owner.request( 'add-file', [ files ]);
});
picker.on('open', function() {
me.owner.trigger('dialogOpen', picker.button);
});
picker.init();

me.pickers.push( picker );
Expand Down Expand Up @@ -4886,6 +4889,7 @@

label.on( 'click', function() {
input.trigger('click');
owner.trigger('open');
});

label.css({
Expand Down
6 changes: 3 additions & 3 deletions dist/webuploader.min.js
View file

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions dist/webuploader.noimage.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! WebUploader 0.1.5 */
/*! WebUploader 0.1.6 */


/**
Expand Down Expand Up @@ -236,7 +236,7 @@
/**
* @property {String} version 当前版本号。
*/
version: '0.1.5',
version: '0.1.6',

/**
* @property {jQuery|Zepto} $ 引用依赖的jQuery或者Zepto对象。
Expand Down Expand Up @@ -1920,6 +1920,9 @@
picker.on( 'select', function( files ) {
me.owner.request( 'add-file', [ files ]);
});
picker.on('open', function() {
me.owner.trigger('dialogOpen', picker.button);
});
picker.init();

me.pickers.push( picker );
Expand Down Expand Up @@ -4369,6 +4372,7 @@

label.on( 'click', function() {
input.trigger('click');
owner.trigger('open');
});

label.css({
Expand Down
4 changes: 2 additions & 2 deletions dist/webuploader.noimage.min.js
View file

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions dist/webuploader.nolog.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! WebUploader 0.1.5 */
/*! WebUploader 0.1.6 */


/**
Expand Down Expand Up @@ -236,7 +236,7 @@
/**
* @property {String} version 当前版本号。
*/
version: '0.1.5',
version: '0.1.6',

/**
* @property {jQuery|Zepto} $ 引用依赖的jQuery或者Zepto对象。
Expand Down Expand Up @@ -1920,6 +1920,9 @@
picker.on( 'select', function( files ) {
me.owner.request( 'add-file', [ files ]);
});
picker.on('open', function() {
me.owner.trigger('dialogOpen', picker.button);
});
picker.init();

me.pickers.push( picker );
Expand Down Expand Up @@ -4886,6 +4889,7 @@

label.on( 'click', function() {
input.trigger('click');
owner.trigger('open');
});

label.css({
Expand Down
6 changes: 3 additions & 3 deletions dist/webuploader.nolog.min.js
View file

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion examples/image-upload/upload.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
chunked: false,
chunkSize: 512 * 1024,
server: '../../server/fileupload.php',
// runtimeOrder: 'flash',
runtimeOrder: 'flash',

// accept: {
// title: 'Images',
Expand Down Expand Up @@ -186,6 +186,10 @@
return !denied;
});

uploader.on('dialogOpen', function() {
console.log('here');
});

// uploader.on('filesQueued', function() {
// uploader.sort(function( a, b ) {
// if ( a.name < b.name )
Expand Down
2 changes: 2 additions & 0 deletions flash/src/com/FilePicker.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package com
public static var dispatches:Object = { // hash of events dispatched by this class
"Cancel": FilePickerEvent.CANCEL,
"Change": FilePickerEvent.SELECT,
"Open": FilePickerEvent.OPEN,
"MouseEnter": MouseEvent.ROLL_OVER,
"MouseLeave": MouseEvent.ROLL_OUT,
"MouseDown": MouseEvent.MOUSE_DOWN,
Expand Down Expand Up @@ -104,6 +105,7 @@ package com
_picker.addEventListener(Event.CANCEL, onDialogEvent);
_picker.addEventListener(Event.SELECT, onDialogEvent);
_picker.browse(_filters);
dispatchEvent(new FilePickerEvent(FilePickerEvent.OPEN))
}


Expand Down
1 change: 1 addition & 0 deletions flash/src/com/events/FilePickerEvent.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package com.events
{
public static const SELECT:String = 'filepickerselect';
public static const CANCEL:String = 'filepickercancel';
public static const OPEN:String = 'filepickeropen';

public var data:*;

Expand Down
8 changes: 6 additions & 2 deletions jekyll/js/webuploader.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! WebUploader 0.1.5 */
/*! WebUploader 0.1.6 */


/**
Expand Down Expand Up @@ -236,7 +236,7 @@
/**
* @property {String} version 当前版本号。
*/
version: '0.1.5',
version: '0.1.6',

/**
* @property {jQuery|Zepto} $ 引用依赖的jQuery或者Zepto对象。
Expand Down Expand Up @@ -1920,6 +1920,9 @@
picker.on( 'select', function( files ) {
me.owner.request( 'add-file', [ files ]);
});
picker.on('open', function() {
me.owner.trigger('dialogOpen', picker.button);
});
picker.init();

me.pickers.push( picker );
Expand Down Expand Up @@ -4886,6 +4889,7 @@

label.on( 'click', function() {
input.trigger('click');
owner.trigger('open');
});

label.css({
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "WebUploader",
"version": "0.1.5",
"version": "0.1.6",
"description": "WebUploader是一个简单的以Html5为主，Flash为辅的现代文件上传组件。在现代的浏览器里面能充分发挥html5的优势，同时又不摒弃主流IE浏览器，延用原来的Flash运行时。两套运行时，同样的调用方式，可供用户任意选用。WebUploader采用大文件分片并发上传，极大的提高了文件上传效率。",
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions src/runtime/html5/filepicker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ define([

label.on( 'click', function() {
input.trigger('click');
owner.trigger('open');
});

label.css({
Expand Down
3 changes: 3 additions & 0 deletions src/widgets/filepicker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ define([
picker.on( 'select', function( files ) {
me.owner.request( 'add-file', [ files ]);
});
picker.on('open', function() {
me.owner.trigger('dialogOpen', picker.button);
});
picker.init();

me.pickers.push( picker );
Expand Down

0 comments on commit 8cc6e83

Please sign in to comment.