Merge branch 'develop' into feature/text-mode-js

# Conflicts: # dist/entry.css # dist/entry.js # dist/entry.min.js # src/css/components/playground.less
entrylabs · Aug 30, 2016 · f5cb3d5 · f5cb3d5
2 parents 2156259 + 10ec04c
commit f5cb3d5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/dist/entry.css b/dist/entry.css
@@ -4734,20 +4734,19 @@ input.entryObjectNameWorkspace:-moz-read-only {
   display: block !important;
   visibility: hidden;
 }
-.entryPlaygroundPictureWorkspace {
-  position: absolute;
-  top: 47px;
+.entryPlaygroundPicturePhone {
   margin-left: 0;
   height: 100%;
+  background-color: #ececec;
+}
+.entryPlaygroundPictureWorkspace {
+  position: absolute;
   left: 0;
   right: 0;
   bottom: 0;
   background-color: #ececec;
-}
-.entryPlaygroundPicturePhone {
+  top: 47px;
   margin-left: 0;
-  height: 100%;
-  background-color: #ececec;
 }
 .entryPlaygroundAddPicture {
   position: absolute;

diff --git a/dist/entry.js b/dist/entry.js
@@ -10442,6 +10442,7 @@ Entry.Painter2 = function(b) {
     this._pasteButton.style.display = this.clipboard ? "block" : "none";
   };
   b.file_save = function() {
+    this.lc.trigger("dispose");
     var a = this.lc.getImage().toDataURL();
     this.file_ = JSON.parse(JSON.stringify(this.file));
     Entry.dispatchEvent("saveCanvasImage", {file:this.file_, image:a});

diff --git a/dist/entry.min.js b/dist/entry.min.js
diff --git a/src/css/components/playground.less b/src/css/components/playground.less
@@ -348,21 +348,20 @@
     visibility: hidden;
 }
 
-.entryPlaygroundPictureWorkspace {
-    position: absolute;
-    top: 47px;
+.entryPlaygroundPicturePhone {
     margin-left: 0;
     height: 100%;
-    left: 0;
-    right: 0;
-    bottom: 0;
     background-color: #ececec;
 }
 
-.entryPlaygroundPicturePhone {
-    margin-left: 0;
-    height: 100%;
-    background-color: #ececec;
+.entryPlaygroundPictureWorkspace {
+   position: absolute;
+   left: 0;
+   right: 0;
+   bottom: 0;
+   background-color: #ececec;
+   top: 47px;
+   margin-left: 0;
 }
 
 .entryPlaygroundAddPicture {

diff --git a/src/painter2.js b/src/painter2.js
@@ -177,6 +177,7 @@ p.updateEditMenu = function() {
 };
 
 p.file_save = function() {
+    this.lc.trigger("dispose")
     var dataURL = this.lc.getImage().toDataURL();
     this.file_ = JSON.parse(JSON.stringify(this.file));
     Entry.dispatchEvent('saveCanvasImage',