Permalink
Browse files

Merge branch 'dev-master' into dev-3.x

  • Loading branch information...
2 parents 49c1c1a + 744c726 commit 273bb8d3f98dbd907f4fc8982286f2c3daac8ce2 @ericf ericf committed Nov 19, 2012

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -32,7 +32,7 @@ var getCN = Y.ClassNameManager.getClassName,
L = Y.Lang,
node = Y.Node,
create = node.create,
- substitute = Y.substitute,
+ substitute = L.sub,
each = Y.each,
hasVal = Y.Array.hasValue,
iOf = Y.Array.indexOf,

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -32,7 +32,7 @@ var getCN = Y.ClassNameManager.getClassName,
L = Y.Lang,
node = Y.Node,
create = node.create,
- substitute = Y.substitute,
+ substitute = L.sub,
each = Y.each,
hasVal = Y.Array.hasValue,
iOf = Y.Array.indexOf,

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -9,7 +9,7 @@ var CONTENT_BOX = "contentBox",
HOST = "host",
RENDERED = "rendered",
getCN = Y.ClassNameManager.getClassName,
- substitute = Y.substitute,
+ substitute = Y.Lang.sub,
node = Y.Node,
create = node.create,
CALENDAR = 'calendar',
@@ -292,4 +292,5 @@ Y.extend(CalendarNavigator, Y.Plugin.Base, {
Y.namespace("Plugin").CalendarNavigator = CalendarNavigator;
+
}, '@VERSION@', {"requires": ["plugin", "classnamemanager", "datatype-date", "node", "substitute"], "skinnable": true});

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -9,7 +9,7 @@ var CONTENT_BOX = "contentBox",
HOST = "host",
RENDERED = "rendered",
getCN = Y.ClassNameManager.getClassName,
- substitute = Y.substitute,
+ substitute = Y.Lang.sub,
node = Y.Node,
create = node.create,
CALENDAR = 'calendar',
@@ -292,4 +292,5 @@ Y.extend(CalendarNavigator, Y.Plugin.Base, {
Y.namespace("Plugin").CalendarNavigator = CalendarNavigator;
+
}, '@VERSION@', {"requires": ["plugin", "classnamemanager", "datatype-date", "node", "substitute"], "skinnable": true});

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -11,7 +11,7 @@ YUI.add('uploader-flash', function (Y, NAME) {
*/
// Shorthands for external modules
-var substitute = Y.substitute,
+var substitute = Y.Lang.sub,
UploaderQueue = Y.Uploader.Queue,
getCN = Y.ClassNameManager.getClassName,
UPLOADER = 'uploader',

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -11,7 +11,7 @@ YUI.add('uploader-flash', function (Y, NAME) {
*/
// Shorthands for external modules
-var substitute = Y.substitute,
+var substitute = Y.Lang.sub,
UploaderQueue = Y.Uploader.Queue,
getCN = Y.ClassNameManager.getClassName,
UPLOADER = 'uploader',

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -11,7 +11,7 @@ YUI.add('uploader-html5', function (Y, NAME) {
*/
// Shorthands for the external modules
-var substitute = Y.substitute,
+var substitute = Y.Lang.sub,
UploaderQueue = Y.Uploader.Queue;
/**
@@ -344,46 +344,48 @@ Y.UploaderHTML5 = Y.extend( UploaderHTML5, Y.Widget, {
event.stopPropagation();
event.preventDefault();
-
- switch (event.type) {
- case "dragenter":
- this.fire("dragenter");
- break;
- case "dragover":
- this.fire("dragover");
- break;
- case "dragleave":
- this.fire("dragleave");
- break;
- case "drop":
-
- var newfiles = event._event.dataTransfer.files,
- parsedFiles = [],
- filterFunc = this.get("fileFilterFunction");
-
- if (filterFunc) {
- Y.each(newfiles, function (value) {
- var newfile = new Y.FileHTML5(value);
- if (filterFunc(newfile)) {
- parsedFiles.push(newfile);
- }
- });
- }
- else {
- Y.each(newfiles, function (value) {
- parsedFiles.push(new Y.FileHTML5(value));
- });
- }
-
- if (parsedFiles.length > 0) {
- var oldfiles = this.get("fileList");
- this.set("fileList",
- this.get("appendNewFiles") ? oldfiles.concat(parsedFiles) : parsedFiles);
- this.fire("fileselect", {fileList: parsedFiles});
- }
-
- this.fire("drop");
- break;
+
+ if (Y.Array.indexOf(event._event.dataTransfer.types, 'Files') > -1) {
+ switch (event.type) {
+ case "dragenter":
+ this.fire("dragenter");
+ break;
+ case "dragover":
+ this.fire("dragover");
+ break;
+ case "dragleave":
+ this.fire("dragleave");
+ break;
+ case "drop":
+
+ var newfiles = event._event.dataTransfer.files,
+ parsedFiles = [],
+ filterFunc = this.get("fileFilterFunction");
+
+ if (filterFunc) {
+ Y.each(newfiles, function (value) {
+ var newfile = new Y.FileHTML5(value);
+ if (filterFunc(newfile)) {
+ parsedFiles.push(newfile);
+ }
+ });
+ }
+ else {
+ Y.each(newfiles, function (value) {
+ parsedFiles.push(new Y.FileHTML5(value));
+ });
+ }
+
+ if (parsedFiles.length > 0) {
+ var oldfiles = this.get("fileList");
+ this.set("fileList",
+ this.get("appendNewFiles") ? oldfiles.concat(parsedFiles) : parsedFiles);
+ this.fire("fileselect", {fileList: parsedFiles});
+ }
+
+ this.fire("drop");
+ break;
+ }
}
},
Oops, something went wrong.

0 comments on commit 273bb8d

Please sign in to comment.