The paste event is completely inactive now.

Fixes dropzone#452
BKoehler · Jan 22, 2014 · 6b94cd1 · 6b94cd1
1 parent ce87fa1
commit 6b94cd1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 64 deletions.
diff --git a/downloads/dropzone-amd-module.js b/downloads/dropzone-amd-module.js
@@ -51,8 +51,7 @@ function mixin(obj) {
  * @api public
  */
 
-Emitter.prototype.on =
-Emitter.prototype.addEventListener = function(event, fn){
+Emitter.prototype.on = function(event, fn){
   this._callbacks = this._callbacks || {};
   (this._callbacks[event] = this._callbacks[event] || [])
     .push(fn);
@@ -78,7 +77,7 @@ Emitter.prototype.once = function(event, fn){
     fn.apply(this, arguments);
   }
 
-  on.fn = fn;
+  fn._off = on;
   this.on(event, on);
   return this;
 };
@@ -95,17 +94,8 @@ Emitter.prototype.once = function(event, fn){
 
 Emitter.prototype.off =
 Emitter.prototype.removeListener =
-Emitter.prototype.removeAllListeners =
-Emitter.prototype.removeEventListener = function(event, fn){
+Emitter.prototype.removeAllListeners = function(event, fn){
   this._callbacks = this._callbacks || {};
-
-  // all
-  if (0 == arguments.length) {
-    this._callbacks = {};
-    return this;
-  }
-
-  // specific event
   var callbacks = this._callbacks[event];
   if (!callbacks) return this;
 
@@ -116,14 +106,8 @@ Emitter.prototype.removeEventListener = function(event, fn){
   }
 
   // remove specific handler
-  var cb;
-  for (var i = 0; i < callbacks.length; i++) {
-    cb = callbacks[i];
-    if (cb === fn || cb.fn === fn) {
-      callbacks.splice(i, 1);
-      break;
-    }
-  }
+  var i = callbacks.indexOf(fn._off || fn);
+  if (~i) callbacks.splice(i, 1);
   return this;
 };
 
@@ -689,10 +673,6 @@ Emitter.prototype.hasListeners = function(event){
             },
             "dragend": function(e) {
               return _this.emit("dragend", e);
-            },
-            "paste": function(e) {
-              noPropagation(e);
-              return _this.paste(e);
             }
           }
         }
@@ -898,7 +878,6 @@ Emitter.prototype.hasListeners = function(event){
 
     Dropzone.prototype.paste = function(e) {
       var items, _ref;
-      return;
       if ((e != null ? (_ref = e.clipboardData) != null ? _ref.items : void 0 : void 0) == null) {
         return;
       }

diff --git a/downloads/dropzone-amd-module.min.js b/downloads/dropzone-amd-module.min.js
diff --git a/downloads/dropzone.js b/downloads/dropzone.js
@@ -242,8 +242,7 @@ function mixin(obj) {
  * @api public
  */
 
-Emitter.prototype.on =
-Emitter.prototype.addEventListener = function(event, fn){
+Emitter.prototype.on = function(event, fn){
   this._callbacks = this._callbacks || {};
   (this._callbacks[event] = this._callbacks[event] || [])
     .push(fn);
@@ -269,7 +268,7 @@ Emitter.prototype.once = function(event, fn){
     fn.apply(this, arguments);
   }
 
-  on.fn = fn;
+  fn._off = on;
   this.on(event, on);
   return this;
 };
@@ -286,17 +285,8 @@ Emitter.prototype.once = function(event, fn){
 
 Emitter.prototype.off =
 Emitter.prototype.removeListener =
-Emitter.prototype.removeAllListeners =
-Emitter.prototype.removeEventListener = function(event, fn){
+Emitter.prototype.removeAllListeners = function(event, fn){
   this._callbacks = this._callbacks || {};
-
-  // all
-  if (0 == arguments.length) {
-    this._callbacks = {};
-    return this;
-  }
-
-  // specific event
   var callbacks = this._callbacks[event];
   if (!callbacks) return this;
 
@@ -307,14 +297,8 @@ Emitter.prototype.removeEventListener = function(event, fn){
   }
 
   // remove specific handler
-  var cb;
-  for (var i = 0; i < callbacks.length; i++) {
-    cb = callbacks[i];
-    if (cb === fn || cb.fn === fn) {
-      callbacks.splice(i, 1);
-      break;
-    }
-  }
+  var i = callbacks.indexOf(fn._off || fn);
+  if (~i) callbacks.splice(i, 1);
   return this;
 };
 
@@ -891,10 +875,6 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
             },
             "dragend": function(e) {
               return _this.emit("dragend", e);
-            },
-            "paste": function(e) {
-              noPropagation(e);
-              return _this.paste(e);
             }
           }
         }
@@ -1100,7 +1080,6 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
     Dropzone.prototype.paste = function(e) {
       var items, _ref;
-      return;
       if ((e != null ? (_ref = e.clipboardData) != null ? _ref.items : void 0 : void 0) == null) {
         return;
       }

diff --git a/downloads/dropzone.min.js b/downloads/dropzone.min.js
diff --git a/lib/dropzone.js b/lib/dropzone.js
@@ -512,10 +512,6 @@
             },
             "dragend": function(e) {
               return _this.emit("dragend", e);
-            },
-            "paste": function(e) {
-              noPropagation(e);
-              return _this.paste(e);
             }
           }
         }
@@ -721,7 +717,6 @@
 
     Dropzone.prototype.paste = function(e) {
       var items, _ref;
-      return;
       if ((e != null ? (_ref = e.clipboardData) != null ? _ref.items : void 0 : void 0) == null) {
         return;
       }

diff --git a/src/dropzone.coffee b/src/dropzone.coffee
@@ -560,9 +560,11 @@ class Dropzone extends Em
             @drop e
           "dragend": (e) =>
             @emit "dragend", e
-          "paste": (e) =>
-            noPropagation e
-            @paste e
+
+          # This is disabled right now, because the browsers don't implement it properly.
+          # "paste": (e) =>
+          #   noPropagation e
+          #   @paste e
       }
     ]
 
@@ -710,8 +712,6 @@ class Dropzone extends Em
     return
 
   paste: (e) ->
-    return # This is disabled right now, because the browsers don't implement it properly.
-
     return unless e?.clipboardData?.items?
 
     @emit "paste", e