upgrade electron to 1.4.14

mbrainiac · mbrainiac · commit fa296d5b4b60 · 2017-01-17T17:44:21.000+07:00
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ Thumbs.db
 *.autogenerated
 tmp
 .electron-cache
+.vscode
diff --git a/app/lib/font-manager/linux/fontmanager.node b/app/lib/font-manager/linux/fontmanager.node
diff --git a/app/package.json b/app/package.json
@@ -2,7 +2,7 @@
   "name": "Pencil",
   "productName": "Pencil",
   "description": "An open-source GUI prototyping tool that is available for ALL platforms.",
-  "version": "3.0.0-rc.1",
+  "version": "3.0.0-rc.2",
   "author": {
     "name": "Evolus",
     "url": "http://evolus.vn",
@@ -48,7 +48,7 @@
     "nugget": "^2.0.0",
     "q": "^1.4.1",
     "rimraf": "^2.5.2",
-    "tmp": "0.0.28",
+    "tmp": "0.0.31",
     "unzip2": "^0.2.5"
   },
   "private": true
diff --git a/app/pencil-core/common/Canvas.js b/app/pencil-core/common/Canvas.js
@@ -2887,6 +2887,7 @@ Canvas.prototype.__dragover = function (event) {
 Canvas.prototype.__drop = function (event) {
     var thiz =this;
     var data = event.dataTransfer.getData("collectionId");
+    var data = nsDragAndDrop.getData("collectionId");
     var collections = CollectionManager.shapeDefinition.collections;
     // for (var i = 0; i < collections.length; i ++) {
     //     if (collections[i].id == data) {
diff --git a/app/pencil-core/common/nsDragAndDrop2.js b/app/pencil-core/common/nsDragAndDrop2.js
@@ -7,6 +7,18 @@ FlavourSet.prototype.appendFlavour = function (f) {
 };
 
 var nsDragAndDrop = {
+    setData(key, value) {
+        this.dragData[key] = value;
+    },
+
+    getData(key) {
+        return this.dragData[key];
+    },
+
+    dragStart: function(event) {
+        this.dragData = {};
+    },
+
     dragOver: function (event, observer) {
     },
 
@@ -16,12 +28,12 @@ var nsDragAndDrop = {
         //gives the observer the ability to actively tell that it accepts the drag, bybass type-based checking below
         if (observer.acceptsDataTransfer && observer.acceptsDataTransfer(event.dataTransfer)) return true;
         if (!observer.getSupportedFlavours) return false;
-        
+
         var flavours = observer.getSupportedFlavours().flavours;
         for (var i = 0; i < flavours.length; i ++) {
             var f = flavours[i];
-            var data = event.dataTransfer.getData(f);
-            if (data) {
+            var types = event.dataTransfer.types;
+            if (types && types.includes(f)) {
                 if (observer.onDragEnter) observer.onDragEnter(event);
                 event.stopPropagation();
                 return true;
@@ -49,6 +61,7 @@ var nsDragAndDrop = {
             for (var i = 0; i < flavours.length; i ++) {
                 var f = flavours[i];
                 var data = event.dataTransfer.getData(f);
+                var data = nsDragAndDrop.getData(f);
                 if (data) {
                     observer.onDrop(event, { data: data });
                     event.stopPropagation();
@@ -58,6 +71,5 @@ var nsDragAndDrop = {
         } else {
             observer.onDrop(event, event.dataTransfer);
         }
-
     }
 };
diff --git a/app/pencil-core/xferHelper/dragObservers.js b/app/pencil-core/xferHelper/dragObservers.js
@@ -31,6 +31,7 @@ ShapeDefDragObserver.prototype = {
         this.lastDragEnterExitEventTS = now;
 
         var defId = event.dataTransfer.getData("pencil/def");
+        var defId = nsDragAndDrop.getData("pencil/def");
 
         this.dragStart = false;
 
@@ -154,6 +155,7 @@ PrivateShapeDefDragObserver.prototype = {
         // }
 
         var defId = event.dataTransfer.getData("pencil/privatedef");
+        var defId = nsDragAndDrop.getData("pencil/privatedef");
 
         var def = PrivateCollectionManager.locateShapeDefinition(defId);
 
@@ -262,6 +264,7 @@ ShapeShortcutDragObserver.prototype = {
         this.lastDragEnterExitEventTS = now;
 
         var defId = event.dataTransfer.getData("pencil/shortcut");
+        var defId = nsDragAndDrop.getData("pencil/shortcut");
 
         var shortcut = CollectionManager.shapeDefinition.locateShortcut(defId);
         var def = shortcut.shape;
diff --git a/app/views/collections/BaseCollectionPane.js b/app/views/collections/BaseCollectionPane.js
@@ -30,6 +30,7 @@ function BaseCollectionPane() {
     }, this.clearTextButton);
 
     this.shapeList.addEventListener("dragstart", function (event) {
+        nsDragAndDrop.dragStart(event);
         var n = Dom.findUpwardForNodeWithData(Dom.getTarget(event), "_def");
         var def = n._def;
         thiz.addDefDataToDataTransfer(def, event);
diff --git a/app/views/collections/CollectionManagementDialog.js b/app/views/collections/CollectionManagementDialog.js
@@ -43,17 +43,21 @@ function CollectionManagementDialog (collectionPanel) {
     }, false);
 
     this.bind("dragstart", function (ev) {
+        nsDragAndDrop.dragStart(ev);
         var node = Dom.findUpwardForNodeWithData(event.target, "_collection");
         if (!node) return;
         ev.dataTransfer.setData("collectionId", node._collection.id);
         ev.dataTransfer.setData("dragType", "collection");
+        nsDragAndDrop.setData("collectionId", node._collection.id);
+        nsDragAndDrop.setData("dragType", "collection");
         if (this.currentDraggedObject) this.currentDraggedObject.removeAttribute("dragged");
         this.currentDraggedObject = node;
         this.currentDraggedObject.setAttribute("dragged", "true");
     }, this.collectionContainer);
 
     this.bind("dragover", function (ev) {
-        if (event.dataTransfer.getData("dragType") != "collection") return;
+        // if (event.dataTransfer.getData("dragType") != "collection") return;
+        if (nsDragAndDrop.getData("dragType") != "collection") return;
         if (this.hoverNode) {
             this.hoverNode.removeAttribute("hover");
             this.hoverNode = null;
@@ -67,14 +71,17 @@ function CollectionManagementDialog (collectionPanel) {
     }, this.collectionContainer);
 
     this.bind("drop", function (ev) {
-        if (event.dataTransfer.getData("dragType") != "collection") return;
+        // if (event.dataTransfer.getData("dragType") != "collection") return;
+        if (nsDragAndDrop.getData("dragType") != "collection") return;
+
         if (this.hoverNode) {
             this.hoverNode.removeAttribute("hover");
             this.hoverNode = null;
         }
         var node = Dom.findUpwardForNodeWithData(event.target, "_collection");
         if (!node) return;
         var draggedCollectionId = ev.dataTransfer.getData("collectionId");
+        var draggedCollectionId = nsDragAndDrop.getData("collectionId");
         var targetCollectionId = node._collection.id;
         if (node._collection.id != draggedCollectionId) {
             CollectionManager.reorderCollections(draggedCollectionId, targetCollectionId);
diff --git a/app/views/collections/CollectionPane.js b/app/views/collections/CollectionPane.js
@@ -34,11 +34,14 @@ CollectionPane.prototype.handleCollectionContextMenu = function (collection, eve
 CollectionPane.prototype.addDefDataToDataTransfer = function (def, event) {
     if (def.shape) {
         event.dataTransfer.setData("pencil/shortcut", def.id);
+        nsDragAndDrop.setData("pencil/shortcut", def.id);
     } else {
         event.dataTransfer.setData("pencil/def", def.id);
+        nsDragAndDrop.setData("pencil/def", def.id);
     }
     // event.dataTransfer.setData("pencil/def", def.id);
     event.dataTransfer.setData("collectionId", def.collection ? def.collection.id : 0);
+    nsDragAndDrop.setData("collectionId", def.collection ? def.collection.id : 0);
 };
 CollectionPane.prototype.getCollections = function () {
     return CollectionManager.shapeDefinition.collections;
diff --git a/app/views/common/PageListView.js b/app/views/common/PageListView.js
@@ -166,15 +166,20 @@ function PageListView() {
     }
 
     this.bind("dragstart", function (event) {
+        nsDragAndDrop.dragStart(event);
         var n = Dom.findUpwardForNodeWithData(Dom.getTarget(event), "_index");
         if (!n) return;
 
         event.dataTransfer.setDragImage(this.dndImage, 8, 8);
         event.dataTransfer.setData("dragType", "page");
         event.dataTransfer.setData("text/html", "");
+        nsDragAndDrop.setData("dragType", "page");
+        nsDragAndDrop.setData("text/html", "");
         if (n.__widget && n.__widget.page && n.__widget.page.thumbPath) {
             event.dataTransfer.setData("text/html", "");
             event.dataTransfer.setData("pencil/png", n.__widget.page.thumbPath);
+            nsDragAndDrop.setData("text/html", "");
+            nsDragAndDrop.setData("pencil/png", n.__widget.page.thumbPath);
         }
 
         if (this.currentDraggedObject) this.currentDraggedObject.removeAttribute("dragged");
@@ -183,7 +188,8 @@ function PageListView() {
     }, this.node());
 
     this.bind("drop", function (event) {
-        if (event.dataTransfer.getData("dragType") != "page") return;
+        // if (event.dataTransfer.getData("dragType") != "page") return;
+        if (nsDragAndDrop.getData("dragType") != "page") return;
         if (!this.lastDropCandidateObject || !this.currentDraggedObject) return;
 
         var pageId = findPageIdFromUINode(this.currentDraggedObject);
@@ -194,7 +200,8 @@ function PageListView() {
     }, this.node());
 
     this.bind("dragover", function (event) {
-        if (event.dataTransfer.getData("dragType") != "page") return;
+        // if (event.dataTransfer.getData("dragType") != "page") return;
+        if (nsDragAndDrop.getData("dragType") != "page") return;
         var container = Dom.findUpwardForNodeWithData(Dom.getTarget(event), "_isDropZone");
         if (!container) return;
 
@@ -269,6 +276,7 @@ PageListView.prototype.validateFilterBox = function() {
 }
 
 PageListView.prototype.filterPages = function() {
+    if (!this.controller.activePage) { return; }
     var filterName = this.controller.activePage.parentPage ? this.controller.activePage.parentPage.name : "Root";
     var value = this.filterCache[filterName];
 
diff --git a/app/views/tools/OpenClipartPane.js b/app/views/tools/OpenClipartPane.js
@@ -13,16 +13,20 @@ function OpenClipartPane() {
         }
     }
     this.shapeList.addEventListener("dragstart", function (event) {
+        nsDragAndDrop.dragStart(event);
         var n = Dom.findUpwardForNodeWithData(Dom.getTarget(event), "_def");
         var def = n._def;
         if (def._svg) {
             var svg = injectSvgInfo(def._svg);
             event.dataTransfer.setData("image/svg+xml", svg);
+            nsDragAndDrop.setData("image/svg+xml", svg);
         } else {
             event.dataTransfer.setData("pencil/png", def.src);
+            nsDragAndDrop.setData("pencil/png", def.src);
         }
 
         event.dataTransfer.setData("text/html", "");
+        nsDragAndDrop.setData("text/html", "");
         event.dataTransfer.setDragImage(thiz.dndImage, 8, 8);
         event.target.collection = def;
     });
diff --git a/app/yarn.lock b/app/yarn.lock
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock
