Merge pull request #151 from juliandescottes/feature-save-panel

Feature save panel

Gruntfile.js

@@ -12,6 +12,7 @@
 
 module.exports = function(grunt) {
   var piskelScripts = require('./piskel-script-list.js').scripts;
+  var piskelStyles = require('./piskel-style-list.js').styles;
   var getGhostConfig = function (delay) {
     return {
       filesSrc : ['tests/integration/casperjs/*_test.js'],
@@ -68,12 +69,16 @@ module.exports = function(grunt) {
       local : getGhostConfig(50)
     },
     concat : {
-      options : {
+      js : {
-        separator : ';'
+        options : {
-      },
+          separator : ';'
-      dist : {
+        },
         src : piskelScripts,
         dest : 'build/piskel-packaged.js'
+      },
+      css : {
+        src : piskelStyles,
+        dest : 'build/piskel-style-packaged.css'
       }
     },
     uglify : {
@@ -171,8 +176,10 @@ module.exports = function(grunt) {
   // Compile JS code (eg verify JSDoc annotation and types, no actual minified code generated).
   grunt.registerTask('compile', ['closureCompiler:compile']);
 
+  grunt.registerTask('merge',  ['concat:js', 'concat:css', 'uglify']);
+
   // Validate & Build
-  grunt.registerTask('default', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint', 'concat', 'compile', 'uglify']);
+  grunt.registerTask('default', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint', 'concat:js', 'concat:css', 'compile', 'uglify']);
 
   // Start webserver
   grunt.registerTask('serve', ['connect:serve']);

css/forms.css

@@ -1,9 +1,16 @@
+.row {
+  display: block;
+}
+
 .textfield {
   background : black;
   border : 1px solid #888;
   border-radius : 2px;
   padding : 3px 10px;
   color : white;
+
+  box-sizing:border-box;
+  -moz-box-sizing:border-box;
 }
 
 .textfield[disabled=disabled] {

css/settings.css

@@ -8,6 +8,7 @@
   -webkit-transition: all 200ms ease-out;
   -moz-transition: all 200ms ease-out;
   -ms-transition: all 200ms ease-out;
+  -o-transition: all 200ms ease-out;
   transition: all 200ms ease-out;
 }
 
@@ -51,6 +52,10 @@
   text-shadow: 1px 1px #000;
 }
 
+.settings-section .button {
+  margin: 0;
+}
+
 .settings-title {
   margin-top: 20px;
   margin-bottom: 10px;
@@ -59,7 +64,9 @@
   padding-bottom: 5px;
 }
 
-.settings-item {}
+.settings-form-section {
+  margin-bottom: 10px;
+}
 
 .background-picker-wrapper {
   overflow: hidden;
@@ -152,7 +159,7 @@
 }
 
 .import-resize-field {
-  width: 30px;
+  width: 50px;
   margin-right: 8px;
   text-align: right;
 }
@@ -179,7 +186,26 @@
   text-shadow: none;
 }
 
+.save-field {
+  width: 100%;
+}
+
+#save-status {
+  margin-left: 10px;
+}
+.status {
+  height: 1.5rem;
+
+  word-break : break-all;
+  vertical-align: middle;
+  font-weight: normal;
+  text-shadow: none;
+}
+
 [name=smooth-resize-checkbox] {
   margin : 0 8px;
+}
+
+[name*=checkbox] {
   vertical-align: middle;
 }

css/tools.css

@@ -19,8 +19,10 @@
 .tool-icon.selected {
   cursor: default;
   background-color: #444;
-  border: 1px gold solid;
+  border: 3px solid gold;
-  margin: 0;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  background-position: 9px 9px;
 }
 
 .tool-icon:hover {
@@ -64,7 +66,6 @@
 
 .tool-icon.tool-move {
   background-image: url(../img/tools/hand.png);
-  background-position: 12px 12px;
   background-size: 24px 24px;
 }
 
@@ -74,13 +75,16 @@
   background-size: 24px 20px;
 }
 
+.tool-icon.tool-rectangle.selected, .tool-icon.tool-rectangle-select.selected {
+  background-position: 9px 11px;
+}
+
 .tool-icon.tool-shape-select {
   background-image: url(../img/tools/magicwand.png);
 }
 
 .tool-icon.tool-colorpicker {
   background-image: url(../img/tools/eyedropper.png);
-  background-position: 12px 12px;
   background-size: 23px 23px;
 }
 

index.html

@@ -7,20 +7,21 @@
   <meta name="description" content="">
   <meta name="author" content="Julian Descottes">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="stylesheet" type="text/css" href="css/reset.css">
-  <link rel="stylesheet" type="text/css" href="css/style.css">
-  <link rel="stylesheet" type="text/css" href="css/forms.css">
-  <link rel="stylesheet" type="text/css" href="css/settings.css">
-  <link rel="stylesheet" type="text/css" href="css/tools.css">
-  <link rel="stylesheet" type="text/css" href="css/cheatsheet.css">
-  <link rel="stylesheet" type="text/css" href="css/spectrum/spectrum.css"/>
-  <link rel="stylesheet" type="text/css" href="css/spectrum/spectrum-overrides.css"/>
-  <link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap.css">
-  <link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-tooltip-custom.css">
-  <link rel="stylesheet" type="text/css" href="css/preview-film-section.css">
-  <link rel="stylesheet" type="text/css" href="css/minimap.css">
 </head>
 <body>
+  <div 
+    id="loading-mask" 
+    style="
+    position:fixed;
+    top:0;right:0;bottom:0;left:0;
+    background:black;
+    opacity:1;
+    text-align:center;
+    z-index : 20000;
+    transition:opacity 0.5s;
+    color:white;">
+      <span style="top:45%">Loading pixels ...</span>
+  </div>
   <script type="text/javascript" src="js/lib/iframeLoader.js"></script>
   <div class="piskel-name-container">
     <input readonly id="piskel-name" type="text" value=""/>
@@ -53,6 +54,7 @@
             <iframe src="templates/settings/application.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
             <iframe src="templates/settings/export-gif.html" onload="iframeloader.onLoad(event)"  data-iframe-loader="store"></iframe>
             <iframe src="templates/settings/import.html" onload="iframeloader.onLoad(event)"  data-iframe-loader="store"></iframe>
+            <iframe src="templates/settings/save.html" onload="iframeloader.onLoad(event)"  data-iframe-loader="store"></iframe>
           </div>
         </div>
       </div>

js/app.js

@@ -10,11 +10,19 @@
   ns.app = {
 
     init : function () {
+      /**
+       * True when piskel is running in static mode (no back end needed).
+       * When started from APP Engine, appEngineToken_ (Boolean) should be set on window.pskl
+       */
+      this.isAppEngineVersion = !!pskl.appEngineToken_;
+
       this.shortcutService = new pskl.service.keyboard.ShortcutService();
       this.shortcutService.init();
 
       var size = this.readSizeFromURL_();
-      var piskel = new pskl.model.Piskel(size.width, size.height);
+
+      var descriptor = new pskl.model.piskel.Descriptor('New Piskel', '');
+      var piskel = new pskl.model.Piskel(size.width, size.height, descriptor);
 
       var layer = new pskl.model.Layer("Layer 1");
       var frame = new pskl.model.Frame(size.width, size.height);
@@ -64,31 +72,31 @@
       this.imageUploadService = new pskl.service.ImageUploadService();
       this.imageUploadService.init();
 
-
       this.cheatsheetService = new pskl.service.keyboard.CheatsheetService();
       this.cheatsheetService.init();
 
+      if (this.isAppEngineVersion) {
+        this.storageService = new pskl.service.AppEngineStorageService(this.piskelController);
+      } else {
+        this.storageService = new pskl.service.GithubStorageService(this.piskelController);
+      }
+      this.storageService.init();
+
 
       var drawingLoop = new pskl.rendering.DrawingLoop();
       drawingLoop.addCallback(this.render, this);
       drawingLoop.start();
 
-      this.initBootstrapTooltips_();
+      this.initTooltips_();
 
-      /**
+      if (this.isAppEngineVersion) {
-       * True when piskel is running in static mode (no back end needed).
-       * When started from APP Engine, appEngineToken_ (Boolean) should be set on window.pskl
-       */
-      this.isStaticVersion = !pskl.appEngineToken_;
-
-      if (this.isStaticVersion) {
-        this.finishInitStatic_();
-      } else {
         this.finishInitAppEngine_();
+      } else {
+        this.finishInitGithub_();
       }
     },
 
-    finishInitStatic_ : function () {
+    finishInitGithub_ : function () {
       var framesheetId = this.readFramesheetIdFromURL_();
       if (framesheetId) {
         $.publish(Events.SHOW_NOTIFICATION, [{
@@ -101,15 +109,16 @@
     },
 
     finishInitAppEngine_ : function () {
-      if (pskl.framesheetData_ && pskl.framesheetData_.content) {
+      if (pskl.appEnginePiskelData_ && pskl.appEnginePiskelData_.piskel) {
-        pskl.utils.serialization.Deserializer.deserialize(pskl.framesheetData_.content, function (piskel) {
+        pskl.utils.serialization.Deserializer.deserialize(pskl.appEnginePiskelData_.piskel, function (piskel) {
+          piskel.setDescriptor(pskl.appEnginePiskelData_.descriptor);
           pskl.app.piskelController.setPiskel(piskel);
-          pskl.app.animationController.setFPS(pskl.framesheetData_.fps);
+          pskl.app.animationController.setFPS(pskl.appEnginePiskelData_.fps);
         });
       }
     },
 
-    initBootstrapTooltips_ : function () {
+    initTooltips_ : function () {
       $('body').tooltip({
         selector: '[rel=tooltip]'
       });
@@ -122,8 +131,8 @@
     },
 
     readSizeFromURL_ : function () {
-      var sizeParam = this.readUrlParameter_("size"),
+      var sizeParam = this.readUrlParameter_("size");
-        size;
+      var size;
       // parameter expected as size=64x48 => size=widthxheight
       var parts = sizeParam.split("x");
       if (parts && parts.length == 2 && !isNaN(parts[0]) && !isNaN(parts[1])) {
@@ -148,13 +157,12 @@
     },
 
     readUrlParameter_ : function (paramName) {
-      var searchString = window.location.search.substring(1),
+      var searchString = window.location.search.substring(1);
-        i, val, params = searchString.split("&");
+      var params = searchString.split("&");
-
+      for (var i = 0; i < params.length; i++) {
-      for (i = 0; i < params.length; i++) {
+        var param = params[i].split("=");
-        val = params[i].split("=");
+        if (param[0] == paramName) {
-        if (val[0] == paramName) {
+          return window.unescape(param[1]);
-          return window.unescape(val[1]);
         }
       }
       return "";
@@ -181,65 +189,8 @@
       xhr.send();
     },
 
-    storeSheet : function (event) {
+    store : function (callbacks) {
-      if (this.isStaticVersion) {
+      this.storageService.store(callbacks);
-        this.storeSheetStatic_();
-      } else {
-        this.storeSheetAppEngine_();
-      }
-
-      if(event) {
-        event.stopPropagation();
-        event.preventDefault();
-      }
-      return false;
-    },
-
-    storeSheetStatic_ : function () {
-      var xhr = new XMLHttpRequest();
-      var formData = new FormData();
-      formData.append('framesheet_content', this.piskelController.serialize());
-      formData.append('fps_speed', $('#preview-fps').val());
-
-      xhr.open('POST', Constants.STATIC.URL.SAVE, true);
-
-      xhr.onload = function(e) {
-        if (this.status == 200) {
-          var baseUrl = window.location.href.replace(window.location.search, "");
-          window.location.href = baseUrl + "?frameId=" + this.responseText;
-        } else {
-          this.onerror(e);
-        }
-      };
-      xhr.onerror = function(e) {
-        $.publish(Events.SHOW_NOTIFICATION, [{"content": "Saving failed ("+this.status+")"}]);
-      };
-      xhr.send(formData);
-    },
-
-    storeSheetAppEngine_ : function () {
-      var xhr = new XMLHttpRequest();
-      var formData = new FormData();
-      formData.append('framesheet_content', this.piskelController.serialize());
-      formData.append('fps_speed', $('#preview-fps').val());
-      formData.append('name', $('#piskel-name').val());
-      formData.append('frames', this.piskelController.getFrameCount());
-      formData.append('preview', this.getFirstFrameAsPng());
-      formData.append('framesheet', this.getFramesheetAsPng());
-
-      xhr.open('POST', Constants.APPENGINE.URL.SAVE, true);
-
-      xhr.onload = function(e) {
-        if (this.status == 200) {
-          $.publish(Events.SHOW_NOTIFICATION, [{"content": "Successfully saved !"}]);
-        } else {
-          this.onerror(e);
-        }
-      };
-      xhr.onerror = function(e) {
-        $.publish(Events.SHOW_NOTIFICATION, [{"content": "Saving failed ("+this.status+")"}]);
-      };
-      xhr.send(formData);
     },
 
     getFirstFrameAsPng : function () {

js/controller/DrawingController.js

@@ -63,7 +63,8 @@
   ns.DrawingController.prototype.initMouseBehavior = function() {
     var body = $('body');
     this.container.mousedown($.proxy(this.onMousedown_, this));
-    this.container.mousemove($.proxy(this.onMousemove_, this));
+    this.container.mouseenter($.proxy(this.onMouseenter_, this));
+    this.container.mouseleave($.proxy(this.onMouseleave_, this));
 
     if (pskl.utils.UserAgent.isChrome) {
       this.container.on('mousewheel', $.proxy(this.onMousewheel_, this));
@@ -82,7 +83,7 @@
       window.clearInterval(this.resizeTimer);
     }
     this.resizeTimer = window.setTimeout($.proxy(this.afterWindowResize_, this), 200);
-  },
+  };
 
   ns.DrawingController.prototype.afterWindowResize_ = function () {
     var initialWidth = this.compositeRenderer.getDisplaySize().width;
@@ -93,7 +94,7 @@
     this.compositeRenderer.setZoom(newZoom);
 
     $.publish(Events.ZOOM_CHANGED);
-  },
+  };
 
   /**
    * @private
@@ -102,7 +103,7 @@
     if(settingsName == pskl.UserSettings.SHOW_GRID) {
       console.warn('DrawingController:onUserSettingsChange_ not implemented !');
     }
-  },
+  };
 
   ns.DrawingController.prototype.onFrameSizeChanged_ = function () {
     this.compositeRenderer.setDisplaySize(this.getContainerWidth_(), this.getContainerHeight_());
@@ -111,6 +112,21 @@
     $.publish(Events.ZOOM_CHANGED);
   };
 
+  /**
+   * @private
+   */
+  ns.DrawingController.prototype.onMouseenter_ = function (event) {
+    this.container.bind('mousemove', $.proxy(this.onMousemove_, this));
+  };
+
+  /**
+   * @private
+   */
+  ns.DrawingController.prototype.onMouseleave_ = function (event) {
+    this.container.unbind('mousemove');
+    this.currentToolBehavior.hideHighlightedPixel(this.overlayFrame);
+  };
+
   /**
    * @private
    */
@@ -124,6 +140,7 @@
       }
     } else {
       this.isClicked = true;
+      this.currentToolBehavior.hideHighlightedPixel(this.overlayFrame);
 
       this.currentToolBehavior.applyToolAt(
         coords.x,

js/controller/NotificationController.js

@@ -15,6 +15,8 @@
    * @private
    */
   ns.NotificationController.prototype.displayMessage_ = function (evt, messageInfo) {
+    this.removeMessage_();
+
     var message = document.createElement('div');
     message.id = "user-message";
     message.className = "user-message";

js/controller/PreviewFilmController.js

@@ -180,7 +180,7 @@
     }
     var tileCount = document.createElement("div");
     tileCount.className = "tile-overlay tile-count";
-    tileCount.innerHTML = tileNumber;
+    tileCount.innerHTML = tileNumber + 1;
     previewTileRoot.appendChild(tileCount);
 
 

js/controller/settings/ImportController.js

@@ -154,7 +154,9 @@
         var frame = pskl.utils.FrameUtils.createFromImage(image);
 
         var layer = pskl.model.Layer.fromFrames('Layer 1', [frame]);
-        var piskel = pskl.model.Piskel.fromLayers([layer]);
+
+        var descriptor = new pskl.model.piskel.Descriptor('Imported piskel', '');
+        var piskel = pskl.model.Piskel.fromLayers([layer], descriptor);
 
         pskl.app.piskelController.setPiskel(piskel);
         pskl.app.animationController.setFPS(Constants.DEFAULT.FPS);

js/controller/settings/SaveController.js

@@ -0,0 +1,75 @@
+(function () {
+  var ns = $.namespace('pskl.controller.settings');
+
+  ns.SaveController = function (piskelController) {
+    this.piskelController = piskelController;
+  };
+
+  /**
+   * @public
+   */
+  ns.SaveController.prototype.init = function () {
+    this.saveForm = $('form[name=save-form]');
+    this.nameInput =  $('#save-name');
+    this.descriptionInput = $('#save-description');
+    this.isPublicCheckbox = $('input[name=save-public-checkbox]');
+    this.saveButton = $('#save-button');
+    this.status = $('#save-status');
+
+    var descriptor = this.piskelController.piskel.getDescriptor();
+    this.nameInput.val(descriptor.name);
+    this.descriptionInput.val(descriptor.description);
+
+    this.isPublicCheckbox.prop('checked', descriptor.isPublic);
+
+    if (!pskl.app.isAppEngineVersion) {
+      this.nameInput.attr('disabled', 'disabled');
+      this.descriptionInput.attr('disabled', 'disabled');
+      this.isPublicCheckbox.attr('disabled', 'disabled');
+    }
+
+    this.saveForm.submit(this.onSaveFormSubmit_.bind(this));
+  };
+
+  ns.SaveController.prototype.onSaveFormSubmit_ = function (evt) {
+    evt.preventDefault();
+    evt.stopPropagation();
+
+    var name = this.nameInput.val();
+    var description = this.descriptionInput.val();
+    var isPublic = !!this.isPublicCheckbox.prop('checked');
+
+    var descriptor = new pskl.model.piskel.Descriptor(name, description, isPublic);
+    this.piskelController.piskel.setDescriptor(descriptor);
+
+    this.beforeSaving_();
+    pskl.app.store({
+      success : this.onSaveSuccess_.bind(this),
+      error : this.onSaveError_.bind(this),
+      after : this.afterSaving_.bind(this)
+    });
+  };
+
+  ns.SaveController.prototype.beforeSaving_ = function () {
+    this.saveButton.attr('disabled', true);
+    this.status.html('Saving ...');
+    $('.piskel-name').get(0).classList.add('piskel-name-saving');
+  };
+
+  ns.SaveController.prototype.onSaveSuccess_ = function () {
+    $.publish(Events.CLOSE_SETTINGS_DRAWER);
+    $.publish(Events.SHOW_NOTIFICATION, [{"content": "Successfully saved !"}]);
+  };
+
+  ns.SaveController.prototype.onSaveError_ = function (status) {
+    $.publish(Events.SHOW_NOTIFICATION, [{"content": "Saving failed ("+status+")"}]);
+  };
+
+  ns.SaveController.prototype.afterSaving_ = function () {
+    this.saveButton.attr('disabled', false);
+    this.status.html('');
+    $('.piskel-name').get(0).classList.remove('piskel-name-saving');
+
+    window.setTimeout($.publish.bind($, Events.HIDE_NOTIFICATION), 2000);
+  };
+})();

js/controller/settings/SettingsController.js

@@ -13,6 +13,10 @@
     'import' : {
       template : 'templates/settings/import.html',
       controller : ns.ImportController
+    },
+    'save' : {
+      template : 'templates/settings/save.html',
+      controller : ns.SaveController
     }
   };
 

js/drawingtools/BaseTool.js

@@ -31,6 +31,15 @@
     }
   };
 
+  ns.BaseTool.prototype.hideHighlightedPixel = function(overlay) {
+    if (this.highlightedPixelRow !== null && this.highlightedPixelCol !== null) {
+      overlay.setPixel(this.highlightedPixelCol, this.highlightedPixelRow, Constants.TRANSPARENT_COLOR);
+      this.highlightedPixelRow = null;
+      this.highlightedPixelCol = null;
+    }
+  };
+
+
   ns.BaseTool.prototype.releaseToolAt = function(col, row, color, frame, overlay, event) {};
 
   /**

js/drawingtools/selectiontools/BaseSelect.js

@@ -70,6 +70,9 @@
     }
   };
 
+  ns.BaseSelect.prototype.hideHighlightedPixel = function () {
+    // not implemented for selection tools
+  };
 
   /**
    * If we mouseover the selection draw inside the overlay frame, show the 'move' cursor

js/lib/iframeLoader.js

@@ -37,7 +37,11 @@
   var storeFrame = function (iframe) {
     var script=document.createElement("script");
     script.setAttribute("type", "text/html");
-    script.setAttribute("id", iframe.getAttribute("src"));
+    if (window.pskl && window.pskl.appEngineToken_) {
+      script.setAttribute("id", iframe.getAttribute("src").replace('../',''));
+    } else {
+      script.setAttribute("id", iframe.getAttribute("src"));
+    }
     script.innerHTML = iframe.contentWindow.document.body.innerHTML;
     iframe.parentNode.removeChild(iframe);
     document.body.appendChild(script);

js/model/Piskel.js

@@ -5,9 +5,11 @@
    * @constructor
    * @param {Number} width
    * @param {Number} height
+   * @param {String} name
+   * @param {String} description
    */
-  ns.Piskel = function (width, height) {
+  ns.Piskel = function (width, height, descriptor) {
-    if (width && height) {
+    if (width && height && descriptor) {
       /** @type {Array} */
       this.layers = [];
 
@@ -16,6 +18,8 @@
 
       /** @type {Number} */
       this.height = height;
+
+      this.descriptor = descriptor;
     } else {
       throw 'Missing arguments in Piskel constructor : ' + Array.prototype.join.call(arguments, ",");
     }
@@ -27,11 +31,11 @@
    * @param  {Array<pskl.model.Layer>} layers
    * @return {pskl.model.Piskel}
    */
-  ns.Piskel.fromLayers = function (layers) {
+  ns.Piskel.fromLayers = function (layers, descriptor) {
     var piskel = null;
     if (layers.length > 0 && layers[0].length() > 0) {
       var sampleFrame = layers[0].getFrameAt(0);
-      piskel = new pskl.model.Piskel(sampleFrame.getWidth(), sampleFrame.getHeight());
+      piskel = new pskl.model.Piskel(sampleFrame.getWidth(), sampleFrame.getHeight(), descriptor);
       layers.forEach(piskel.addLayer.bind(piskel));
     } else {
       throw 'Piskel.fromLayers expects array of non empty pskl.model.Layer as first argument';
@@ -96,4 +100,13 @@
     this.layers.splice(index, 1);
   };
 
+  ns.Piskel.prototype.getDescriptor = function () {
+    return this.descriptor;
+  };
+
+  ns.Piskel.prototype.setDescriptor = function (descriptor) {
+    this.descriptor = descriptor;
+    var appEngineEditorHeader = $('.piskel-name').html(this.descriptor.name);
+  };
+
 })();

js/model/piskel/Descriptor.js

@@ -0,0 +1,9 @@
+(function () {
+  var ns = $.namespace('pskl.model.piskel');
+
+  ns.Descriptor = function (name, description, isPublic) {
+    this.name = name;
+    this.description = description;
+    this.isPublic = isPublic;
+  };
+})();

js/service/AppEngineStorageService.js

@@ -0,0 +1,49 @@
+(function () {
+  var ns = $.namespace('pskl.service');
+
+  ns.AppEngineStorageService = function (piskelController) {
+    this.piskelController = piskelController;
+  };
+
+  ns.AppEngineStorageService.prototype.init = function () {};
+
+  ns.AppEngineStorageService.prototype.store = function (callbacks) {
+    var formData = this.prepareFormData_();
+
+    var xhr = new XMLHttpRequest();
+    xhr.open('POST', Constants.APPENGINE.URL.SAVE, true);
+
+    xhr.onload = function(e) {
+      if (this.status == 200) {
+        callbacks.success();
+        callbacks.after();
+      } else {
+        this.onerror(e);
+      }
+    };
+    xhr.onerror = function(e) {
+      callbacks.error(this.status);
+      callbacks.after();
+    };
+    xhr.send(formData);
+  };
+
+  ns.AppEngineStorageService.prototype.prepareFormData_ = function () {
+    var piskel = this.piskelController.piskel;
+    var descriptor = piskel.getDescriptor();
+
+    var formData = new FormData();
+    formData.append('framesheet', this.piskelController.serialize());
+    formData.append('fps', this.piskelController.getFPS());
+    formData.append('name', descriptor.name);
+    formData.append('description', descriptor.description);
+    if (descriptor.isPublic) {
+      formData.append('public', true);
+    }
+    formData.append('frames', this.piskelController.getFrameCount());
+    formData.append('first_frame_as_png', pskl.app.getFirstFrameAsPng());
+    formData.append('framesheet_as_png', pskl.app.getFramesheetAsPng());
+
+    return formData;
+  };
+})();

js/service/GithubStorageService.js

@@ -0,0 +1,31 @@
+(function () {
+  var ns = $.namespace('pskl.service');
+
+  ns.GithubStorageService = function (piskelController) {
+    this.piskelController = piskelController;
+  };
+
+  ns.GithubStorageService.prototype.init = function () {};
+
+  ns.GithubStorageService.prototype.store = function (callbacks) {
+    var xhr = new XMLHttpRequest();
+    var formData = new FormData();
+    formData.append('framesheet_content', this.piskelController.serialize());
+    formData.append('fps_speed', this.piskelController.getFPS());
+
+    xhr.open('POST', Constants.STATIC.URL.SAVE, true);
+
+    xhr.onload = function(e) {
+      if (this.status == 200) {
+        var baseUrl = window.location.href.replace(window.location.search, "");
+        window.location.href = baseUrl + "?frameId=" + this.responseText;
+      } else {
+        this.onerror(e);
+      }
+    };
+    xhr.onerror = function(e) {
+      $.publish(Events.SHOW_NOTIFICATION, [{"content": "Saving failed ("+this.status+")"}]);
+    };
+    xhr.send(formData);
+  };
+})();

js/service/HistoryService.js

@@ -2,11 +2,13 @@
   var ns = $.namespace("pskl.service");
   ns.HistoryService = function (piskelController) {
     this.piskelController = piskelController;
+    this.saveState__b = this.saveState.bind(this);
   };
 
   ns.HistoryService.prototype.init = function () {
 
-    $.subscribe(Events.TOOL_RELEASED, this.saveState.bind(this));
+    $.subscribe(Events.PISKEL_RESET, this.saveState__b);
+    $.subscribe(Events.TOOL_RELEASED, this.saveState__b);
 
     pskl.app.shortcutService.addShortcut('ctrl+Z', this.undo.bind(this));
     pskl.app.shortcutService.addShortcut('ctrl+Y', this.redo.bind(this));
@@ -18,12 +20,16 @@
 
   ns.HistoryService.prototype.undo = function () {
     this.piskelController.getCurrentFrame().loadPreviousState();
+    $.unsubscribe(Events.PISKEL_RESET, this.saveState__b);
     $.publish(Events.PISKEL_RESET);
+    $.subscribe(Events.PISKEL_RESET, this.saveState__b);
   };
 
   ns.HistoryService.prototype.redo = function () {
     this.piskelController.getCurrentFrame().loadNextState();
+    $.unsubscribe(Events.PISKEL_RESET, this.saveState__b);
     $.publish(Events.PISKEL_RESET);
+    $.subscribe(Events.PISKEL_RESET, this.saveState__b);
   };
 
 })();

js/service/LocalStorageService.js

@@ -45,6 +45,7 @@
    */
   ns.LocalStorageService.prototype.restoreFromLocalStorage_ = function() {
     var framesheet = JSON.parse(window.localStorage.snapShot);
+
     pskl.utils.serialization.Deserializer.deserialize(framesheet, function (piskel) {
       pskl.app.piskelController.setPiskel(piskel);
     });

js/service/keyboard/ShortcutService.js

@@ -54,28 +54,36 @@
    * @private
    */
   ns.ShortcutService.prototype.onKeyUp_ = function(evt) {
-    // jquery names FTW ...
+    if (!this.isInInput_(evt)) {
-    var keycode = evt.which;
+      // jquery names FTW ...
-    var charkey = pskl.service.keyboard.KeycodeTranslator.toChar(keycode);
+      var keycode = evt.which;
+      var targetTagName = evt.target.nodeName.toUpperCase();
+      var charkey = pskl.service.keyboard.KeycodeTranslator.toChar(keycode);
 
-    var keyShortcuts = this.shortcuts_[charkey];
+      var keyShortcuts = this.shortcuts_[charkey];
-    if(keyShortcuts) {
+      if(keyShortcuts) {
-      var cb;
+        var cb;
-      if (this.isCtrlKeyPressed_(evt)) {
+        if (this.isCtrlKeyPressed_(evt)) {
-        cb = keyShortcuts.ctrl;
+          cb = keyShortcuts.ctrl;
-      } else if (this.isShiftKeyPressed_(evt)) {
+        } else if (this.isShiftKeyPressed_(evt)) {
-        cb = keyShortcuts.shift;
+          cb = keyShortcuts.shift;
-      } else {
+        } else {
-        cb = keyShortcuts.normal;
+          cb = keyShortcuts.normal;
-      }
+        }
 
-      if(cb) {
+        if(cb) {
-        cb(charkey);
+          cb(charkey);
-        evt.preventDefault();
+          evt.preventDefault();
+        }
       }
     }
   };
 
+  ns.ShortcutService.prototype.isInInput_ = function (evt) {
+    var targetTagName = evt.target.nodeName.toUpperCase();
+    return targetTagName === 'INPUT' || targetTagName === 'TEXTAREA';
+  };
+
   ns.ShortcutService.prototype.isCtrlKeyPressed_ = function (evt) {
     return this.isMac_() ? evt.metaKey : evt.ctrlKey;
   };

js/utils/serialization/Deserializer.js

@@ -23,7 +23,9 @@
   ns.Deserializer.prototype.deserialize = function () {
     var data = this.data_;
     var piskelData = data.piskel;
-    this.piskel_ = new pskl.model.Piskel(piskelData.width, piskelData.height);
+
+    var descriptor = new pskl.model.piskel.Descriptor('Deserialized piskel', '');
+    this.piskel_ = new pskl.model.Piskel(piskelData.width, piskelData.height, descriptor);
 
     this.layersToLoad_ = piskelData.layers.length;
 

js/utils/serialization/backward/Deserializer_v0.js

@@ -11,8 +11,9 @@
     var frames = pixelGrids.map(function (grid) {
       return pskl.model.Frame.fromPixelGrid(grid);
     });
+    var descriptor = new pskl.model.piskel.Descriptor('Deserialized piskel', '');
     var layer = pskl.model.Layer.fromFrames('Layer 1', frames);
 
-    this.callback_(pskl.model.Piskel.fromLayers([layer]));
+    this.callback_(pskl.model.Piskel.fromLayers([layer], descriptor));
   };
 })();

js/utils/serialization/backward/Deserializer_v1.js

@@ -8,7 +8,8 @@
 
   ns.Deserializer_v1.prototype.deserialize = function () {
     var piskelData = this.data_.piskel;
-    var piskel = new pskl.model.Piskel(piskelData.width, piskelData.height);
+    var descriptor = new pskl.model.piskel.Descriptor('Deserialized piskel', '');
+    var piskel = new pskl.model.Piskel(piskelData.width, piskelData.height, descriptor);
 
     piskelData.layers.forEach(function (serializedLayer) {
       var layer = this.deserializeLayer(serializedLayer);

piskel-boot.js

@@ -1,28 +1,61 @@
 (function () {
 
+  window.onPiskelReady = function () {
+    var loadingMask = document.getElementById('loading-mask');
+    loadingMask.style.opacity = 0;
+    window.setTimeout(function () {loadingMask.parentNode.removeChild(loadingMask);}, 600)
+    pskl.app.init();
+    // cleanup
+    delete window.exports;
+    delete window.loadDebugScripts;
+    delete window.done;
+  };
+
+  var prefixPath = function (path) {
+    if (window.pskl && window.pskl.appEngineToken_) {
+      return '../' + path;
+    } else {
+      return path;
+    }
+  };
+
   var loadScript = function (src, callback) {
+    src = prefixPath(src);
     var script = window.document.createElement('script');
     script.setAttribute('src',src);
     script.setAttribute('onload',callback);
     window.document.body.appendChild(script);
   };
 
+  var loadStyle = function (src) {
+    src = prefixPath(src);
+    var link = document.createElement('link');
+    link.setAttribute('href', src);
+    link.setAttribute('rel', 'stylesheet');
+    link.setAttribute('type', 'text/css');
+    document.head.appendChild(link);
+  };
+
   if (window.location.href.indexOf("debug") != -1) {
     window.exports = {};
     var scriptIndex = 0;
     window.loadNextScript = function () {
       if (scriptIndex == window.exports.scripts.length) {
-        pskl.app.init();
+        window.onPiskelReady();
-        // cleanup
-        delete window.exports;
-        delete window.loadDebugScripts;
-        delete window.done;
       } else {
         loadScript(window.exports.scripts[scriptIndex], "loadNextScript()");
         scriptIndex ++;
       }
     };
     loadScript("piskel-script-list.js", "loadNextScript()");
+
+    window.loadStyles = function () {
+      var styles = window.exports.styles;
+      for (var i = 0 ; i < styles.length ; i++) {
+        loadStyle(styles[i]);
+      }
+    };
+    loadScript("piskel-style-list.js", "loadStyles()");
   } else {
     var script;
     if (window.location.href.indexOf("pack") != -1) {
@@ -30,10 +63,12 @@
     } else {
       script = "build/piskel-packaged-min.js";
     }
+    loadStyle('build/piskel-style-packaged.css');
+
     var loaderInterval = window.setInterval(function () {
       if (document.querySelectorAll("[data-iframe-loader]").length === 0) {
         window.clearInterval(loaderInterval);
-        loadScript(script, "pskl.app.init()");
+        loadScript(script, "onPiskelReady()");
       } else {
         console.log("waiting for templates to load ....");
       }

piskel-script-list.js

@@ -37,6 +37,7 @@ exports.scripts = [
   // Models
   "js/model/Frame.js",
   "js/model/Layer.js",
+  "js/model/piskel/Descriptor.js",
   "js/model/Piskel.js",
 
   // Selection
@@ -69,12 +70,15 @@ exports.scripts = [
   // Settings sub-controllers
   "js/controller/settings/ApplicationSettingsController.js",
   "js/controller/settings/GifExportController.js",
+  "js/controller/settings/SaveController.js",
   "js/controller/settings/ImportController.js",
   // Settings controller
   "js/controller/settings/SettingsController.js",
 
   // Services
   "js/service/LocalStorageService.js",
+  "js/service/GithubStorageService.js",
+  "js/service/AppEngineStorageService.js",
   "js/service/HistoryService.js",
   "js/service/keyboard/ShortcutService.js",
   "js/service/keyboard/KeycodeTranslator.js",

piskel-style-list.js

@@ -0,0 +1,16 @@
+// This list is used both by the grunt build and index.html (in debug mode)
+
+exports.styles = [
+  "css/reset.css",
+  "css/style.css",
+  "css/forms.css",
+  "css/settings.css",
+  "css/tools.css",
+  "css/cheatsheet.css",
+  "css/spectrum/spectrum.css",
+  "css/spectrum/spectrum-overrides.css",
+  "css/bootstrap/bootstrap.css",
+  "css/bootstrap/bootstrap-tooltip-custom.css",
+  "css/preview-film-section.css",
+  "css/minimap.css"
+];

templates/settings.html

@@ -1,4 +1,11 @@
 <div class="vertical-centerer">
+  <div
+    data-setting="save"
+    class="tool-icon save-icon"
+    title="Save to gallery"
+    rel="tooltip" data-placement="left" >
+  </div>
+
   <div
     data-setting="user"
     class="tool-icon gear-icon"
@@ -13,20 +20,6 @@
     rel="tooltip" data-placement="left">
   </div>
 
-<!--   <a
-    class="tool-icon gallery-icon"
-    title="Visit gallery"
-    href="http://juliandescottes.github.io/piskel-website/"
-    rel="tooltip" data-placement="left" target="_blank">
-  </a> -->
-
-  <div
-    class="tool-icon save-icon"
-    title="Save to gallery"
-    onclick="pskl.app.storeSheet()"
-    rel="tooltip" data-placement="left" >
-  </div>
-
   <div
     data-setting="gif"
     class="tool-icon upload-cloud-icon"

templates/settings/export-gif.html

@@ -11,7 +11,6 @@
       </script>
       <div class="gif-export-radio-group"></div>
       <input type="submit" class="button button-primary gif-upload-button" value="Upload" />
-      <button type="button" class="button gif-render-button">Render</button>
     </form>
     <div class="gif-export-preview"></div>
   </div>

templates/settings/save.html

@@ -0,0 +1,22 @@
+<div class="settings-section">
+  <div class="settings-title">Save</div>
+  <div class="settings-item">
+    <form action="" method="POST" name="save-form">
+      <div class="settings-form-section">
+        <label class="row">Title : </label>
+        <input id="save-name" type="text" class="save-field textfield"/>
+      </div>
+      <div class="settings-form-section">
+        <label class="row">Description :</label>
+        <textarea id="save-description" class="save-field textfield" placeholder="Your piskel in a few words"></textarea>
+      </div>
+      <div class="settings-form-section">
+        <label class="row">
+          Public : <input type="checkbox" value="1" name="save-public-checkbox"/>
+        </label>
+      </div>
+      <input type="submit" class="button button-primary" id="save-button" value="Save" />
+      <span id="save-status" class="status"></span>
+    </form>
+  </div>
+</div>