From bd0adda73f6851ef0613d3c49fb12d9cecef33b4 Mon Sep 17 00:00:00 2001
From: jdescottes <julian.descottes@gmail.com>
Date: Tue, 11 Feb 2014 22:04:44 +0100
Subject: [PATCH] Various bug fixes

- Added missing files from previous commit
- Fixed move cursor that would remain after using a Selection tool
- Switched to mousedown for Tool Selection to avoid missed clicks
---
 img/local-storage-icon.png                    | Bin 0 -> 1308 bytes
 js/controller/ToolController.js               |   3 +-
 .../settings/LocalStorageController.js        |  70 ++++++++++++++++++
 js/drawingtools/Move.js                       |   4 +-
 js/drawingtools/selectiontools/BaseSelect.js  |   2 +-
 templates/settings/localstorage.html          |  18 +++++
 6 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 img/local-storage-icon.png
 create mode 100644 js/controller/settings/LocalStorageController.js
 create mode 100644 templates/settings/localstorage.html

diff --git a/img/local-storage-icon.png b/img/local-storage-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9b757e71ec3f63780eb22004e05e4273b441ec1
GIT binary patch
literal 1308
zcmV+%1>^dOP)<h;3K|Lk000e1NJLTq003kF002b@1^@s6yb?pl00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11er-hK~#90?c7O-9Yq|+@z0DVE(sEskf4G~z~Ds;1Q$d+s3<N-
z6j4lK<|24fA&`@}T=XJtNDf{yF$vLVP!JEI#1MDfqCq{VF-AcNYRqb!NZLb9WSDf%
z>w2&Iy*JbKg<)p8URV8jKYms9ud42WEX$1HIxNLPTz~=f@(3QSxs6H1z^EW6<7wQ}
z<@W!=x!BX?cKepW(ce$%z8EkI5A>kjzGWcGvTN{G4`WC!8N(p%?r{vWaDR_u=o<#I
zEc*r*_Bf8@l2HaRzt=$sF1fGQLG%Ly*|>Rc57{laWN(k-=qZD(KhiZ$mBy03atO&K
zedQ2>OBy|v^qWIyxJ&v`5ZHh(dL2Xrd+-^)#6O)>)USd}Rt{hVR<>I~5~Lnp#chcG
zZu@OepDHZEz3tqX98w?qF$V`@Zb}ZRkC|8yd(-hX1QN@y*wyPGYT~Te8@esX2-f36
zd_DTJyUQ{3HQf^AFjnC){M4m3CnenwWE~#FjxMw{>8X2Ae;7+7F-lXHLo#8J@VT1m
zpR&{;$Pr<meq9Z9PkHJPWR=!p%)l~Sii<E;{fF}Ukr8|)%sQXK!KyR$eZq;y-wMj7
z3tia?%&xHAslZm;ShYhQS1iU1VbSf{irbtjT#V&aI%KDCg5^+7*-X4GbWw?7c2+s<
zeO|s8@Q@@%8Ahsd$Pr=N_2-<j`PhbO6|^(ed9x~qY?3bqESJP6%ciOvvPAw=_atGE
zKc#{;raDJ(P8AN>E6kqqSR{#2md*I33PE00yeqb>g8G}n8migCy%O)`Tt8b_YEQe8
zt@&Hn?%mhvm-W4TF$m8pCNawKny|{z@fWswg0j?Im1phIKRW5MG9mZanNxO|uwa&G
z%`Rc@{a-qB$UE}IfT0fRZ5r#1ia}?B3>REK5qES@Z_`*a_MdhI*@uk<Ww!{As3ltS
zt#C;Df7%sfqTFMs%{rUN+VL0K9n`PFmYnNn3ggOgZPeK`GMs1Jv8Z+&vK{Xhlr5FS
zD9aW(XVlseWVPaB_9^!$&zii8v0YY%^W~qjx&$A`$JIy<2?sllc~L^FLpCcu^fnY(
zSCe^N!CNb01u0r8IRSS@*41QkyDQ?lto?$`4&;>GE<C82XwC1!Z1iwmVT?mwkuL_R
zyNcl@1!52<$Z)~+xx%Xf6XhuEt|%|akMa{i!hU+nJ<9Q&7BkVZg1n$O_ZW%@sOe1T
z4$2Mc8RiKt8P7s|(nerSWuCCoQAinwY>_VpDKn4ZeJ#Ww2-51^9K!|Ir{k`;m>NyX
z?usDDwh77)2-Dp>ZpLYmK{b^TCG)gFd^$n-Mj;{0V<;}BM)QV}kADy13B?KDaKZIC
zxIQ|p=2EJ=A_($>@I=#ib_k1!c`Vi+Z-JN${3$r36h~)SD{(9S7*m#Vk80Q;j3K2M
z7?*~ej;nDwo|Qk{U4YL!2(W2ffe*@lc)TEGct*otR2ji`AsH-9?0(2JDffusm{TRK
zh!x}}oDthdgQ;DRv{X`_kA&6TC}ISejT>ScXfV<4AWo3Q(!-l&IgA(Ex$!^e!Wti+
SDG+1;0000<MNUMnLSTZ*PGe30

literal 0
HcmV?d00001

diff --git a/js/controller/ToolController.js b/js/controller/ToolController.js
index 0e2d42dc..9126cb44 100644
--- a/js/controller/ToolController.js
+++ b/js/controller/ToolController.js
@@ -36,7 +36,7 @@
     // Set SimplePen as default selected tool:
     this.selectTool_(this.tools[0]);
     // Activate listener on tool panel:
-    $("#tool-section").click($.proxy(this.onToolIconClicked_, this));
+    $("#tool-section").mousedown($.proxy(this.onToolIconClicked_, this));
   };
 
   /**
@@ -47,6 +47,7 @@
     var previousSelectedToolClass = stage.data("selected-tool-class");
     if(previousSelectedToolClass) {
       stage.removeClass(previousSelectedToolClass);
+      stage.removeClass(pskl.drawingtools.Move.TOOL_ID);
     }
     stage.addClass(tool.instance.toolId);
     stage.data("selected-tool-class", tool.instance.toolId);
diff --git a/js/controller/settings/LocalStorageController.js b/js/controller/settings/LocalStorageController.js
new file mode 100644
index 00000000..9e6fc80f
--- /dev/null
+++ b/js/controller/settings/LocalStorageController.js
@@ -0,0 +1,70 @@
+(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.service_ = pskl.app.localStorageService;
+    this.piskelsList = $('.local-piskels-list');
+
+    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);
+        $.publish(Events.CLOSE_SETTINGS_DRAWER);
+      }
+    }
+  };
+
+  ns.LocalStorageController.prototype.fillLocalPiskelsList_ = function () {
+    var html = "";
+    var keys = this.service_.getKeys();
+
+    var pad = function (num) {
+      if (num < 10) {
+        return "0" + num;
+      } else {
+        return "" + num;
+      }
+    };
+
+
+    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 = new Date(key.date);
+      var formattedDate = pskl.utils.Template.replace("{{Y}}/{{M}}/{{D}} {{H}}:{{m}}", {
+        Y : date.getFullYear(),
+        M : pad(date.getMonth() + 1),
+        D : pad(date.getDate()),
+        H : pad(date.getHours()),
+        m : pad(date.getMinutes())
+      });
+      html += pskl.utils.Template.replace(this.localStorageItemTemplate_, {name : key.name, date : formattedDate});
+    }).bind(this));
+
+    var tableBody_ = this.piskelsList.get(0).tBodies[0];
+    tableBody_.innerHTML = html;
+  };
+
+})();
\ No newline at end of file
diff --git a/js/drawingtools/Move.js b/js/drawingtools/Move.js
index 1635e0cf..0ff49857 100644
--- a/js/drawingtools/Move.js
+++ b/js/drawingtools/Move.js
@@ -7,7 +7,7 @@
   var ns = $.namespace("pskl.drawingtools");
 
   ns.Move = function() {
-    this.toolId = "tool-move";
+    this.toolId = ns.Move.TOOL_ID;
     this.helpText = "Move tool";
 
     // Stroke's first point coordinates (set in applyToolAt)
@@ -15,6 +15,8 @@
     this.startRow = null;
   };
 
+  ns.Move.TOOL_ID = "tool-move";
+
   pskl.utils.inherit(ns.Move, ns.BaseTool);
 
   /**
diff --git a/js/drawingtools/selectiontools/BaseSelect.js b/js/drawingtools/selectiontools/BaseSelect.js
index b5ca0da1..b6cb3b0b 100644
--- a/js/drawingtools/selectiontools/BaseSelect.js
+++ b/js/drawingtools/selectiontools/BaseSelect.js
@@ -7,7 +7,7 @@
   var ns = $.namespace("pskl.drawingtools");
 
   ns.BaseSelect = function() {
-    this.secondaryToolId = "tool-move";
+    this.secondaryToolId = pskl.drawingtools.Move.TOOL_ID;
     this.BodyRoot = $('body');
 
     // Select's first point coordinates (set in applyToolAt)
diff --git a/templates/settings/localstorage.html b/templates/settings/localstorage.html
new file mode 100644
index 00000000..524cb15e
--- /dev/null
+++ b/templates/settings/localstorage.html
@@ -0,0 +1,18 @@
+<div class="settings-section">
+  <div class="settings-title">
+    Browse Local Piskels
+  </div>
+  <div class="settings-item">
+    <table class="local-piskels-list">
+      <tbody></tbody>
+    </table>
+  </div>
+  <script type="text/template" id="local-storage-item-template">
+    <tr class="local-piskel-item">
+      <td class="local-piskel-name">{{name}}</td>
+      <td class="local-piskel-save-date">{{date}}</td>
+      <td><a class="local-piskel-load-link" data-action="load" data-name="{{name}}" href="javascript:void(0);">load</a></td>
+      <td><a class="local-piskel-delete-link" data-action="delete" data-name="{{name}}" href="javascript:void(0);">x</a></td>
+    </tr>
+  </script>
+</div>
\ No newline at end of file