Don't trigger component:add when components are just moved. Fixes G…

…rapesJS#868
ryandeba · Feb 18, 2018 · 1fe03dd · 1fe03dd
1 parent 50cc585
commit 1fe03dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/src/asset_manager/view/FileUploader.js b/src/asset_manager/view/FileUploader.js
@@ -289,26 +289,6 @@ module.exports = Backbone.View.extend(
           videoNode.src = fileURL
            */
 
-            /*
-            // Show local video files, http://jsfiddle.net/dsbonev/cCCZ2/embedded/result,js,html,css/
-            var URL = window.URL || window.webkitURL
-            var file = this.files[0]
-             var type = file.type
-             var videoNode = document.createElement('video');
-             var canPlay = videoNode.canPlayType(type) // can use also for 'audio' types
-             if (canPlay === '') canPlay = 'no'
-             var message = 'Can play type "' + type + '": ' + canPlay
-             var isError = canPlay === 'no'
-             displayMessage(message, isError)
-
-             if (isError) {
-               return
-             }
-
-             var fileURL = URL.createObjectURL(file)
-             videoNode.src = fileURL
-            */
-
             // If it's an image, try to find its size
             if (type === 'image') {
               const data = {

diff --git a/src/dom_components/view/ComponentsView.js b/src/dom_components/view/ComponentsView.js
@@ -11,18 +11,17 @@ module.exports = Backbone.View.extend({
 
   /**
    * Add to collection
-   * @param  {Object} Model
-   *
-   * @return  void
+   * @param {Model} model
+   * @param {Collection} coll
+   * @param {Object} opts
    * @private
    * */
-  addTo(model) {
+  addTo(model, coll = {}, opts = {}) {
     const em = this.config.em;
     const i = this.collection.indexOf(model);
     this.addToCollection(model, null, i);
 
-    if (em && !model.opt.temporary) {
-      em.trigger('add:component', model); // @deprecated
+    if (em && !opts.temporary) {
       em.trigger('component:add', model);
     }
   },

diff --git a/src/utils/Sorter.js b/src/utils/Sorter.js
@@ -969,6 +969,7 @@ module.exports = Backbone.View.extend({
 
       if (!dropContent) {
         // Putting `avoidStore` here will make the UndoManager behave wrong
+        opts.temporary = 1;
         modelTemp = targetCollection.add({}, { ...opts });
 
         if (model) {