From c1900a07f0fb1d98e2765283a0a0c789b756058e Mon Sep 17 00:00:00 2001
From: jdescottes <julian.descottes@gmail.com>
Date: Tue, 15 Jul 2014 00:31:24 +0200
Subject: [PATCH] Final fixes before new version

---
 src/css/settings.css                         |  3 ++-
 src/js/controller/settings/SaveController.js |  5 +++--
 src/js/model/Frame.js                        |  1 -
 src/templates/settings/save.html             | 10 +++++++---
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/css/settings.css b/src/css/settings.css
index 47cbffbf..e62f72cc 100644
--- a/src/css/settings.css
+++ b/src/css/settings.css
@@ -195,7 +195,8 @@
 }
 
 .save-status {
-  margin-bottom: 10px;
+  margin-top: 10px;
+  margin-bottom: -10px;
   vertical-align: middle;
   font-weight: normal;
   text-shadow: none;
diff --git a/src/js/controller/settings/SaveController.js b/src/js/controller/settings/SaveController.js
index 3f030a0f..0ac5b7f9 100644
--- a/src/js/controller/settings/SaveController.js
+++ b/src/js/controller/settings/SaveController.js
@@ -45,7 +45,8 @@
       this.saveOnlineButton.hide();
       $('.save-public-section').hide();
       this.saveOnlineStatus.html(pskl.utils.Template.get('save-please-login-partial'));
-      this.saveFileButton.get(0).classList.add('button-primary');
+    } else {
+      this.saveOnlineStatus.html(pskl.utils.Template.get('save-online-status-partial'));
     }
 
     this.updateLocalStatusFilename_();
@@ -176,6 +177,6 @@
       this.piskelName.classList.remove('piskel-name-saving');
     }
 
-    window.setTimeout($.publish.bind($, Events.HIDE_NOTIFICATION), 2000);
+    window.setTimeout($.publish.bind($, Events.HIDE_NOTIFICATION), 5000);
   };
 })();
\ No newline at end of file
diff --git a/src/js/model/Frame.js b/src/js/model/Frame.js
index ae417b66..7dfa3cf5 100644
--- a/src/js/model/Frame.js
+++ b/src/js/model/Frame.js
@@ -8,7 +8,6 @@
       this.id = __idCounter++;
       this.version = 0;
       this.pixels = ns.Frame.createEmptyPixelGrid_(width, height);
-      this.previousStates = [this.getPixels()];
       this.stateIndex = 0;
     } else {
       throw 'Bad arguments in pskl.model.Frame constructor : ' + width + ', ' + height;
diff --git a/src/templates/settings/save.html b/src/templates/settings/save.html
index 20e7be89..1dbc9821 100644
--- a/src/templates/settings/save.html
+++ b/src/templates/settings/save.html
@@ -17,18 +17,18 @@
     </div>
     <div class="settings-title">Save online</div>
     <div class="settings-item">
-      <input type="button" class="button button-primary" id="save-online-button" value="Upload" />
+      <input type="button" class="button button-primary" id="save-online-button" value="Save to your gallery" />
       <div id="save-online-status" class="save-status"></div>
     </div>
     <div class="settings-title">Save offline in Browser</div>
     <div class="settings-item">
-      <div id="save-browser-status" class="save-status">Your piskel will be saved locally and will only be accessible from this browser.</div>
       <input type="button" class="button button-primary" id="save-browser-button" value="Save in Browser" />
+      <div id="save-browser-status" class="save-status">Your piskel will be saved locally and will only be accessible from this browser.</div>
     </div>
     <div class="settings-title">Save offline as File</div>
     <div class="settings-item">
+      <input type="button" class="button button-primary" id="save-file-button" value="Save as File" />
       <div id="save-file-status" class="save-status"></div>
-      <input type="button" class="button" id="save-file-button" value="Save as File" />
     </div>
   </form>
 
@@ -36,6 +36,10 @@
     <span>Login to <a href="http://piskelapp.com" target="_blank">piskelapp.com</a> to save and share your sprites online !</span>
   </script>
 
+  <script type="text/template" id="save-online-status-partial">
+    <span>Your piskel will be stored online in your gallery.</span>
+  </script>
+
   <script type="text/template" id="save-file-status-template">
     <span>Your piskel will be downloaded as <span class="save-file-name">{{name}}<span></span>
   </script>