cleanup

src/js/controller/DrawingController.js

@@ -271,10 +271,13 @@
   };
 
   /**
-   * @private
+   * Translate absolute x,y screen coordinates into sprite coordinates
+   * @param  {Number} screenX
+   * @param  {Number} screenY
+   * @return {Object} {x:Number, y:Number}
    */
-  ns.DrawingController.prototype.getSpriteCoordinates = function(event) {
-    return this.renderer.getCoordinates(event.clientX, event.clientY);
+  ns.DrawingController.prototype.getSpriteCoordinates = function(screenX, screenY) {
+    return this.renderer.getCoordinates(screenX, screenY);
   };
 
   ns.DrawingController.prototype.setCurrentButton = function (event) {

src/js/controller/dialogs/BrowseLocalController.js

@@ -12,12 +12,12 @@
     this.localStorageItemTemplate_ = pskl.utils.Template.get("local-storage-item-template");
 
     this.service_ = pskl.app.localStorageService;
-    this.piskelsList = $('.local-piskels-list');
+    this.piskelList = $('.local-piskel-list');
     this.prevSessionContainer = $('.previous-session');
 
     this.fillLocalPiskelsList_();
 
-    this.piskelsList.click(this.onPiskelsListClick_.bind(this));
+    this.piskelList.click(this.onPiskelsListClick_.bind(this));
   };
 
   ns.BrowseLocalController.prototype.onPiskelsListClick_ = function (evt) {
@@ -51,7 +51,7 @@
       html += pskl.utils.Template.replace(this.localStorageItemTemplate_, {name : key.name, date : date});
     }).bind(this));
 
-    var tableBody_ = this.piskelsList.get(0).tBodies[0];
+    var tableBody_ = this.piskelList.get(0).tBodies[0];
     tableBody_.innerHTML = html;
   };
 })();

src/js/controller/settings/ImageExportController.js

@@ -0,0 +1,14 @@
+(function () {
+  var ns = $.namespace("pskl.controller.settings");
+
+  ns.ImageExportController = function (piskelController) {
+    this.piskelController = piskelController;
+    this.pngExportController = new ns.PngExportController(piskelController);
+    this.gifExportController = new ns.GifExportController(piskelController);
+  };
+
+  ns.ImageExportController.prototype.init = function () {
+    this.pngExportController.init();
+    this.gifExportController.init();
+  };
+})();

src/js/controller/settings/LocalStorageController.js

@@ -1,101 +0,0 @@
-(function () {
-  var ns = $.namespace("pskl.controller.settings");
-
-  ns.LocalStorageController = function () {};
-
-  /**
-   * @public
-   */
-  ns.LocalStorageController.prototype.init = function() {
-    this.localStorageItemTemplate_ = pskl.utils.Template.get("local-storage-item-template");
-    this.previousSessionTemplate_ = pskl.utils.Template.get("previous-session-info-template");
-
-    this.service_ = pskl.app.localStorageService;
-    this.piskelsList = $('.local-piskels-list');
-    this.prevSessionContainer = $('.previous-session');
-
-    this.fillRestoreSession_();
-    this.fillLocalPiskelsList_();
-
-    this.piskelsList.click(this.onPiskelsListClick_.bind(this));
-  };
-
-  ns.LocalStorageController.prototype.onPiskelsListClick_ = function (evt) {
-    var action = evt.target.getAttribute('data-action');
-    var name = evt.target.getAttribute('data-name');
-    if (action === 'load') {
-      if (window.confirm('This will erase your current piskel. Continue ?')) {
-        this.service_.load(name);
-        $.publish(Events.CLOSE_SETTINGS_DRAWER);
-      }
-    } else if (action === 'delete') {
-      if (window.confirm('This will permanently DELETE this piskel from your computer. Continue ?')) {
-        this.service_.remove(name);
-        this.fillLocalPiskelsList_();
-      }
-    }
-  };
-
-  ns.LocalStorageController.prototype.fillRestoreSession_ = function () {
-    var previousInfo = pskl.app.backupService.getPreviousPiskelInfo();
-    if (previousInfo) {
-      var info = {
-        name : previousInfo.name,
-        date : this.formatDate_(previousInfo.date, "{{H}}:{{m}} - {{Y}}/{{M}}/{{D}}")
-      };
-
-      this.prevSessionContainer.html(pskl.utils.Template.replace(this.previousSessionTemplate_, info));
-      $(".restore-session-button").click(this.onRestorePreviousSessionClick_.bind(this));
-    } else {
-      this.prevSessionContainer.html("No piskel backup was found on this browser.");
-    }
-  };
-
-  ns.LocalStorageController.prototype.onRestorePreviousSessionClick_ = function () {
-    if (window.confirm('This will erase your current workspace. Continue ?')) {
-      pskl.app.backupService.load();
-      $.publish(Events.CLOSE_SETTINGS_DRAWER);
-    }
-  };
-
-  var pad = function (num) {
-    if (num < 10) {
-      return "0" + num;
-    } else {
-      return "" + num;
-    }
-  };
-
-  ns.LocalStorageController.prototype.formatDate_ = function (date, format) {
-    date = new Date(date);
-    var formattedDate = pskl.utils.Template.replace(format, {
-      Y : date.getFullYear(),
-      M : pad(date.getMonth() + 1),
-      D : pad(date.getDate()),
-      H : pad(date.getHours()),
-      m : pad(date.getMinutes())
-    });
-
-    return formattedDate;
-  };
-
-  ns.LocalStorageController.prototype.fillLocalPiskelsList_ = function () {
-    var html = "";
-    var keys = this.service_.getKeys();
-
-    keys.sort(function (k1, k2) {
-      if (k1.date < k2.date) {return 1;}
-      if (k1.date > k2.date) {return -1;}
-      return 0;
-    });
-
-    keys.forEach((function (key) {
-      var date = this.formatDate_(key.date, "{{Y}}/{{M}}/{{D}} {{H}}:{{m}}");
-      html += pskl.utils.Template.replace(this.localStorageItemTemplate_, {name : key.name, date : date});
-    }).bind(this));
-
-    var tableBody_ = this.piskelsList.get(0).tBodies[0];
-    tableBody_.innerHTML = html;
-  };
-
-})();

src/js/controller/settings/PngExportController.js

@@ -15,8 +15,6 @@
     document.querySelector(".zip-generate-button").addEventListener('click', this.onZipButtonClick_.bind(this));
 
     this.updatePreview_(this.getFramesheetAsCanvas().toDataURL("image/png"));
-
-    (new ns.GifExportController(this.piskelController)).init();
   };
 
   ns.PngExportController.prototype.onPngDownloadButtonClick_ = function (evt) {

src/js/controller/settings/SaveController.js

@@ -87,10 +87,14 @@
       this.piskelController.getPiskel().setDescriptor(descriptor);
 
       this.beforeSaving_();
+
+      this.saveOnlineButton.attr('disabled', true);
+      this.saveOnlineStatus.html('Saving ...');
+
       pskl.app.storageService.store({
         success : this.onSaveSuccess_.bind(this),
         error : this.onSaveError_.bind(this),
-        after : this.afterSaving_.bind(this)
+        after : this.afterOnlineSaving_.bind(this)
       });
     }
   };
@@ -116,7 +120,6 @@
 
   ns.SaveController.prototype.saveFile_ = function () {
     this.beforeSaving_();
-    this.saveToFile_();
     pskl.utils.BlobUtils.stringToBlob(pskl.app.piskelController.serialize(), function(blob) {
       pskl.utils.FileUtils.downloadAsFile(blob, this.getLocalFilename_());
       this.onSaveSuccess_();
@@ -135,9 +138,6 @@
   ns.SaveController.prototype.beforeSaving_ = function () {
     this.updatePiskelDescriptor_();
 
-    this.saveOnlineButton.attr('disabled', true);
-    this.saveOnlineStatus.html('Saving ...');
-
     if (this.piskelName) {
       this.piskelName.classList.add('piskel-name-saving');
     }
@@ -162,10 +162,13 @@
     $.publish(Events.SHOW_NOTIFICATION, [{"content": "Saving failed ("+status+")"}]);
   };
 
-  ns.SaveController.prototype.afterSaving_ = function () {
+  ns.SaveController.prototype.afterOnlineSaving_ = function () {
     this.saveOnlineButton.attr('disabled', false);
     this.saveOnlineStatus.html('');
+    this.afterSaving_();
+  };
 
+  ns.SaveController.prototype.afterSaving_ = function () {
     if (this.piskelName) {
       this.piskelName.classList.remove('piskel-name-saving');
     }

src/js/controller/settings/SettingsController.js

@@ -12,7 +12,7 @@
     },
     'png' : {
       template : 'templates/settings/export.html',
-      controller : ns.PngExportController
+      controller : ns.ImageExportController
     },
     'import' : {
       template : 'templates/settings/import.html',