Return promise results from PiskelDB and IndexedDBStorageService

PaletteService exposes window.localStorage as this.localStorageService. This is confusing since we also have the LocalStorageService class used to save piskels in local storage.

.codeclimate.yml

@@ -0,0 +1,25 @@
+engines:
+  csslint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+        - javascript
+  eslint:
+    enabled: true
+    checks:
+      wrap-iife:
+        enabled: false
+  fixme:
+    enabled: true
+ratings:
+  paths:
+    - "**.css"
+    - "**.js"
+exclude_paths:
+  - .github/
+  - bin/
+  - misc/
+  - src/js/lib/
+  - test/

.eslintignore

@@ -0,0 +1,2 @@
+# Exclude libs.
+**/lib/**/*.js

.github/ISSUE_TEMPLATE

@@ -0,0 +1,19 @@
+Bug description
+
+(this template is intended for bug reports, erase it when requesting features/enhancements)
+
+### Steps to reproduce the bug
+1. go to piskelapp.com
+2. select a tool
+3. ...
+
+### Environment details
+* operating system:
+* browser (or offline application version):
+
+### Sprite details
+* number of frames:
+* sprite resolution:
+* session duration:
+
+Feel free to include a screenshot of the bug, a .piskel file of the sprite or anything else that can help us investigate.

.gitignore

@@ -1,4 +1,4 @@
-# mac artefacts
+# mac artifacts
 *.DS_Store
 
 # nodejs local installs
@@ -15,10 +15,12 @@ cache
 # netbeans project folder
 nbproject
 
+# vscode workspace folder
+.vscode
+
 # git stackdumps
 *.stackdump
 
-
 # diffs
 diff.txt
 
@@ -28,6 +30,7 @@ build/closure/closure_compiled_binary.js
 
 # spriting artifacts
 src/img/icons.png
+src/img/icons@2x.png
 src/css/icons.css
 
 # plato report directory

.jscsrc

@@ -1,75 +0,0 @@
-{
-    "requireCurlyBraces": [
-        "if",
-        "else",
-        "for",
-        "while",
-        "do",
-        "try",
-        "catch"
-    ],
-    "requireOperatorBeforeLineBreak": true,
-    "requireCamelCaseOrUpperCaseIdentifiers": true,
-    "maximumLineLength": {
-      "value": 80,
-      "allExcept": ["comments", "regex"]
-    },
-    "validateIndentation": 2,
-    "validateQuoteMarks": "'",
-
-    "disallowMultipleLineStrings": true,
-    "disallowMixedSpacesAndTabs": true,
-    "disallowTrailingWhitespace": true,
-    "disallowSpaceAfterPrefixUnaryOperators": true,
-    "disallowMultipleVarDecl": true,
-    "disallowKeywordsOnNewLine": ["else"],
-
-    "requireSpaceAfterKeywords": [
-      "if",
-      "else",
-      "for",
-      "while",
-      "do",
-      "switch",
-      "return",
-      "try",
-      "catch"
-    ],
-    "requireSpaceBeforeBinaryOperators": [
-        "=", "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", ">>>=",
-        "&=", "|=", "^=", "+=",
-
-        "+", "-", "*", "/", "%", "<<", ">>", ">>>", "&",
-        "|", "^", "&&", "||", "===", "==", ">=",
-        "<=", "<", ">", "!=", "!=="
-    ],
-    "requireSpaceAfterBinaryOperators": true,
-    "requireSpacesInConditionalExpression": true,
-    "requireSpaceBeforeBlockStatements": true,
-    "requireSpacesInForStatement": true,
-    "requireLineFeedAtFileEnd": true,
-    "requireSpacesInFunctionExpression": {
-        "beforeOpeningCurlyBrace": true
-    },
-    "disallowSpacesInAnonymousFunctionExpression": {
-        "beforeOpeningRoundBrace": false
-    },
-    "disallowSpacesInsideObjectBrackets": "all",
-    "disallowSpacesInsideArrayBrackets": "all",
-    "disallowSpacesInsideParentheses": true,
-
-    "disallowMultipleLineBreaks": true,
-    "disallowNewlineBeforeBlockStatements": true,
-    "disallowKeywords": ["with"],
-    "disallowSpacesInFunctionExpression": null,
-    "disallowSpacesInFunctionDeclaration": null,
-    "disallowSpacesInCallExpression": true,
-    "disallowSpaceAfterObjectKeys": false,
-    "requireSpaceBeforeObjectValues": true,
-    "requireCapitalizedConstructors": true,
-    "requireDotNotation": true,
-    "requireSemicolons": true,
-    "validateParameterSeparator": ", ",
-
-    "jsDoc": null
-}

.travis.yml

@@ -1,14 +1,9 @@
 language: node_js
 node_js:
-  - "4.1"
+  - "7.4.0"
 before_install:
   - npm update -g npm
   - npm install -g grunt-cli
-  - git clone git://github.com/n1k0/casperjs.git ~/casperjs
-  - cd ~/casperjs
-  - git checkout tags/1.0.2
-  - export PATH=$PATH:`pwd`/bin
-  - cd -
 before_script:
   - phantomjs --version
   - casperjs --version

Gruntfile.js

@@ -9,11 +9,10 @@ module.exports = function(grunt) {
     TEST : 9991
   };
 
-  var DEV_MODE = '?debug';
-
   // create a version based on the build timestamp
   var dateFormat = require('dateformat');
   var version = '-' + dateFormat(new Date(), "yyyy-mm-dd-hh-MM");
+  var releaseVersion = require('./package.json').version;
 
   /**
    * Helper to prefix all strings in provided array with the provided path
@@ -34,26 +33,19 @@ module.exports = function(grunt) {
   var stylePaths = require('./src/piskel-style-list.js').styles;
   var piskelStyles = prefixPaths(stylePaths, "src/");
 
-  var getCasperConfig = function (suiteName, delay, host) {
-    var testPaths = require('./test/casperjs/' + suiteName).tests;
-    var tests = prefixPaths(testPaths, "test/casperjs/");
+  // Casper JS tests
+  var casperjsOptions = [
+    '--baseUrl=http://' + hostname + ':' + PORT.TEST,
+    '--mode=?debug',
+    '--verbose=false',
+    '--includes=test/casperjs/integration/include.js',
+    '--log-level=info',
+    '--print-command=false',
+    '--print-file-paths=true',
+  ];
 
-    return {
-      filesSrc : tests,
-      options : {
-        args : {
-          baseUrl : 'http://' + host + ':' + PORT.TEST,
-          mode : DEV_MODE,
-          delay : delay
-        },
-        async : false,
-        direct : false,
-        logLevel : 'info',
-        printCommand : false,
-        printFilePaths : true
-      }
-    };
-  };
+  var integrationTestPaths = require('./test/casperjs/integration/IntegrationSuite.js').tests;
+  var integrationTests = prefixPaths(integrationTestPaths, "test/casperjs/integration/");
 
   var getConnectConfig = function (base, port, host) {
     if (typeof base === 'string') {
@@ -91,32 +83,13 @@ module.exports = function(grunt) {
       css : ['src/css/**/*.css']
     },
 
-    jscs : {
-      options : {
-        "config": ".jscsrc",
-        "maximumLineLength": 120,
-        "requireCamelCaseOrUpperCaseIdentifiers": "ignoreProperties",
-        "validateQuoteMarks": { "mark": "'", "escape": true },
-        "disallowMultipleVarDecl": "exceptUndefined",
-        "disallowSpacesInAnonymousFunctionExpression": null
-      },
-      js : [ 'src/js/**/*.js' , '!src/js/**/lib/**/*.js' ]
-    },
-
-    jshint: {
-      options: {
-        undef : true,
-        latedef : true,
-        browser : true,
-        trailing : true,
-        curly : true,
-        globals : {'$':true, 'jQuery' : true, 'pskl':true, 'Events':true, 'Constants':true, 'console' : true, 'module':true, 'require':true, 'Q':true}
-      },
+    eslint: {
       files: [
-        'Gruntfile.js',
-        'package.json',
+        // Includes
         'src/js/**/*.js',
-        '!src/js/**/lib/**/*.js' // Exclude lib folder (note the leading !)
+        // Exludes
+        // TODO: remove this (for now we still get warnings from the lib folder)
+        '!src/js/**/lib/**/*.js'
       ]
     },
 
@@ -135,7 +108,7 @@ module.exports = function(grunt) {
         path : 'http://' + hostname + ':' + PORT.PROD + '/'
       },
       dev : {
-        path : 'http://' + hostname + ':' + PORT.DEV + '/' + DEV_MODE
+        path : 'http://' + hostname + ':' + PORT.DEV + '/?debug'
       }
     },
 
@@ -180,7 +153,7 @@ module.exports = function(grunt) {
       },
       css : {
         src : piskelStyles,
-        dest : 'dest/prod/css/piskel-style-packaged' + version + '.css'
+        dest : 'dest/tmp/css/piskel-style-packaged' + version + '.css'
       }
     },
 
@@ -201,7 +174,8 @@ module.exports = function(grunt) {
         dest: 'dest/tmp/index.html',
         options : {
           globals : {
-            'version' : version
+            'version' : version,
+            'releaseVersion' : releaseVersion
           }
         }
       }
@@ -231,19 +205,18 @@ module.exports = function(grunt) {
           {src: ['dest/tmp/index.html'], dest: 'dest/prod/piskelapp-partials/main-partial.html'}
         ]
       },
-      // remove the fake header from the desktop build
-      desktop: {
+
+      css: {
         options: {
           patterns: [{
-              match: /<!--standalone-start-->(?:.|[\r\n])*<!--standalone-end-->/,
-              replacement: "",
-              description : "Remove everything between standalone-start & standalone-end"
-            }
-          ]
+            match: /var\(--highlight-color\)/g,
+            replacement: "gold",
+          }]
         },
-        files: [
-          {src: ['dest/prod/index.html'], dest: 'dest/prod/index.html'}
-        ]
+        files: [{
+          src: ['dest/tmp/css/piskel-style-packaged' + version + '.css'],
+          dest: 'dest/prod/css/piskel-style-packaged' + version + '.css'
+        }]
       }
     },
 
@@ -282,9 +255,23 @@ module.exports = function(grunt) {
       }
     },
 
-    ghost : {
-      'travis' : getCasperConfig('TravisTestSuite.js', 10000, hostname),
-      'local' : getCasperConfig('LocalTestSuite.js', 50, hostname)
+    casperjs : {
+      drawing : {
+        files : {
+          src: ['test/casperjs/DrawingTest.js']
+        },
+        options : {
+          casperjsOptions: casperjsOptions
+        }
+      },
+      integration : {
+        files : {
+          src: integrationTests
+        },
+        options : {
+          casperjsOptions: casperjsOptions
+        }
+      }
     },
 
     /**
@@ -294,57 +281,78 @@ module.exports = function(grunt) {
     nwjs: {
       windows : {
         options: {
-          version : "0.15.4",
+          downloadUrl: 'https://dl.nwjs.io/',
+          version : "0.19.4",
           build_dir: './dest/desktop/', // destination folder of releases.
           win: true,
           linux32: true,
-          linux64: true
+          linux64: true,
+          flavor: "normal",
         },
         src: ['./dest/prod/**/*', "./package.json", "!./dest/desktop/"]
       },
       macos : {
         options: {
+          downloadUrl: 'https://dl.nwjs.io/',
           osx64: true,
-          version : "0.15.4",
-          build_dir: './dest/desktop/'
+          version : "0.19.4",
+          build_dir: './dest/desktop/',
+          flavor: "normal",
+        },
+        src: ['./dest/prod/**/*', "./package.json", "!./dest/desktop/"]
+      },
+      macos_old : {
+        options: {
+          downloadUrl: 'https://dl.nwjs.io/',
+          osx64: true,
+          version : "0.12.3",
+          build_dir: './dest/desktop/old',
+          flavor: "normal",
         },
         src: ['./dest/prod/**/*', "./package.json", "!./dest/desktop/"]
       }
     }
   });
 
-  // Validate
-  grunt.registerTask('lint', ['jscs:js', 'leadingIndent:css', 'jshint']);
-
-  // karma/unit-tests task
+  // TEST TASKS
+  // Run linting
+  grunt.registerTask('lint', ['eslint', 'leadingIndent:css']);
+  // Run unit-tests
   grunt.registerTask('unit-test', ['karma']);
+  // Run integration tests
+  grunt.registerTask('integration-test', ['build-dev', 'connect:test', 'casperjs:integration']);
+  // Run drawing tests
+  grunt.registerTask('drawing-test', ['build-dev', 'connect:test', 'casperjs:drawing']);
+  // Run linting, unit tests, drawing tests and integration tests
+  grunt.registerTask('test', ['lint', 'unit-test', 'build-dev', 'connect:test', 'casperjs:drawing', 'casperjs:integration']);
 
-  // Validate & Test
-  grunt.registerTask('test-travis', ['lint', 'unit-test', 'build-dev', 'connect:test', 'ghost:travis']);
-  // Validate & Test (faster version) will NOT work on travis !!
-  grunt.registerTask('test-local', ['lint', 'unit-test', 'build-dev', 'connect:test', 'ghost:local']);
-  grunt.registerTask('test-local-nolint', ['unit-test', 'build-dev', 'connect:test', 'ghost:local']);
+  // Run the tests, even if the linting fails
+  grunt.registerTask('test-nolint', ['unit-test', 'build-dev', 'connect:test', 'casperjs:drawing', 'casperjs:integration']);
 
-  grunt.registerTask('test', ['test-travis']);
-  grunt.registerTask('precommit', ['test-local']);
+  // Used by optional precommit hook
+  grunt.registerTask('precommit', ['test']);
 
+  // BUILD TASKS
   grunt.registerTask('build-index.html', ['includereplace']);
   grunt.registerTask('merge-statics', ['concat:js', 'concat:css', 'uglify']);
-  grunt.registerTask('build',  ['clean:prod', 'sprite', 'merge-statics', 'build-index.html', 'replace:mainPartial', 'copy:prod']);
+  grunt.registerTask('build',  ['clean:prod', 'sprite', 'merge-statics', 'build-index.html', 'replace:mainPartial', 'replace:css', 'copy:prod']);
   grunt.registerTask('build-dev',  ['clean:dev', 'sprite', 'build-index.html', 'copy:dev']);
+  grunt.registerTask('desktop', ['clean:desktop', 'default', 'nwjs:windows']);
+  grunt.registerTask('desktop-mac', ['clean:desktop', 'default', 'nwjs:macos']);
+  grunt.registerTask('desktop-mac-old', ['clean:desktop', 'default', 'replace:desktop', 'nwjs:macos_old']);
 
-  // Validate & Build
-  grunt.registerTask('default', ['lint', 'build']);
-
-  // Build stand alone app with nodewebkit
-  grunt.registerTask('desktop', ['clean:desktop', 'default', 'replace:desktop', 'nwjs:windows']);
-  grunt.registerTask('desktop-mac', ['clean:desktop', 'default', 'replace:desktop', 'nwjs:macos']);
-
+  // SERVER TASKS
   // Start webserver and watch for changes
   grunt.registerTask('serve', ['build', 'connect:prod', 'open:prod', 'watch:prod']);
   // Start webserver on src folder, in debug mode
-  grunt.registerTask('serve-dev', ['build-dev', 'connect:dev', 'open:dev', 'watch:dev']);
+  grunt.registerTask('play', ['build-dev', 'connect:dev', 'open:dev', 'watch:dev']);
 
-  grunt.registerTask('serve-debug', ['serve-dev']);
-  grunt.registerTask('play', ['serve-dev']);
+  // ALIASES, kept for backward compatibility
+  grunt.registerTask('serve-debug', ['play']);
+  grunt.registerTask('serve-dev', ['play']);
+  grunt.registerTask('test-travis', ['test']);
+  grunt.registerTask('test-local', ['test']);
+
+  // Default task
+  grunt.registerTask('default', ['lint', 'build']);
 };

README.md

@@ -1,50 +1,21 @@
 Piskel
 ======
 
-[![Travis Status](https://api.travis-ci.org/juliandescottes/piskel.png?branch=master)](https://travis-ci.org/juliandescottes/piskel) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
+[![Travis Status](https://api.travis-ci.org/piskelapp/piskel.png?branch=master)](https://travis-ci.org/piskelapp/piskel) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
 
-A simple web-based tool for Spriting and Pixel art.
+Piskel is an easy-to-use sprite editor. It can be used to create game sprites, animations, pixel-art...
+It is the editor used in **[piskelapp.com](http://piskelapp.com)**.
 
-![Piskel editor screenshot](https://screenletstore.appspot.com/img/8f03e768-ac59-11e3-b2a1-7f5a1b97c420.jpeg "Piskel editor screenshot")
+<img
+  src="https://screenletstore.appspot.com/img/95aaa0f0-37a4-11e7-a652-7b8128ce3e3b.png"
+  title="Piskel editor screenshot"
+  width="500">
 
-You can try the standalone editor at **http://juliandescottes.github.io/piskel** or see it integrated in **http://piskelapp.com**.
+## About Piskel
 
-Piskel is mainly developped by :
+### Built with
 
-* **[@juliandescottes](https://github.com/juliandescottes)**
-* **[@grosbouddha](https://github.com/grosbouddha)**
-
-## What's the point ?
-
-You can use Piskel to do two things :
-* **spriting** : create retro-style sprites for games
-
-![Megaman spritesheet](http://piskel-imgstore-a.appspot.com/img/c8081287-ac58-11e3-bd8c-b3c4036c0eee.png "Megaman spritesheet")
-
-* **pixelart** : create crazy/pretty pixelart animations for fun !
-
-![Rabbit jumping](http://piskel-imgstore-a.appspot.com/img/947f2dab-ac58-11e3-949a-b3c4036c0eee.gif "Rabit jumping")
-
-Integrated in **[piskelapp.com](http://piskelapp.com)**, you can share everything you work on with others as easily as you share a link.
-
-## Requirements
-
-Piskel supports the following browsers :
-* **Chrome** (latest)
-* **Firefox** (latest)
-* **Internet Explorer** 11+
-
-... and a fairly recent computer.
-
-We don't plan/want/could be forced into supporting older IEs. For Opera and Safari, we've never tested them but the gap shouldn't be huge.
-
-## Offline version
-
-Offline builds are available. More details in the [dedicated wiki page](https://github.com/juliandescottes/piskel/wiki/Desktop-applications).
-
-## Built with
-
-The Piskel editor is purely built in **JavaScript, HTML and CSS**. It uses Canvas extensively for displaying all them pretty sprites.
+The Piskel editor is purely built in **JavaScript, HTML and CSS**.
 
 We also use the following **libraries** :
 * [spectrum](https://github.com/bgrins/spectrum) : awesome standalone colorpicker
@@ -59,17 +30,32 @@ As well as some **icons** from the [Noun Project](http://thenounproject.com/) :
 * Folder by Simple Icons from The Noun Project
 * (and probably one or two others)
 
+### Browser Support
+
+Piskel supports the following browsers:
+* **Chrome** (latest)
+* **Firefox** (latest)
+* **Edge** (latest)
+* **Internet Explorer** 11
+
+### Mobile/Tablets
+
+There is no support for mobile.
+
+### Offline builds
+
+Offline builds are available. More details in the [dedicated wiki page](https://github.com/piskelapp/piskel/wiki/Desktop-applications).
 
 ## Contributing ?
 
 Help is always welcome !
 
-* **Issues** : Found a problem when using the application, want to request a feature, [open an issue](https://github.com/juliandescottes/piskel/issues).
-* **Participate** : Have a look at the [wiki](https://github.com/juliandescottes/piskel/wiki) to set up the development environment
+* **Issues** : Found a problem when using the application, want to request a feature, [open an issue](https://github.com/piskelapp/piskel/issues).
+* **Development** : Have a look at the [wiki](https://github.com/piskelapp/piskel/wiki) to set up the development environment
 
 ## License
 
-Copyright 2016 Julian Descottes
+Copyright 2017 Julian Descottes
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -83,7 +69,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-## Mobile/Tablets
-
-There is no support for mobile for now.
-

bin/copy-to-piskel-website.js

@@ -0,0 +1,84 @@
+const rmdir = require('rmdir');
+const path = require('path');
+const fs = require('fs');
+const fse = require('fs-extra');
+
+const PISKEL_PATH = path.resolve(__dirname, '..');
+const PISKELAPP_PATH = path.resolve(__dirname, '../../piskel-website');
+
+var pjson = require('../package.json');
+
+// Callbacks sorted by call sequence.
+function onCopy(err) {
+  if (err) {
+    console.error('Failed to copy static files...');
+    return console.error(err);
+  }
+
+  console.log('Copied static files to piskel-website...');
+  let previousPartialPath = path.resolve(PISKELAPP_PATH, 'templates/editor/main-partial.html');
+  fs.access(previousPartialPath, fs.constants.F_OK, function (err) {
+    if (err) {
+      // File does not exit, call next step directly.
+      console.error('Previous main partial doesn\'t exist yet.');
+      onDeletePreviousPartial();
+    } else {
+      // File exists, try to delete it before moving on.
+      fs.unlink(previousPartialPath, onDeletePreviousPartial);
+    }
+  })
+}
+
+function onDeletePreviousPartial(err) {
+  if (err) {
+    console.error('Failed to delete previous main partial...');
+    return console.error(err);
+  }
+
+  console.log('Previous main partial deleted...');
+  fse.copy(
+    path.resolve(PISKELAPP_PATH, "static/editor/piskelapp-partials/main-partial.html"),
+    path.resolve(PISKELAPP_PATH, "templates/editor/main-partial.html"),
+    onCopyNewPartial
+  );
+}
+
+function onCopyNewPartial(err) {
+  if (err) {
+    console.error('Failed to delete previous main partial...');
+    return console.error(err);
+  }
+
+  console.log('Main partial copied...');
+  rmdir(
+    path.resolve(PISKELAPP_PATH, "static/editor/piskelapp-partials/"),
+    onDeleteTempPartial
+  );
+}
+
+function onDeleteTempPartial(err) {
+  if (err) {
+    console.error('Failed to delete temporary main partial...');
+    return console.error(err);
+  }
+
+  console.log('Temporary main partial deleted...');
+
+  fs.writeFile(path.resolve(PISKELAPP_PATH, "static/editor/VERSION"), pjson.version, onVersionFileCreated);
+}
+
+function onVersionFileCreated(err) {
+  if (err) {
+    console.error('Failed to create temporary main partial...');
+    return console.error(err);
+  }
+
+  console.log('Version file created...');
+  console.log('Finished!');
+}
+
+fse.copy(
+  path.resolve(PISKEL_PATH, "dest/prod"),
+  path.resolve(PISKELAPP_PATH, "static/editor"),
+  onCopy
+);

karma.conf.js

@@ -9,6 +9,9 @@ module.exports = function(config) {
   piskelScripts.push('test/js/testutils/**/*.js');
   piskelScripts.push('test/js/**/*.js');
 
+  // Polyfill for Object.assign (missing in PhantomJS)
+  piskelScripts.push('./node_modules/phantomjs-polyfill-object-assign/object-assign-polyfill.js');
+
   config.set({
 
     // base path that will be used to resolve all patterns (eg. files, exclude)
@@ -21,7 +24,9 @@ module.exports = function(config) {
 
 
     // list of files / patterns to load in the browser
-    files: piskelScripts,
+    files: piskelScripts.concat([
+      './node_modules/promise-polyfill/promise.js'
+    ]),
 
 
     // list of files to exclude

misc/icons/source/common-backup.svg

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="90"
+   height="90"
+   viewBox="0 0 89.999997 90"
+   enable-background="new 0 0 89.231 100"
+   xml:space="preserve"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="common-backup.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-rotate.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45"><metadata
+     id="metadata15"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs13" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="7.75"
+     inkscape:cx="13.031976"
+     inkscape:cy="43.272537"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><g
+     id="g3760"
+     transform="matrix(0,-0.97677741,0.97203982,0,-2.1261998,91.355253)"
+     style="fill:#ff00ff;fill-opacity:1"><path
+       style="fill:#ff00ff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3"
+       d="m 29.229405,55.37008 c -0.387431,-1.333059 -0.642506,-2.72161 -0.738881,-4.152895 h -8.675106 c 0.115651,2.460738 0.552554,4.838559 1.260594,7.099021 z" /><path
+       style="fill:#ff00ff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path5"
+       d="m 29.023802,70.783821 5.579515,-6.601516 c -1.862622,-1.780814 -3.387929,-3.907969 -4.44999,-6.287065 l -8.152106,2.946124 c 1.604978,3.800815 4.017584,7.185766 7.022581,9.942457 z" /><path
+       style="fill:#ff00ff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path7"
+       d="m 47.110967,69.703978 c -3.887799,-0.260871 -7.469766,-1.6322 -10.437498,-3.790608 l -5.577588,6.598963 c 4.487901,3.403448 10.011517,5.524225 16.015086,5.803594 z" /><path
+       style="fill:#ff00ff;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0"
+       id="path9"
+       d="M 48.464084,21.400659 V 14.532532 L 28.981398,25.698341 48.464084,36.86415 v -6.867489 c 11.042093,0 20.024317,8.91683 20.024317,19.877897 0,10.509484 -8.258763,19.134189 -18.671845,19.828145 v 8.611948 c 15.190751,-0.703524 27.330245,-13.189635 27.330245,-28.440093 0,-15.700763 -12.86681,-28.473899 -28.682717,-28.473899 z" /></g><g
+     id="g4513"
+     transform="translate(0,-2)"><rect
+       y="32.516129"
+       x="42"
+       height="15.612903"
+       width="7.9999986"
+       id="rect4494"
+       style="fill:#ff00f7;fill-opacity:1;stroke:#ffffed;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.04534006;stroke-opacity:1" /><rect
+       transform="rotate(120)"
+       y="-76.050484"
+       x="12.680965"
+       height="15.612903"
+       width="7.9999986"
+       id="rect4494-7"
+       style="fill:#ff00f7;fill-opacity:1;stroke:#ffffed;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.04534006;stroke-opacity:1" /></g></svg>

misc/icons/source/common-warning-red.svg

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="42"
+   height="42"
+   viewBox="0 0 41.999999 41.999999"
+   enable-background="new 0 0 99.997 69.373"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="common-warning-red.svg"
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-move.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45"><metadata
+   id="metadata9"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1148"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="4"
+   inkscape:cx="85.612634"
+   inkscape:cy="3.0742543"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+
+<path
+   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+   d="m 21,4.2499995 c -0.868171,0 -1.517453,0.2705716 -2,1.03125 L 3.9999999,34.999999 c -0.6703157,1.211185 0.6156981,2.999959 2,3 l 29.9999991,0 c 1.377219,0.0098 2.645421,-1.78334 2,-3 l -15,-29.6874995 C 22.632848,4.6114627 21.868171,4.2499995 21,4.2499995 z m 0,6.2187495 11.999999,23.53125 -23.9999992,0 z"
+   id="rect3765"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="zcccccczcccc" /><path
+   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+   d="m 20.572432,16.003047 c -0.858253,0.109012 -1.577503,1.040604 -1.572402,2.036618 L 20,25.963381 c 9.2e-5,1.066342 -0.158856,2.036512 0.765534,2.036618 l 0.468961,0 c 0.92439,-1.06e-4 0.765412,-0.970276 0.765504,-2.036618 l 1,-7.923716 c -9.2e-5,-1.066342 -0.841114,-2.036512 -1.765504,-2.036618 l -0.468961,0 c -0.0643,-0.0041 -0.128799,-0.0041 -0.193102,0 z"
+   id="rect3772"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cccccccccc" /><path
+   style="fill:#ff0000;fill-opacity:1;stroke:#00ffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:1.60000000000000010"
+   d="m 20.999298,29.000086 c 0.620953,-0.006 0.971639,0.298697 0.999273,1.499911 0.02763,1.201212 -0.347092,1.493936 -0.999273,1.499909 -0.65218,0.006 -1.002864,-0.275261 -0.999271,-1.499909 0.0036,-1.22465 0.378318,-1.493938 0.999271,-1.499911 z"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="zzzzz" /></svg>

misc/icons/source/tool-lasso-select.svg

@@ -20,9 +20,9 @@
    xml:space="preserve"
    inkscape:version="0.48.4 r9939"
    sodipodi:docname="tool-lasso-select.svg"
-   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-lasso-select@2x.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"><metadata
+   inkscape:export-filename="C:\Development\git\piskel\misc\icons\source\tool-lasso-select.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45"><metadata
    id="metadata9"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
@@ -39,22 +39,17 @@
    inkscape:window-height="1148"
    id="namedview5"
    showgrid="false"
-   inkscape:zoom="11.313709"
-   inkscape:cx="28.848556"
-   inkscape:cy="56.05112"
+   inkscape:zoom="5.6568543"
+   inkscape:cx="53.41565"
+   inkscape:cy="19.716081"
    inkscape:window-x="-8"
    inkscape:window-y="-8"
    inkscape:window-maximized="1"
    inkscape:current-layer="Layer_1" />
 
 <path
-   style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:5.99999987, 5.99999987;stroke-dashoffset:9.59999979"
-   d="m 27.137305,45.116922 c 4.348192,3.354775 13.757306,5.64287 20.485225,5.05984 6.727919,-0.583031 15.989555,-2.799751 19.954403,-8.454605 3.964848,-5.654854 2.6921,-13.891707 -3.122398,-15.860913 -6.608117,-2.237981 -9.882928,4.099594 -19.471426,4.899951 -7.474124,0.623869 -14.014171,-4.834533 -18.728321,-1.630028 -7.360138,5.003149 -3.465675,12.63098 0.882517,15.985755 z"
+   style="fill:none;stroke:#ffffff;stroke-width:3.99999976000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:7.99999982000000020, 3.99999991000000010;stroke-dashoffset:1.59999997000000000"
+   d="M 63.459007,62.898551 C 51.21203,69.659898 34.408658,68.826355 23.032272,56.955855 11.655886,45.085355 16.081011,27.22439 25.257464,25.049087 c 9.176453,-2.175302 10.165996,14.382407 20.36105,14.647508 10.195054,0.265101 11.555041,-13.986139 23.446941,-11.490831 11.8919,2.495308 6.640529,27.93144 -5.606448,34.692787 z"
    id="path4945"
    inkscape:connector-curvature="0"
-   sodipodi:nodetypes="zszsssz" /><path
-   style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-   d="M 26.563739,67.114661 C 33.855127,59.408496 44.134234,57.708412 44.506573,51.469924"
-   id="path4947"
-   inkscape:connector-curvature="0"
-   sodipodi:nodetypes="cc" /></svg>
+   sodipodi:nodetypes="zzzzzz" /></svg>

misc/icons/source/tool-shape-select.svg

@@ -25,7 +25,7 @@
    inkscape:export-ydpi="90"><metadata
    id="metadata9"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
    id="defs7" /><sodipodi:namedview
    pagecolor="#ffffff"
    bordercolor="#666666"
@@ -40,7 +40,7 @@
    id="namedview5"
    showgrid="false"
    inkscape:zoom="8.9380977"
-   inkscape:cx="27.470446"
+   inkscape:cx="8.8982615"
    inkscape:cy="50.702772"
    inkscape:window-x="-8"
    inkscape:window-y="-8"
@@ -49,7 +49,7 @@
 
 <path
    style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-   d="M 54.920882,32.150851 23.207014,63.864718 c 0,0 -1.426625,3.647594 -0.07284,5.00138 1.353787,1.353786 5.00138,-0.07284 5.00138,-0.07284 L 59.849422,37.07939 c 0,0 1.426626,-3.647593 0.07284,-5.001379 -1.353786,-1.353786 -5.00138,0.07284 -5.00138,0.07284 z m -2.537109,5.074219 c 0,0 1.701964,-0.835146 2.46427,-0.07284 0.762306,0.762306 -0.07284,2.464269 -0.07284,2.464269 l -26.639649,26.63965 c 0,0 -1.701963,0.835146 -2.464269,0.07284 -0.762306,-0.762305 0.07284,-2.464269 0.07284,-2.464269 z"
+   d="M 54.920882,32.150851 23.207015,63.864718 c 0,0 -1.426626,3.647594 -0.07284,5.001381 1.353787,1.353785 5.001381,-0.07284 5.001381,-0.07284 L 59.849423,37.07939 c 0,0 1.426625,-3.647592 0.07284,-5.001379 -1.353786,-1.353785 -5.00138,0.07284 -5.00138,0.07284 z m -4.969979,8.298204 c 0,0 1.306407,-1.230703 2.068713,-0.468398 0.762306,0.762307 -0.468398,2.068712 -0.468398,2.068712 L 27.739997,65.860591 c 0,0 -1.306406,1.230704 -2.068712,0.468398 -0.762306,-0.762305 0.468398,-2.068712 0.468398,-2.068712 z"
    id="rect4410"
    inkscape:connector-curvature="0"
    sodipodi:nodetypes="cczcczcczcczcc" /><path

misc/scripts/copy-to-piskel-website.cmd

@@ -1,21 +0,0 @@
-@ECHO off
-
-SETLOCAL
-
-  SET PISKEL_PATH="C:\Development\git\piskel"
-  SET PISKELAPP_PATH="C:\Development\git\piskel-website"
-
-  ECHO "Copying files to piskelapp"
-  XCOPY "%PISKEL_PATH%\dest\prod" "%PISKELAPP_PATH%\static\editor" /e /i /h /y
-
-  ECHO "Delete previous partial"
-  DEL "%PISKELAPP_PATH%\templates\editor\main-partial.html"
-  ECHO "Copy new partial"
-  MOVE "%PISKELAPP_PATH%\static\editor\piskelapp-partials\main-partial.html" "%PISKELAPP_PATH%\templates\editor"
-  ECHO "Delete temp partial"
-  RMDIR "%PISKELAPP_PATH%\static\editor\piskelapp-partials\" /S /Q
-
-  PAUSE
-  explorer "%PISKELAPP_PATH%\"
-
-ENDLOCAL

package.json

@@ -1,16 +1,16 @@
 {
   "name": "piskel",
-  "version": "0.8.1",
+  "version": "0.12.1",
   "description": "Pixel art editor",
   "author": "Julian Descottes <julian.descottes@gmail.com>",
   "contributors": [
     "Vincent Renaudin"
   ],
-  "homepage": "http://github.com/juliandescottes/piskel",
+  "homepage": "http://github.com/piskelapp/piskel",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "http://github.com/juliandescottes/piskel.git"
+    "url": "http://github.com/piskelapp/piskel.git"
   },
   "files": [
     "dest/prod",
@@ -23,41 +23,46 @@
   "scripts": {
     "test": "grunt test",
     "start": "nodewebkit",
-    "preversion": "grunt test-local build",
-    "postversion": "git push && git push --tags && npm publish"
+    "preversion": "grunt test build",
+    "postversion": "git push && git push --tags && npm publish",
+    "release": "grunt && node ./bin/copy-to-piskel-website"
   },
   "devDependencies": {
-    "dateformat": "1.0.11",
-    "grunt": "^0.4.5",
-    "grunt-contrib-clean": "1.0.0",
+    "dateformat": "2.0.0",
+    "fs-extra": "3.0.1",
+    "grunt": "0.4.5",
+    "grunt-casperjs": "^2.2.1",
+    "grunt-contrib-clean": "1.1.0",
     "grunt-contrib-concat": "1.0.1",
     "grunt-contrib-connect": "1.0.2",
     "grunt-contrib-copy": "1.0.0",
-    "grunt-contrib-jshint": "1.0.0",
-    "grunt-contrib-uglify": "1.0.1",
+    "grunt-contrib-jshint": "1.1.0",
+    "grunt-contrib-uglify": "2.3.0",
     "grunt-contrib-watch": "1.0.0",
-    "grunt-ghost": "1.1.0",
+    "grunt-eslint": "^19.0.0",
     "grunt-include-replace": "4.0.1",
     "grunt-jscs": "2.8.0",
     "grunt-karma": "1.0.0",
     "grunt-leading-indent": "0.2.0",
-    "grunt-nw-builder": "2.0.3",
+    "grunt-nw-builder": "3.1.0",
     "grunt-open": "0.2.3",
     "grunt-replace": "1.0.1",
-    "grunt-spritesmith": "6.3.0",
-    "jasmine-core": "2.1.0",
-    "karma": "0.13.21",
-    "karma-chrome-launcher": "1.0.1",
-    "karma-jasmine": "1.0.2",
-    "karma-phantomjs-launcher": "0.2.3",
+    "grunt-spritesmith": "6.4.0",
+    "jasmine-core": "2.6.1",
+    "karma": "1.7.0",
+    "karma-jasmine": "1.1.0",
+    "karma-phantomjs-launcher": "1.0.4",
     "load-grunt-tasks": "3.5.0",
-    "phantomjs": "1.9.19"
+    "phantomjs": "2.1.7",
+    "phantomjs-polyfill-object-assign": "0.0.2",
+    "promise-polyfill": "6.0.2",
+    "rmdir": "1.2.0"
   },
   "window": {
     "title": "Piskel",
-    "icon": "dest/logo.png",
+    "icon": "dest/prod/logo.png",
     "toolbar": false,
     "width": 1000,
-    "height": 500
+    "height": 700
   }
 }

src/css/animations.css

@@ -1,3 +1,9 @@
 @keyframes fade {
   50% { opacity: 0.5; }
 }
+
+@keyframes glow {
+  0%   { opacity: 0.66; }
+  50% { opacity: 1; }
+  100%   { opacity: 0.66; }
+}

src/css/dialogs-browse-backups.css

@@ -0,0 +1,152 @@
+#dialog-container.browse-backups {
+  width: 700px;
+  height: 500px;
+  top : 50%;
+  left : 50%;
+  position : absolute;
+  margin-left: -350px;
+}
+
+.backups-step-container {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.backups-step-content {
+  width: 100%;
+  height: 10px;
+  flex-grow: 1;
+  background: #444;
+
+  padding: 20px;
+  overflow: auto;
+  box-sizing: border-box;
+}
+
+.backups-step-actions {
+  flex-grow: 0;
+  flex-shrink: 1;
+  height: 60px;
+  display: flex;
+  align-items: center;
+  padding: 0 20px;
+}
+
+.show #dialog-container.browse-backups {
+  margin-top: -250px;
+}
+
+.browse-backups .browse-backups-disclaimer {
+  display: flex;
+  margin-bottom: 20px;
+  align-items: center;
+}
+
+.browse-backups .browse-backups-disclaimer-content {
+  padding: 0 20px;
+  font-size: 13px;
+}
+
+.browse-backups .browse-backups-disclaimer .backups-icon {
+  border: 1px solid gold;
+  flex-shrink: 0;
+  width: 90px;
+  height: 90px;
+}
+
+.browse-backups .centered-message {
+  position: absolute;
+  left: 50%;
+  width: 200px;
+  margin-top: 100px;
+  margin-left: -130px;
+  padding: 30px;
+
+  font-size: 16px;
+  text-align: center;
+  border: 1px solid;
+}
+
+.browse-backups .session-list-empty,
+.browse-backups .snapshot-list-empty {
+  color: #bbb;
+}
+
+.browse-backups .session-list-error,
+.browse-backups .snapshot-list-error {
+  color: white;
+}
+
+.browse-backups .session-item {
+  /* Transition duration should be kept in sync with SelectSession.DELETE_TRANSITION_DURATION */
+  transition: all 500ms;
+}
+
+/* Hide and slide up next sessions when deleting an item */
+.browse-backups .session-item.deleting {
+  opacity: 0;
+  margin-bottom: -60px;
+}
+
+.browse-backups .session-item,
+.browse-backups .snapshot-item {
+  display: flex;
+  align-items: center;
+
+  width: 100%;
+  height: 80px;
+
+  margin-bottom: 10px;
+  padding: 0 20px;
+
+  border: 1px solid #666;
+  box-sizing: border-box;
+}
+
+.browse-backups .snapshot-preview {
+  flex-grow: 0;
+  flex-shrink: 1;
+  /* Keep synced with SessionDetails.PREVIEW_SIZE */
+  height: 60px;
+  width: 60px;
+  margin-right: 20px;
+}
+
+.browse-backups .session-details,
+.browse-backups .snapshot-details {
+  flex-grow: 1;
+  flex-shrink: 0;
+  display: flex;
+  flex-direction: column;
+}
+
+.browse-backups .session-details-title,
+.browse-backups .snapshot-details-title {
+  font-size: 13px;
+}
+
+.browse-backups .session-details-info,
+.browse-backups .snapshot-details-info {
+  font-size: 11px;
+  color: #bbb;
+  line-height: 1.5em;
+}
+
+.browse-backups .session-actions,
+.browse-backups .snapshot-actions {
+  flex-grow: 0;
+  flex-shrink: 1;
+  display: flex;
+}
+
+.browse-backups .session-actions button,
+.browse-backups .snapshot-actions button {
+  margin-left: 10px;
+}
+
+.browse-backups .session-item:last-child,
+.browse-backups .snapshot-item:last-child {
+  margin-bottom: 0;
+}

src/css/dialogs-browse-local.css

@@ -3,6 +3,19 @@
 /* Browse local piskels panel                                                                   */
 /************************************************************************************************/
 
+#dialog-container.browse-local {
+  width: 700px;
+  height: 500px;
+  top : 50%;
+  left : 50%;
+  position : absolute;
+  margin-left: -350px;
+}
+
+.show #dialog-container.browse-local {
+  margin-top: -250px;
+}
+
 .local-piskel-list {
   width: 100%;
 }
@@ -29,7 +42,7 @@
 
 .local-piskel-list-head {
   font-weight: bold;
-  color: gold;
+  color: var(--highlight-color);
 }
 
 .local-piskel-load-button,

src/css/dialogs-cheatsheet.css

@@ -3,7 +3,7 @@
   bottom: 10px;
   left: 10px;
 
-  color : gold;
+  color : var(--highlight-color);
   font-weight: bold;
   font-size : 1.25em;
   line-height: 20px;
@@ -97,7 +97,7 @@
   border-radius: 2px;
 
   text-align: center;
-  font-family:Courier;
+  font-family: monospace;
   font-weight: bold;
   font-size : 18px;
   color: white;
@@ -113,8 +113,8 @@
 }
 
 .cheatsheet-shortcut-editable .cheatsheet-key {
-  border-color: gold;
-  color: gold;
+  border-color: var(--highlight-color);
+  color: var(--highlight-color);
 }
 
 .cheatsheet-shortcut-editing .cheatsheet-key {
@@ -140,7 +140,7 @@
   padding : 10px;
   overflow: hidden;
 
-  background-color : gold;
+  background-color : var(--highlight-color);
 }
 
 .cheatsheet-helptext {

src/css/dialogs-create-palette.css

@@ -103,7 +103,7 @@
   transition : border-color 0.2s;
 }
 .create-palette-color:hover {
-  border:1px solid gold;
+  border:1px solid var(--highlight-color);
 }
 
 .colors-list-drop-proxy {
@@ -111,17 +111,17 @@
 }
 
 .create-palette-new-color {
-  border:2px dotted gold;
+  border:2px dotted var(--highlight-color);
 
   border-radius: 2px;
   line-height: 40px;
   text-align: center;
   font-size: 20px;
-  color: gold;
+  color: var(--highlight-color);
 }
 
 .create-palette-color.selected {
-  border:2px solid gold;
+  border:2px solid var(--highlight-color);
 }
 
 .create-palette-remove-color {

src/css/dialogs-import-image.css

@@ -1,101 +0,0 @@
-/************************************************************************************************/
-/* Import dialog                                                                                 */
-/************************************************************************************************/
-
-#dialog-container.import-image {
-  width: 550px;
-  height: 360px;
-  top : 50%;
-  left : 50%;
-  position : absolute;
-  margin-left: -250px;
-}
-
-.show #dialog-container.import-image {
-  margin-top: -150px;
-}
-
-.import-subsection {
-  margin-left: 25px;
-}
-
-.import-section:not(.import-subsection) > .dialog-section-title {
-  width: 50px;
-}
-
-.import-section-preview-title {
-  position: absolute;
-  margin-left: 50%;
-  margin-top: -28px;
-}
-
-.import-section-preview {
-  position: absolute;
-  display: inline-block;
-  border: 1px dashed #999;
-  border-radius: 3px;
-  margin-left: 50%;
-}
-
-.import-section-preview img {
-  max-width: 220px;
-  max-height: 220px;
-  display: block;
-}
-
-.import-section-preview.no-border {
-  border-color: transparent;
-}
-
-.import-section-preview canvas {
-  position: absolute;
-  left: 0;
-  top: 0;
-}
-
-.dialog-section-title {
-  display : inline-block;
-  width: 80px;
-}
-
-.dialog-section-radio {
-  margin-top: 15px;
-  vertical-align: sub;
-}
-
-.import-size-field:nth-of-type(2) {
-  margin-left: 5px;
-}
-
-.import-image-file-name {
-  display: inline-block;
-  overflow: hidden;
-
-  width: 200px;
-  vertical-align: middle;
-
-  word-break : break-all;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-
-  font-style: italic;
-  font-weight: normal;
-  text-shadow: none;
-  color: gold;
-}
-
-[name=smooth-resize-checkbox] {
-  margin : 0 8px;
-}
-
-.dialog-import-body {
-  padding: 10px 20px;
-  font-size:1.3em
-}
-
-.import-button {
-  font-size: 1em;
-  height: 28px;
-  padding: 0px 10px;
-  margin-top: 15px;
-}

src/css/dialogs-import.css

@@ -0,0 +1,288 @@
+#dialog-container.import {
+  width: 500px;
+  height: 350px;
+  top : 50%;
+  left : 50%;
+  position : absolute;
+  margin-left: -250px;
+  margin-top: -175px;
+}
+
+.import .dialog-content {
+  font-size: 1.3em;
+}
+
+.import-step-container {
+  display: flex;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.5);
+  background: #444;
+}
+
+.import-step-content {
+  padding: 10px;
+}
+
+.import-step-buttons {
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+  text-align: right;
+}
+
+.import-first-step .import-back-button {
+  display: none;
+}
+
+/**
+ * IMAGE IMPORT STEP
+ */
+
+.import-image-container {
+  padding: 10px;
+}
+
+.import-image-loading {
+  opacity: 0.3;
+  pointer-events: none;
+}
+
+.import-image-loading::after {
+  content: 'loading image';
+
+  position: absolute;
+  width: 100%;
+  top: 0;
+  left: 0;
+  margin-top: 110px;
+
+  text-align: center;
+  font-size: 3em;
+  color: white;
+  text-shadow: 0 0 60px black;
+}
+
+.import-subsection {
+  margin-left: 25px;
+}
+
+.import-section:not(.import-subsection) > .dialog-section-title {
+  width: 50px;
+}
+
+.import-section-preview-title {
+  position: absolute;
+  margin-left: 50%;
+  margin-top: -28px;
+}
+
+.import-section-preview {
+  position: absolute;
+  display: inline-block;
+  border: 1px dashed #999;
+  border-radius: 3px;
+  margin-left: 50%;
+  top: 10px;
+
+  width: 220px;
+  height: 220px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.import-section-preview img {
+  max-width: 100%;
+  max-height: 100%;
+  display: block;
+}
+
+.import-section-preview canvas {
+  position: absolute;
+}
+
+.dialog-section-title {
+  display : inline-block;
+  width: 80px;
+}
+
+.dialog-section-radio {
+  margin-top: 15px;
+  vertical-align: sub;
+}
+
+.import-size-field:nth-of-type(2) {
+  margin-left: 5px;
+}
+
+.import-image-file-name {
+  display: inline-block;
+  overflow: hidden;
+
+  width: 200px;
+  vertical-align: middle;
+
+  word-break : break-all;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+
+  font-style: italic;
+  font-weight: normal;
+  text-shadow: none;
+  color: var(--highlight-color);
+}
+
+[name=smooth-resize-checkbox] {
+  margin : 0 8px;
+}
+
+.dialog-import-body {
+  padding: 10px 20px;
+  font-size:1.3em
+}
+
+/**
+ * SELECT MODE
+ */
+
+.import-info {
+  display: flex;
+  flex-direction: column;
+
+  height: 100%;
+  max-width: 178px;
+  box-sizing: border-box;
+
+  padding: 10px;
+  border-right: 3px solid gold;
+}
+
+.import-preview canvas {
+  max-width: 100%;
+  max-height: 100%;
+}
+
+.import-meta {
+  margin-top: 10px;
+  box-sizing: border-box;
+
+  /*center meta information horizontally*/
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
+.import-meta > div {
+  height: 22px;
+  display: flex;
+  margin-bottom: 5px;
+}
+
+.import-meta-value,
+.import-meta-label {
+  padding: 2px 4px;
+}
+
+.import-meta-label {
+  border-radius: 2px 0 0 2px;
+  color: var(--highlight-color);
+}
+
+.import-meta-value {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.import-missing {
+  text-align: center;
+  line-height: 70px;
+  font-style: italic;
+  color: #aaa;
+}
+
+.import-mode-title {
+  margin-bottom: 10px
+}
+
+.import-mode-section {
+  display: flex;
+  border: 3px solid #666;
+  border-radius: 3px;
+  padding: 10px;
+  margin-bottom: 10px;
+  align-items: center;
+}
+
+.import-mode-section .button {
+  width: 75px;
+  height: 30px;
+  font-size: 14px;
+  margin-left: 10px;
+
+  flex-grow: 0;
+  flex-shrink: 0;
+}
+
+.import-mode-section-description {
+  flex-grow: 1;
+}
+
+.import-resize-option,
+.insert-mode-option {
+  display: flex;
+  align-items: center;
+  margin: 5px 0;
+}
+
+.import-resize-option :checked + span,
+.insert-mode-option :checked + span {
+  color: var(--highlight-color);
+}
+
+.import-resize-option input,
+.insert-mode-option input {
+  margin: 5px;
+}
+
+/**
+ * ADJUST SIZE
+ */
+.import-resize-anchor-info {
+  margin-bottom: 10px;
+}
+
+.import-resize-section {
+  margin-bottom: 10px;
+}
+
+.import-resize-anchor {
+  margin-top: 20px;
+}
+
+.import-resize-option :checked + span {
+  color: var(--highlight-color);
+}
+
+.import-resize-warning {
+  color: var(--highlight-color);
+}
+
+/**
+ * INSERT LOCATION
+ */
+
+.insert-mode-container {
+  margin-top: 20px;
+  margin-bottom: 10px;
+}
+
+.insert-frame-preview {
+  margin: 10px 0;
+}
+
+.insert-frame-preview .frame-picker-wrapper {
+  height: 120px;
+}

src/css/dialogs-performance-info.css

@@ -0,0 +1,68 @@
+.performance-link {
+  display: none;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  z-index: 11000;
+  cursor: pointer;
+  opacity: 0;
+  transition : opacity 0.3s;
+}
+
+.performance-link.visible {
+  display: block;
+  opacity: 0.66;
+  animation: glow 2s infinite;
+}
+
+.performance-link.visible:hover {
+  opacity: 1;
+  animation: none;
+}
+
+#dialog-container.performance-info {
+  width: 500px;
+  height: 525px;
+  top : 50%;
+  left : 50%;
+  position : absolute;
+  margin-left: -250px;
+  margin-top: -260px;
+
+}
+
+.dialog-performance-info-body {
+  font-size: 13px;
+  letter-spacing: 1px;
+  padding: 10px 20px;
+}
+
+.dialog-performance-info-body ul {
+  border: 1px solid #666;
+  padding: 5px;
+  border-radius: 3px;
+}
+
+.dialog-performance-info-body li {
+  list-style-type: initial;
+  margin: 0 20px;
+}
+
+.dialog-performance-info-body sup {
+  color: var(--highlight-color);
+  cursor: pointer;
+}
+
+.show #dialog-container.performance-info {
+  margin-top: -300px;
+}
+
+.dialog-performance-info-body .warning-icon {
+  float: left;
+  margin-top: 10px;
+}
+
+.dialog-performance-info-body .warning-icon-info {
+  overflow: hidden;
+  margin-left: 30px;
+}

src/css/dialogs-unsupported-browser.css

@@ -0,0 +1,32 @@
+/************************************************************************************************/
+/* Unsupported browser dialog                                                                   */
+/************************************************************************************************/
+
+#dialog-container.unsupported-browser {
+  width: 600px;
+  height: 260px;
+  top : 50%;
+  left : 50%;
+  position : absolute;
+  margin-top: -130px;
+  margin-left: -300px;
+}
+
+.unsupported-browser .dialog-content {
+  font-size:1.2em;
+  letter-spacing: 1px;
+  padding:10px 20px;
+  overflow: auto;
+}
+
+.unsupported-browser .supported-browser-list {
+  padding: 5px 20px;
+}
+
+.unsupported-browser .supported-browser-list li {
+  list-style-type: square;
+}
+
+#current-user-agent {
+  color: var(--highlight-color);
+}

src/css/dialogs.css

@@ -39,7 +39,7 @@
   -moz-box-sizing : border-box;
 
   border-radius: 3px;
-  border : 3px solid gold;
+  border : 3px solid var(--highlight-color);
   background: #444;
   overflow: auto;
 }
@@ -48,19 +48,6 @@
   margin-top: 0;
 }
 
-#dialog-container.browse-local {
-  width: 700px;
-  height: 500px;
-  top : 50%;
-  left : 50%;
-  position : absolute;
-  margin-left: -350px;
-}
-
-.show #dialog-container.browse-local {
-  margin-top: -250px;
-}
-
 .dialog-wrapper {
   height: 100%;
   position : relative;
@@ -76,7 +63,7 @@
 
 .dialog-head {
   width: 100%;
-  background: gold;
+  background: var(--highlight-color);
   margin: 0;
   padding: 10px;
   color: black;

src/css/forms.css

@@ -22,6 +22,11 @@
   background : #3a3a3a;
 }
 
+.textfield:focus {
+  border-color: var(--highlight-color);
+  outline: none;
+}
+
 .textfield-small {
   width : 50px;
 }
@@ -29,17 +34,13 @@
 .button {
   box-sizing: border-box;
   height: 24px;
-
-  background-color: #3f3f3f;
-  border: 1px solid #333;
-  border-top-color: #666;
-  border-bottom-color: #222;
-
+  background-color: #666;
+  border-style: none;
+  border-radius: 2px;
   cursor: pointer;
   text-decoration: none;
 
   color: white;
-  text-shadow: 0 -1px 0 black;
   font-weight: bold;
   font-size: 1rem;
   text-align: center;
@@ -48,25 +49,17 @@
 }
 
 .button:hover {
-  text-decoration: none;
-  background-color: #484848;
-  color: gold;
+  color: var(--highlight-color);
 }
 
 .button-primary {
-  background-color: rgb(255,215,0); /* gold */
-
-  border-color: rgb(179, 164, 0);
-  border-top-color: white;
-  border-bottom-color: rgb(151, 133, 0);
-
+  background-color: var(--highlight-color);
   color: black;
-  text-shadow: 0 1px 0 #fff;
 }
 
 .button-primary:hover {
-  background-color: rgb(255,235,20);
-  color: #333;
+  background-color: white;
+  color: black;
 }
 
 .button[disabled],
@@ -74,10 +67,6 @@
   cursor:default;
   background-color: #aaa;
   color: #777;
-  text-shadow: 0 1px 0 #bbb;
-  border-color: #666;
-  border-top-color: #999;
-  border-bottom-color: #555;
 }
 
 .import-size-field,

src/css/frames-list.css

@@ -54,6 +54,9 @@
 }
 
 .add-frame-action {
+  display: flex;
+  align-items: center;
+
   margin-top: 8px;
   padding: 6px 0;
   overflow: hidden;
@@ -71,6 +74,7 @@
 .add-frame-action-icon {
   margin: 3px;
   float: left;
+  flex-shrink: 0;
 }
 
 .add-frame-action .label {
@@ -79,7 +83,7 @@
 }
 
 .add-frame-action:hover {
-  border-color: gold;
+  border-color: var(--highlight-color);
 }
 
 .preview-tile {
@@ -153,7 +157,7 @@
 }
 
 .preview-tile.selected {
-  border-color: gold;
+  border-color: var(--highlight-color);
 }
 
 .preview-tile.selected:after {
@@ -162,7 +166,7 @@
   top: 38px;
   right: -9px;
   border: transparent 4px solid;
-  border-left-color: gold;
+  border-left-color: var(--highlight-color);
   border-width: 6px 0 6px 6px;
   border-style: solid;
 }
@@ -173,6 +177,6 @@
  */
 
 .preview-tile-drop-proxy {
-  border: 3px dashed gold;
+  border: 3px dashed var(--highlight-color);
   background-color: rgba(255, 215,0, 0.2);
 }

src/css/layout.css

@@ -3,7 +3,7 @@
  */
 
 .main-wrapper {
-  position: absolute;
+  position: fixed;
   top: 5px;
   right: 0;
   bottom: 5px;
@@ -26,6 +26,7 @@
   vertical-align: top;
   height: 100%;
   margin-right: 7px;
+  flex-shrink: 0;
 }
 
 .main-column {
@@ -37,6 +38,7 @@
   box-sizing: border-box;
   vertical-align: top;
   height: 100%;
+  flex-shrink: 0;
 
   display: flex;
   flex-direction: column;
@@ -81,7 +83,7 @@
   color:#888;
   font-size:12px;
   font-weight:bold;
-  font-family:Courier;
+  font-family:monospace;
 }
 
 /**

src/css/minimap.css

@@ -1,8 +1,8 @@
 .minimap-crop-frame {
-  position:absolute;
-  border:1px solid rgba(255,255,255,0.5);
-  z-index:100;
-  box-sizing : border-box;
-  -moz-box-sizing : border-box;
-  cursor : pointer;
+  position: absolute;
+  border: 2px solid gold;
+  z-index: 100;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  cursor: pointer;
 }

src/css/notifications.css

@@ -6,12 +6,12 @@
   max-width: 300px;
 
   border-top-left-radius: 7px;
-  border: #F0C36D 1px solid;
+  border: #e1a325 2px solid;
   border-right: 0;
   border-bottom: 0;
 
   color: #222;
-  background-color: #F9EDBE;
+  background-color: var(--highlight-color);
 
   font-weight: bold;
   font-size: 13px;
@@ -24,8 +24,6 @@
   top: 6px;
   right: 17px;
 
-  color: gray;
-
   font-size: 18px;
   font-weight: bold;
 
@@ -43,7 +41,7 @@
   padding: 10px;
   width: 360px;
   border-top-right-radius: 2px;
-  border: gold 2px solid;
+  border: var(--highlight-color) 2px solid;
   border-left: 0;
   border-bottom: 0;
   background-color: #444;
@@ -69,6 +67,6 @@
   margin-top: 8px;
   height : 4px;
   width : 300px;
-  background : linear-gradient(to left, gold, gold) no-repeat -300px 0;
+  background : linear-gradient(to left, var(--highlight-color), var(--highlight-color)) no-repeat -300px 0;
   background-color : black;
 }

src/css/pensize.css

@@ -1,49 +0,0 @@
-.pen-size-container {
-  overflow: hidden;
-  padding: 5px 5px;
-}
-
-.pen-size-option {
-  float: left;
-  box-sizing: border-box;
-  width: 20px;
-  height: 20px;
-  margin-right: 2px;
-  border-style: solid;
-  border-width: 2px;
-  border-color: #444;
-  cursor: pointer;
-}
-
-.pen-size-option[data-size='1'] {
-  padding: 6px;
-}
-.pen-size-option[data-size='2'] {
-  padding: 5px;
-}
-.pen-size-option[data-size='3'] {
-  padding: 4px;
-}
-.pen-size-option[data-size='4'] {
-  padding: 3px;
-}
-
-.pen-size-option:before {
-  content: '';
-  width: 100%;
-  height: 100%;
-  background-color: white;
-  display: block;
-}
-
-.pen-size-option:hover {
-  border-color: #888;
-}
-
-.pen-size-option.selected:before {
-  background-color: gold;
-}
-
-.pen-size-option.selected {
-  border-color: gold;
-}

src/css/reset.css

@@ -5,6 +5,7 @@ html, body {
   cursor : default;
   font-family: Arial;
   font-size: 11px;
+  line-height: 1.1;
   -webkit-touch-callout: none;
   -webkit-user-select: none;
   -khtml-user-select: none;
@@ -47,5 +48,5 @@ input[type="range"] {
 }
 
 a, a:visited {
-  color:gold;
+  color: var(--highlight-color);
 }

src/css/settings-application.css

@@ -1,6 +1,14 @@
-/*******************************/
-/*  Application Setting panel  */
-/*******************************/
+/********************************/
+/*  Preferences Settings panel  */
+/********************************/
+
+.settings-section-preferences {
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+  margin: 0 20px;
+  height: 100%;
+}
 
 .background-picker-wrapper {
   display: inline-block;
@@ -27,16 +35,20 @@
 }
 
 .background-picker.selected {
-  border-color: gold;
+  border-color: var(--highlight-color);
 }
 
-.layer-opacity-input {
+.settings-opacity-input {
   margin: 5px;
   vertical-align: middle;
+}
+
+.layer-opacity-input,
+.tile-mask-opacity-input {
   width: 100px;
 }
 
-.layer-opacity-text {
+.settings-opacity-text {
   height: 31px;
   display: inline-block;
   line-height: 30px;
@@ -47,11 +59,76 @@
   text-align: center;
 }
 
-.grid-width-select {
+.settings-item-grid-size,
+.settings-item-grid-color {
+  display: flex;
+  align-items: center;
+}
+
+.settings-item-grid-size > label,
+.settings-item-grid-color > label {
+  width: 65px;
+  flex-shrink: 0;
+}
+
+.settings-item-grid-size .size-picker-option {
+  border-color: #888;
+}
+
+.settings-item-grid-size .size-picker-option:not(.selected):hover {
+  border-color: white;
+}
+
+.grid-width-select,
+.color-format-select {
   margin: 5px 5px 0 5px;
 }
 
-.settings-section-application > .settings-title {
+
+.grid-colors-list {
+  overflow: hidden;
+  padding: 0 5px;
+}
+
+.grid-colors-item {
+  float: left;
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+  border: 2px solid #888;
+  margin-right: 2px;
+  margin-bottom: 2px;
+  box-sizing: border-box;
+}
+
+.grid-colors-item:hover {
+  border-color: white;
+}
+
+.grid-colors-item.selected {
+  border-color: gold;
+}
+
+.settings-section-preferences > .settings-title {
   /* Override the default 10px margin bottom for this panel */
   margin-bottom: 15px;
 }
+
+.settings-section-preferences .button-primary {
+  margin-top: 10px;
+}
+
+.settings-version-info {
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+  color: #888;
+}
+
+/* Override default link styles for the release notes link
+   It doesn't need to popout too much */
+.settings-version,
+.settings-version:hover {
+  color: white !important;
+  text-decoration: none !important;
+}

src/css/settings-export.css

@@ -43,8 +43,29 @@
   float : left;
 }
 
+.gif-export-warning {
+  display: none;
+}
+
+.gif-export-warning.visible {
+  display: flex;
+  align-items: center;
+  border: 1px solid red;
+  padding: 5px;
+  margin: 5px 0;
+}
+
+.gif-export-warning-icon {
+  flex-shrink: 0;
+  margin-right: 5px;
+}
+
+.gif-export-warning-message {
+  font-weight: normal;
+}
+
 .preview-upload-ongoing:before{
-  content: "Upload ongoing ...";
+  content: "Upload in progress...";
   position: absolute;
   display: block;
   height: 100%;
@@ -100,43 +121,6 @@
   line-height: 23px;
 }
 
-.export-tabs {
-  overflow: hidden;
-  position: relative;
-}
-
-.export-tabs:after {
-  content: "";
-  display: block;
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  height: 1px;
-  z-index: 0;
-  background-color: gold;
-}
-
-.export-tab {
-  float: left;
-  cursor: pointer;
-  padding: 5px;
-  border: 1px solid transparent;
-  /* Make sure the tab and its border are positioned above the :after element; */
-  position: relative;
-  z-index: 1;
-}
-
-.export-tab.selected,
-.export-tab:hover {
-  color: gold;
-}
-
-.export-tab.selected {
-  border-color: gold gold #444 gold;
-  border-style: solid;
-  border-width: 1px;
-}
-
 .export-panel-header {
   padding: 10px 5px 0px;
 }

src/css/settings-resize.css

@@ -5,103 +5,8 @@
   width: 25%;
 }
 
-/*****************/
-/* ANCHOR WIDGET */
-/*****************/
-
-.resize-origin-container {
-  overflow: hidden;
+.resize-anchor-container {
   position: relative;
-  width: 70px;
   margin-top: 5px;
   display: inline-block;
 }
-
-.transition .resize-origin-option,
-.transition .resize-origin-option:before {
-  transition: background-color 0.2s, border-color 0.2s;
-}
-
-.resize-origin-option {
-  float: left;
-  position: relative;
-
-  box-sizing: border-box;
-  margin: 0 1px 1px 0;
-  width: 20px;
-  height: 20px;
-
-  background : #888;
-
-  font-size: 8px;
-  text-align: center;
-  cursor: pointer;
-}
-
-.disabled .resize-origin-option {
-  cursor: default;
-  background : #555;
-  border-color: #555 !important;
-}
-
-.resize-origin-option:hover {
-  border : 3px solid white;
-}
-
-.resize-origin-option.selected {
-  border : 3px solid gold;
-}
-
-.resize-origin-option:before {
-  content: '';
-  position: absolute;
-  display: block;
-  top: 50%;
-  left: 50%;
-  margin: -2px;
-}
-
-.resize-origin-option.selected:before {
-  content: '';
-  width: 4px;
-  height: 4px;
-  background: gold;
-}
-
-.disabled .resize-origin-option.selected:before {
-  background: #555;
-}
-
-.disabled .resize-origin-option[data-neighbor]:before {
-  border-color: #555 !important;
-}
-
-.resize-origin-option[data-neighbor]:before {
-  width: 0;
-  height: 0;
-  border-width: 4px;
-  border-style: solid;
-  border-color: transparent;
-}
-
-.resize-origin-option[data-neighbor="bottom"]:before {
-  border-top-color: gold;
-  margin-left: -4px;
-}
-
-.resize-origin-option[data-neighbor="left"]:before {
-  border-right-color: gold;
-  margin-top: -4px;
-  margin-left: -6px;
-}
-
-.resize-origin-option[data-neighbor="top"]:before {
-  border-bottom-color: gold;
-  margin-top: -6px;
-  margin-left: -4px;
-}
-
-.resize-origin-option[data-neighbor="right"]:before {
-  border-left-color: gold;
-  margin-top: -4px;
-}

src/css/settings-save.css

@@ -24,3 +24,13 @@
     color: white;
     font-style: normal;
 }
+
+.save-status-warning-icon {
+  float: left;
+  margin-top: 5px;
+}
+
+.save-status-warning-icon {
+  overflow: hidden;
+  padding-left: 10px;
+}

src/css/settings.css

@@ -52,7 +52,7 @@
   background-color: #444;
   margin-right: 0;
   padding-right: 2px;
-  border-left : 3px solid gold;
+  border-left : 3px solid var(--highlight-color);
 }
 
 /************************************************************************************************/
@@ -64,7 +64,6 @@
   font-size: 12px;
   font-weight: bold;
   color: #ccc;
-  text-shadow: 1px 1px #000;
 }
 
 .settings-section .button {
@@ -77,7 +76,7 @@
   text-transform: uppercase;
   border-bottom: 1px #aaa solid;
   padding-bottom: 5px;
-  color: gold;
+  color: var(--highlight-color);
 }
 
 .settings-description {

src/css/spectrum/spectrum-overrides.css

@@ -100,8 +100,8 @@
 }
 
 .sp-palette .sp-thumb-el.sp-thumb-active {
-  border-color: gold;
-  box-shadow: 0 0 0px 1px gold;
+  border-color: var(--highlight-color);
+  box-shadow: 0 0 0px 1px var(--highlight-color);
 }
 
 .sp-input {
@@ -110,7 +110,7 @@
   background: #111;
   border-radius: 2px;
   color: #D3D3D3;
-  font-family: Courier!important;
+  font-family: monospace!important;
 }
 
 .sp-input.sp-validation-error {

src/css/sprites.css

@@ -1,113 +0,0 @@
-/*
-Icon classes can be used entirely standalone. They are named after their original file names.
-
-```html
-<!-- `display: block` sprite -->
-<div class="icon-home"></div>
-
-<!-- `display: inline-block` sprite -->
-<img class="icon-home" />
-```
-*/
-.icon-cloud_export {
-  background-image: url(../img/spritesheet.png);
-  background-position: -512px -276px;
-  width: 50px;
-  height: 47px;
-}
-.icon-dragndrop {
-  background-image: url(../img/spritesheet.png);
-  background-position: -564px -173px;
-  width: 48px;
-  height: 48px;
-}
-.icon-duplicate {
-  background-image: url(../img/spritesheet.png);
-  background-position: -512px -369px;
-  width: 16px;
-  height: 16px;
-}
-.icon-export {
-  background-image: url(../img/spritesheet.png);
-  background-position: -564px -225px;
-  width: 43px;
-  height: 42px;
-}
-.icon-favicon {
-  background-image: url(../img/spritesheet.png);
-  background-position: -582px -151px;
-  width: 16px;
-  height: 16px;
-}
-.icon-gallery {
-  background-image: url(../img/spritesheet.png);
-  background-position: -512px -225px;
-  width: 52px;
-  height: 51px;
-}
-.icon-garbage {
-  background-image: url(../img/spritesheet.png);
-  background-position: 0px 0px;
-  width: 512px;
-  height: 512px;
-}
-.icon-gear {
-  background-image: url(../img/spritesheet.png);
-  background-position: -563px -323px;
-  width: 38px;
-  height: 37px;
-}
-.icon-import-icon {
-  background-image: url(../img/spritesheet.png);
-  background-position: -576px -69px;
-  width: 28px;
-  height: 36px;
-}
-.icon-keyboard {
-  background-image: url(../img/spritesheet.png);
-  background-position: -512px -133px;
-  width: 70px;
-  height: 40px;
-}
-.icon-local-storage-icon {
-  background-image: url(../img/spritesheet.png);
-  background-position: -512px 0px;
-  width: 100px;
-  height: 69px;
-}
-.icon-merge-icon {
-  background-image: url(../img/spritesheet.png);
-  background-position: -512px -69px;
-  width: 64px;
-  height: 64px;
-}
-.icon-plus {
-  background-image: url(../img/spritesheet.png);
-  background-position: -512px -323px;
-  width: 51px;
-  height: 46px;
-}
-.icon-popup-preview-arrow-gold {
-  background-image: url(../img/spritesheet.png);
-  background-position: -576px -105px;
-  width: 24px;
-  height: 18px;
-}
-.icon-popup-preview-arrow-white {
-  background-image: url(../img/spritesheet.png);
-  background-position: -582px -133px;
-  width: 24px;
-  height: 18px;
-}
-.icon-resize-icon {
-  background-image: url(../img/spritesheet.png);
-  background-position: -512px -173px;
-  width: 52px;
-  height: 52px;
-}
-.icon-save {
-  background-image: url(../img/spritesheet.png);
-  background-position: -562px -276px;
-  width: 43px;
-  height: 42px;
-}

src/css/style.css

@@ -17,11 +17,11 @@ body {
 }
 
 .no-overflow {
-  overflow : hidden;
+  overflow: hidden;
 }
 
-.image-link {
-  color : gold;
+.highlight {
+  color: var(--highlight-color);
 }
 
 .pull-top,
@@ -55,11 +55,15 @@ body {
   margin-left: 0;
 }
 
+.hidden {
+  display: none;
+}
+
 /**
  * TOOLTIPS
  */
 .tooltip-shortcut {
-  color:gold;
+  color: var(--highlight-color);
 }
 
 .tooltip-container {

src/css/toolbox-animated-preview.css

@@ -79,7 +79,7 @@
 
 .preview-toggle-onion-skin-enabled,
 .preview-toggle-onion-skin-enabled:hover {
-  color : gold;
+  color : var(--highlight-color);
 }
 
 .preview-contextual-actions {
@@ -98,7 +98,9 @@
   opacity: 1;
 }
 
-.original-size-button {
+.preview-contextual-action {
+  float: left;
+
   width : 18px;
   height: 18px;
   line-height: 18px;
@@ -113,28 +115,86 @@
   font-family: Tahoma;
 }
 
-.original-size-button-enabled {
-  color: gold;
-  border-color: gold;
+.preview-contextual-action-hidden {
+  display: none;
 }
 
-.preview-contextual-action {
-  float: left;
+.preview-contextual-action:hover {
+  color: var(--highlight-color);
+  border-color: var(--highlight-color);
 }
 
+/**
+ * Drop-down in preview size selection
+ */
+.preview-drop-down {
+  float: left;
+  position: relative;
+  width : 22px;
+  min-height: 22px;
+  margin: 0 5px;
+}
+
+.preview-drop-down.preview-drop-down-disabled {
+  opacity: 0.5;
+}
+
+.preview-disable-overlay{
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  display: none;
+}
+
+.preview-drop-down.preview-drop-down-disabled .preview-disable-overlay {
+  display: block;
+  z-index: 10;
+}
+
+.preview-drop-down .preview-contextual-action {
+  position: relative;
+  margin: 0 0 -100% 0;
+  opacity: 0;
+  transition: opacity linear .2s,
+              margin linear .2s;
+  transition-delay: 0s, .2s;
+  z-index: 1;
+}
+
+.preview-drop-down:hover .preview-contextual-action {
+  margin: 0 0 5px 0;
+  opacity: 1;
+  transition-delay: 0s, 0s;
+}
+
+.preview-drop-down .size-button-selected {
+  opacity: 1;
+  color: gold;
+  border-color: gold;
+  z-index: 5;
+}
+
+
 .open-popup-preview-button {
   border : 2px solid white;
   background-color : rgba(0,0,0,0.3);
 }
 
 .open-popup-preview-button:hover {
-  border-color: gold;
+  border-color: var(--highlight-color);
 }
 
 /**
- * The regular image is provided bby the sprite icons.png+icons.css
+ * The regular image is provided by the sprite icons.png+icons.css
  */
 .icon-minimap-popup-preview-arrow-white:hover {
   background-image: url(../img/icons/minimap/minimap-popup-preview-arrow-gold.png);
   background-position: 0 0;
+  background-size: 18px 18px;
+}
+
+@media (-webkit-min-device-pixel-ratio: 2),
+       (min-resolution: 192dpi) {
+  background-image: url(../img/icons/minimap/minimap-popup-preview-arrow-gold@2x.png);
+
 }

src/css/toolbox-layers-list.css

@@ -35,7 +35,7 @@
 
 .layers-toggle-preview-enabled,
 .layers-toggle-preview-enabled:hover {
-  color : gold;
+  color : var(--highlight-color);
 }
 
 /**
@@ -59,24 +59,34 @@
 
 .layer-item {
   position: relative;
+  display: flex;
   height:24px;
   line-height: 24px;
-  padding: 0 0 0 10px;
   border-top: 1px solid #444;
   cursor: pointer;
 }
 
+.layer-item .layer-name {
+  padding: 0 0 0 10px;
+  flex: 1 auto;
+  white-space: nowrap;
+}
+
+.layer-item .layer-name.overflowing-name {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 .layer-item:hover {
   background : #222;
 }
 
 .layer-item-opacity {
-  position: absolute;
-  right: 8px;
+  padding-right: 8px;
 }
 
 .current-layer-item,
 .current-layer-item:hover {
   background : #333;
-  color: gold;
+  color: var(--highlight-color);
 }

src/css/toolbox-palettes-list.css

@@ -76,6 +76,11 @@
   position: relative;
 }
 
+.palettes-list-colors.tiny > .palettes-list-color {
+  width: calc((100% - 35px) / 10);
+  height: 16px;
+}
+
 .palettes-list-color div {
   height: 100%;
 }
@@ -121,13 +126,14 @@
  * Color index for the 9 first colors
  */
 
-.palettes-list-color:nth-child(-n+10):after {
+:not(.tiny) > .palettes-list-color:nth-child(-n+10):after {
+  content: attr(data-color-index);
   position: absolute;
   top: 0;
   right: 0;
 
   background-color: black;
-  color: gold;
+  color: var(--highlight-color);
 
   font-family: Tahoma;
   font-size: 0.5em;
@@ -136,39 +142,3 @@
   padding: 2px 3px 2px 3px;
   border-radius: 0 0 0 2px;
 }
-
-.palettes-list-color:nth-child(1):after {
-  content: "1";
-}
-
-.palettes-list-color:nth-child(2):after {
-  content: "2";
-}
-
-.palettes-list-color:nth-child(3):after {
-  content: "3";
-}
-
-.palettes-list-color:nth-child(4):after {
-  content: "4";
-}
-
-.palettes-list-color:nth-child(5):after {
-  content: "5";
-}
-
-.palettes-list-color:nth-child(6):after {
-  content: "6";
-}
-
-.palettes-list-color:nth-child(7):after {
-  content: "7";
-}
-
-.palettes-list-color:nth-child(8):after {
-  content: "8";
-}
-
-.palettes-list-color:nth-child(9):after {
-  content: "9";
-}

src/css/toolbox.css

@@ -26,7 +26,17 @@
 
 .toolbox-buttons .button {
   /* Override border propery on .button elements from form.css */
+  border-style: solid;
+  border-color: #333;
   border-width: 0 1px 0 0;
+  border-radius: 0;
+
+  background-color: #3f3f3f;
+}
+
+.toolbox-buttons .button[disabled],
+.toolbox-buttons .button[disabled]:hover {
+  background-color: #aaa;
 }
 
 .toolbox-buttons button:last-child {

src/css/tools.css

@@ -17,7 +17,7 @@
   position : absolute;
   height : 100%;
   width : 100%;
-  border: 3px solid gold;
+  border: 3px solid var(--highlight-color);
   box-sizing: border-box;
 }
 
@@ -31,33 +31,39 @@
 
 .tool-paint-bucket .drawing-canvas-container:hover,
 .tool-colorswap .drawing-canvas-container:hover {
-  cursor: url(../img/cursors/paint-bucket.png) 12 12, pointer;
+  cursor: url(../img/cursors/paint-bucket.png) 14 14, pointer;
 }
 
 .tool-vertical-mirror-pen .drawing-canvas-container:hover {
   cursor: url(../img/cursors/vertical-mirror-pen.png) 5 15, pointer;
 }
 
-.tool-pen .drawing-canvas-container:hover,
-.tool-lighten .drawing-canvas-container:hover,
+.tool-pen .drawing-canvas-container:hover {
+  cursor: url(../img/cursors/pen.png) 1 14, pointer;
+}
+
 .tool-dithering .drawing-canvas-container:hover {
-  cursor: url(../img/cursors/pen.png) 0 15, pointer;
+  cursor: url(../img/cursors/dither.png) 1 14, pointer;
+}
+
+.tool-lighten .drawing-canvas-container:hover {
+  cursor: url(../img/cursors/lighten.png) 1 15, pointer;
 }
 
 .tool-eraser .drawing-canvas-container:hover {
-  cursor: url(../img/cursors/eraser.png) 0 15, pointer;
+  cursor: url(../img/cursors/eraser.png) 3 14, pointer;
 }
 
 .tool-stroke .drawing-canvas-container:hover {
-  cursor: url(../img/cursors/pen.png) 0 15, pointer;
+  cursor: url(../img/cursors/stroke.png) 1 14, pointer;
 }
 
 .tool-rectangle .drawing-canvas-container:hover {
-  cursor: url(../img/cursors/rectangle.png) 0 15, pointer;
+  cursor: url(../img/cursors/rectangle.png) 5 15, pointer;
 }
 
 .tool-circle .drawing-canvas-container:hover {
-  cursor: url(../img/cursors/circle.png) 2 15, pointer;
+  cursor: url(../img/cursors/circle.png) 5 15, pointer;
 }
 
 .tool-move .drawing-canvas-container:hover {
@@ -70,11 +76,11 @@
 }
 
 .tool-shape-select .drawing-canvas-container:hover {
-  cursor: url(../img/cursors/wand.png) 15 15, pointer;
+  cursor: url(../img/cursors/wand.png) 10 5, pointer;
 }
 
 .tool-colorpicker .drawing-canvas-container:hover {
-  cursor: url(../img/cursors/dropper.png) 0 15, pointer;
+  cursor: url(../img/cursors/dropper.png) 2 15, pointer;
 }
 
 .swap-colors-button {

src/css/transformations.css

@@ -3,5 +3,38 @@
 }
 
 .transformations-container .tool-icon {
-  float:left;
+  margin: 0 0 5px 0;
+}
+
+.transformations-container .tools-wrapper {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  height: 46px;
+
+  /* Override the float:left set on tools-wrapper in layout.css; */
+  float: initial;
+}
+
+.transformations-container.show-more .tools-wrapper {
+  height: auto;
+  /* Compensate the 5px bottom-margin coming from the tool-icon */
+  margin-bottom: -5px;
+}
+
+.transformations-show-more-link {
+  position: absolute;
+  color: #999;
+  right: 10px;
+  font-weight: normal;
+  cursor: pointer;
+  transition: 0.2s linear;
+}
+
+.transformations-show-more-link:hover {
+  color: white;
+}
+
+.show-more .transformations-show-more-link {
+  color: gold;
 }

src/css/variables.css

@@ -0,0 +1,3 @@
+html, body {
+  --highlight-color: gold;
+}

src/css/widgets-anchor.css

@@ -0,0 +1,98 @@
+/*****************/
+/* ANCHOR WIDGET */
+/*****************/
+
+.anchor-wrapper {
+  overflow: hidden;
+  width: 70px;
+}
+
+/* When transitioning between enabled and disabled states */
+.transition .anchor-option,
+.transition .anchor-option:before {
+  transition: background-color 0.2s, border-color 0.2s;
+}
+
+.anchor-option {
+  float: left;
+  position: relative;
+
+  box-sizing: border-box;
+  margin: 0 1px 1px 0;
+  width: 20px;
+  height: 20px;
+
+  background : #888;
+
+  font-size: 8px;
+  text-align: center;
+  cursor: pointer;
+}
+
+.disabled .anchor-option {
+  cursor: default;
+  background : #555;
+  border-color: #555 !important;
+}
+
+.anchor-option:hover {
+  border : 3px solid white;
+}
+
+.anchor-option.selected {
+  border : 3px solid var(--highlight-color);
+}
+
+.anchor-option:before {
+  content: '';
+  position: absolute;
+  display: block;
+  top: 50%;
+  left: 50%;
+  margin: -2px;
+}
+
+.anchor-option.selected:before {
+  content: '';
+  width: 4px;
+  height: 4px;
+  background: var(--highlight-color);
+}
+
+.disabled .anchor-option.selected:before {
+  background: #555;
+}
+
+.disabled .anchor-option[data-neighbor]:before {
+  border-color: #555 !important;
+}
+
+.anchor-option[data-neighbor]:before {
+  width: 0;
+  height: 0;
+  border-width: 4px;
+  border-style: solid;
+  border-color: transparent;
+}
+
+.anchor-option[data-neighbor="bottom"]:before {
+  border-top-color: var(--highlight-color);
+  margin-left: -4px;
+}
+
+.anchor-option[data-neighbor="left"]:before {
+  border-right-color: var(--highlight-color);
+  margin-top: -4px;
+  margin-left: -6px;
+}
+
+.anchor-option[data-neighbor="top"]:before {
+  border-bottom-color: var(--highlight-color);
+  margin-top: -6px;
+  margin-left: -4px;
+}
+
+.anchor-option[data-neighbor="right"]:before {
+  border-left-color: var(--highlight-color);
+  margin-top: -4px;
+}

src/css/widgets-frame-picker.css

@@ -0,0 +1,55 @@
+/***********************/
+/* FRAME PICKER WIDGET */
+/***********************/
+
+.frame-picker-wrapper {
+  width: 150px;
+  height: 150px;
+  border: 3px solid #666;
+  border-radius: 3px;
+}
+
+.frame-viewer {
+  width: 100%;
+  height: calc(100% - 25px);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+}
+
+.frame-viewer > canvas,
+.frame-viewer > img {
+  max-width: 100%;
+  max-height: 100%;
+}
+
+.frame-nav {
+  display: flex;
+  width: 100%;
+  height: 24px;
+  border-top: 1px solid #666;
+}
+
+.frame-nav .button {
+  flex-shrink: 0;
+  border-radius: 0;
+  height: 24px;
+  background-color: #3f3f3f;
+}
+
+.frame-nav .button[disabled],
+.frame-nav .button[disabled]:hover {
+    background-color: #aaa;
+}
+
+.frame-nav .button + .button {
+  border-left: 1px solid #333;
+}
+
+.frame-nav-input {
+  min-width: 1px;
+  border-style: none;
+  height: 24px;
+  text-align: center;
+}

src/css/widgets-size-picker.css

@@ -0,0 +1,61 @@
+/***********************/
+/* SIZE PICKER WIDGET */
+/***********************/
+
+.size-picker-container {
+  overflow: hidden;
+  padding: 5px 5px;
+}
+
+.size-picker-option {
+  float: left;
+  box-sizing: border-box;
+  width: 20px;
+  height: 20px;
+  margin-right: 2px;
+  border-style: solid;
+  border-width: 2px;
+  border-color: #444;
+  cursor: pointer;
+}
+
+.size-picker-option[data-size='1'] {
+  padding: 5px;
+}
+.size-picker-option[data-size='2'] {
+  padding: 4px;
+}
+.size-picker-option[data-size='3'] {
+  padding: 3px;
+}
+.size-picker-option[data-size='4'] {
+  padding: 2px;
+}
+
+.size-picker-option:before {
+  content: '';
+  width: 100%;
+  height: 100%;
+  background-color: white;
+  display: block;
+  text-align: center;
+  line-height: 12px;
+  font-size: 90%;
+}
+
+.size-picker-option:hover {
+  border-color: #888;
+}
+
+.size-picker-option.selected:before {
+  background-color: var(--highlight-color);
+}
+
+.size-picker-option.selected {
+  border-color: var(--highlight-color);
+}
+
+.size-picker-option.labeled:before {
+  content: attr(real-size);
+  color: black;
+}

src/css/widgets-tabs.css

@@ -0,0 +1,42 @@
+/*****************/
+/*  TABS WIDGET  */
+/*****************/
+
+.tab-list {
+  overflow: hidden;
+  position: relative;
+}
+
+.tab-list:after {
+  content: "";
+  display: block;
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 1px;
+  z-index: 0;
+  background-color: var(--highlight-color);
+}
+
+.tab-item {
+  float: left;
+  cursor: pointer;
+  padding: 5px;
+  border: 1px solid transparent;
+  border-radius: 2px 2px 0 0;
+  /* Make sure the tab and its border are positioned above the :after element; */
+  position: relative;
+  z-index: 1;
+}
+
+.tab-item.selected,
+.tab-item:hover {
+  color: var(--highlight-color);
+}
+
+.tab-item.selected {
+  border-color: var(--highlight-color);
+  border-bottom-color: #444;
+  border-style: solid;
+  border-width: 1px;
+}

src/css/widgets-wizard.css

@@ -0,0 +1,32 @@
+.wizard-wrapper {
+  z-index: 1;
+  position: relative;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+
+.wizard-step {
+  z-index: -1;
+  margin-left: calc(100% + 5px);
+  position: absolute;
+}
+
+.current-step {
+  z-index: 1;
+  margin-left: 0;
+}
+
+.current-step-in,
+.current-step-out {
+  z-index: 10;
+  transition: margin-left 200ms;
+}
+
+.current-step-in {
+  margin-left: 0;
+}
+
+.current-step-out {
+  margin-left: 100%;
+}

src/index.html

@@ -22,9 +22,7 @@
     color:white;">
       <span style="top:45%">Loading Piskel ...</span>
   </div>
-  <!--standalone-start-->
   @@include('templates/debug-header.html', {})
-  <!--standalone-end-->
 
   <!-- the comment below indicates the beginning of markup reused by the editor integrated in piskelapp.com -->
   <!-- do not delete, do not move :) -->
@@ -69,18 +67,28 @@
   </div>
 
   @@include('templates/misc-templates.html', {})
+  @@include('templates/data-uri-export.html', {})
   @@include('templates/popup-preview.html', {})
 
-  <span class="cheatsheet-link icon-common-keyboard-gold" rel="tooltip" data-placement="right" title="Keyboard shortcuts">&nbsp;</span>
+  <span class="cheatsheet-link icon-common-keyboard-gold"
+        rel="tooltip" data-placement="right" title="Keyboard shortcuts">&nbsp;</span>
+  <div class="performance-link icon-common-warning-red"
+       rel="tooltip" data-placement="left" title="Performance problem detected, learn more.">&nbsp;</div>
 
   <!-- dialogs partials -->
-  @@include('templates/dialogs/create-palette.html', {})
-  @@include('templates/dialogs/import-image.html', {})
+  @@include('templates/dialogs/browse-backups.html', {})
   @@include('templates/dialogs/browse-local.html', {})
   @@include('templates/dialogs/cheatsheet.html', {})
+  @@include('templates/dialogs/create-palette.html', {})
+  @@include('templates/dialogs/import.html', {})
+  @@include('templates/dialogs/performance-info.html', {})
+  @@include('templates/dialogs/unsupported-browser.html', {})
 
   <!-- settings-panel partials -->
-  @@include('templates/settings/application.html', {})
+  @@include('templates/settings/preferences.html', {})
+  @@include('templates/settings/preferences/grid.html', {})
+  @@include('templates/settings/preferences/misc.html', {})
+  @@include('templates/settings/preferences/tile.html', {})
   @@include('templates/settings/resize.html', {})
   @@include('templates/settings/save.html', {})
   @@include('templates/settings/import.html', {})

src/js/.eslintrc

@@ -0,0 +1,99 @@
+{
+  "env": {
+    "es6": true,
+    "browser": true
+  },
+  "globals": {
+    "$": true,
+    "jQuery": true,
+    "pskl": true,
+    "Events": true,
+    "Constants": true,
+    "console": true,
+    "module": true,
+    "require": true,
+    "Q": true,
+    "Promise": true
+  },
+  "rules": {
+    "no-undef": 2,
+    "no-use-before-define": [
+      2,
+      {
+        "functions": false
+      }
+    ],
+    "curly": [
+      2,
+      "all"
+    ],
+    "operator-linebreak": [
+      2,
+      "after"
+    ],
+    "camelcase": [
+      2,
+      {
+        "properties": "never"
+      }
+    ],
+    "max-len": [
+      2,
+      120
+    ],
+    "indent": [
+      2,
+      2,
+      {
+        "SwitchCase": 1
+      }
+    ],
+    "quotes": [
+      2,
+      "single"
+    ],
+    "no-multi-str": 2,
+    "no-mixed-spaces-and-tabs": 2,
+    "no-trailing-spaces": 2,
+    "space-unary-ops": [
+      2,
+      {
+        "nonwords": false,
+        "overrides": {}
+      }
+    ],
+    "one-var": [
+      2,
+      "never"
+    ],
+    "brace-style": [
+      2,
+      "1tbs",
+      {
+        "allowSingleLine": true
+      }
+    ],
+    "keyword-spacing": [
+      2,
+      {}
+    ],
+    "space-infix-ops": 2,
+    "space-before-blocks": [
+      2,
+      "always"
+    ],
+    "eol-last": 2,
+    "space-in-parens": [
+      2,
+      "never"
+    ],
+    "no-multiple-empty-lines": 2,
+    "no-with": 2,
+    "no-spaced-func": 2,
+    "dot-notation": 2,
+    "semi": [
+      2,
+      "always"
+    ]
+  }
+}

src/js/Constants.js

@@ -12,14 +12,17 @@ var Constants = {
   MAX_HEIGHT : 1024,
   MAX_WIDTH : 1024,
 
-  MAX_PALETTE_COLORS : 100,
+  MAX_PALETTE_COLORS : 256,
+  // allow current colors service to get up to 256 colors.
+  // GIF generation is different if the color count goes over 256.
+  MAX_WORKER_COLORS : 256,
 
   PREVIEW_FILM_SIZE : 96,
   ANIMATED_PREVIEW_WIDTH : 200,
 
   DEFAULT_PEN_COLOR : '#000000',
   TRANSPARENT_COLOR : 'rgba(0, 0, 0, 0)',
-  SEAMLESS_MODE_OVERLAY_COLOR : 'rgba(255, 255, 255, 0.5)',
+  SEAMLESS_MODE_OVERLAY_COLOR : 'rgba(255, 255, 255, 0)',
 
   CURRENT_COLORS_PALETTE_ID : '__current-colors',
 
@@ -49,8 +52,17 @@ var Constants = {
   // TESTS
   DRAWING_TEST_FOLDER : 'drawing',
 
+  // Maximum size of a sprite that can be saved on piskelapp datastore.
+  // This size will be compared to the length of the stringified serialization of the sprite.
+  // This is an approximation at best but gives correct results in most cases.
+  // The datastore limit is 1 MiB, which we roughly approximate to 1 million characters.
+  APPENGINE_SAVE_LIMIT : 1 * 1024 * 1024,
+
+  // Message displayed when an action will lead to erase the current animation.
+  CONFIRM_OVERWRITE: 'This will replace your current animation, are you sure you want to continue?',
+
   // SERVICE URLS
   APPENGINE_SAVE_URL : 'save',
-  IMAGE_SERVICE_UPLOAD_URL : 'http://piskel-imgstore-b.appspot.com/__/upload',
-  IMAGE_SERVICE_GET_URL : 'http://piskel-imgstore-b.appspot.com/img/'
+  IMAGE_SERVICE_UPLOAD_URL : '{{protocol}}://piskel-imgstore-b.appspot.com/__/upload',
+  IMAGE_SERVICE_GET_URL : '{{protocol}}://piskel-imgstore-b.appspot.com/img/'
 };

src/js/Events.js

@@ -15,7 +15,7 @@ var Events = {
   DRAG_START : 'DRAG_START',
   DRAG_END : 'DRAG_END',
 
-  DIALOG_DISPLAY : 'DIALOG_DISPLAY',
+  DIALOG_SHOW : 'DIALOG_SHOW',
   DIALOG_HIDE : 'DIALOG_HIDE',
 
   PALETTE_LIST_UPDATED : 'PALETTE_LIST_UPDATED',
@@ -59,11 +59,16 @@ var Events = {
   AFTER_SAVING_PISKEL: 'AFTER_SAVING_PISKEL',
 
   FRAME_SIZE_CHANGED : 'FRAME_SIZE_CHANGED',
+  FPS_CHANGED : 'FPS_CHANGED',
 
   SELECTION_CREATED: 'SELECTION_CREATED',
   SELECTION_MOVE_REQUEST: 'SELECTION_MOVE_REQUEST',
   SELECTION_DISMISSED: 'SELECTION_DISMISSED',
 
+  CLIPBOARD_COPY: 'CLIPBOARD_COPY',
+  CLIPBOARD_CUT: 'CLIPBOARD_CUT',
+  CLIPBOARD_PASTE: 'CLIPBOARD_PASTE',
+
   SHOW_NOTIFICATION: 'SHOW_NOTIFICATION',
   HIDE_NOTIFICATION: 'HIDE_NOTIFICATION',
 
@@ -76,6 +81,10 @@ var Events = {
 
   CURRENT_COLORS_UPDATED : 'CURRENT_COLORS_UPDATED',
 
+  PERFORMANCE_REPORT_CHANGED : 'PERFORMANCE_REPORT_CHANGED',
+
+  PISKEL_FILE_IMPORT_FAILED : 'PISKEL_FILE_IMPORT_FAILED',
+
   // Tests
   MOUSE_EVENT : 'MOUSE_EVENT',
   KEYBOARD_EVENT : 'KEYBOARD_EVENT',

src/js/app.js

@@ -10,17 +10,24 @@
   ns.app = {
 
     init : function () {
+      // Run preferences migration scripts for version v0.12.0
+      pskl.UserSettings.migrate_to_v0_12();
+
       /**
        * When started from APP Engine, appEngineToken_ (Boolean) should be set on window.pskl
        */
       this.isAppEngineVersion = !!pskl.appEngineToken_;
 
+      // This id is used to keep track of sessions in the BackupService.
+      this.sessionId = pskl.utils.Uuid.generate();
+
       this.shortcutService = new pskl.service.keyboard.ShortcutService();
       this.shortcutService.init();
 
       var size = pskl.UserSettings.get(pskl.UserSettings.DEFAULT_SIZE);
+      var fps = Constants.DEFAULT.FPS;
       var descriptor = new pskl.model.piskel.Descriptor('New Piskel', '');
-      var piskel = new pskl.model.Piskel(size.width, size.height, descriptor);
+      var piskel = new pskl.model.Piskel(size.width, size.height, fps, descriptor);
 
       var layer = new pskl.model.Layer('Layer 1');
       var frame = new pskl.model.Frame(size.width, size.height);
@@ -35,6 +42,8 @@
       this.piskelController.init();
 
       this.paletteImportService = new pskl.service.palette.PaletteImportService();
+      this.paletteImportService.init();
+
       this.paletteService = new pskl.service.palette.PaletteService();
       this.paletteService.addDynamicPalette(new pskl.service.palette.CurrentColorsPalette());
 
@@ -58,7 +67,6 @@
 
       this.drawingController = new pskl.controller.DrawingController(
         this.piskelController,
-        this.paletteController,
         $('#drawing-canvas-container'));
       this.drawingController.init();
 
@@ -76,7 +84,7 @@
 
       this.framesListController = new pskl.controller.FramesListController(
         this.piskelController,
-        $('#preview-list'));
+        $('#preview-list-wrapper').get(0));
       this.framesListController.init();
 
       this.layersListController = new pskl.controller.LayersListController(this.piskelController);
@@ -94,7 +102,7 @@
       this.selectionManager = new pskl.selection.SelectionManager(this.piskelController);
       this.selectionManager.init();
 
-      this.historyService = new pskl.service.HistoryService(this.corePiskelController);
+      this.historyService = new pskl.service.HistoryService(this.piskelController);
       this.historyService.init();
 
       this.notificationController = new pskl.controller.NotificationController();
@@ -109,6 +117,9 @@
       this.canvasBackgroundController = new pskl.controller.CanvasBackgroundController();
       this.canvasBackgroundController.init();
 
+      this.indexedDbStorageService = new pskl.service.storage.IndexedDbStorageService(this.piskelController);
+      this.indexedDbStorageService.init();
+
       this.localStorageService = new pskl.service.storage.LocalStorageService(this.piskelController);
       this.localStorageService.init();
 
@@ -124,12 +135,15 @@
       this.storageService = new pskl.service.storage.StorageService(this.piskelController);
       this.storageService.init();
 
-      this.importService = new pskl.service.ImportService(this.piskelController, this.previewController);
+      this.importService = new pskl.service.ImportService(this.piskelController);
+      this.importService.init();
 
       this.imageUploadService = new pskl.service.ImageUploadService();
       this.imageUploadService.init();
 
-      this.savedStatusService = new pskl.service.SavedStatusService(this.piskelController, this.historyService);
+      this.savedStatusService = new pskl.service.SavedStatusService(
+        this.piskelController,
+        this.historyService);
       this.savedStatusService.init();
 
       this.backupService = new pskl.service.BackupService(this.piskelController);
@@ -138,7 +152,9 @@
       this.beforeUnloadService = new pskl.service.BeforeUnloadService(this.piskelController);
       this.beforeUnloadService.init();
 
-      this.headerController = new pskl.controller.HeaderController(this.piskelController, this.savedStatusService);
+      this.headerController = new pskl.controller.HeaderController(
+        this.piskelController,
+        this.savedStatusService);
       this.headerController.init();
 
       this.penSizeService = new pskl.service.pensize.PenSizeService();
@@ -147,20 +163,29 @@
       this.penSizeController = new pskl.controller.PenSizeController();
       this.penSizeController.init();
 
-      this.fileDropperService = new pskl.service.FileDropperService(
-        this.piskelController,
-        document.querySelector('#drawing-canvas-container'));
+      this.fileDropperService = new pskl.service.FileDropperService(this.piskelController);
       this.fileDropperService.init();
 
-      var drawingLoop = new pskl.rendering.DrawingLoop();
-      drawingLoop.addCallback(this.render, this);
-      drawingLoop.start();
+      this.userWarningController = new pskl.controller.UserWarningController(this.piskelController);
+      this.userWarningController.init();
+
+      this.performanceReportService = new pskl.service.performance.PerformanceReportService(
+        this.piskelController,
+        this.currentColorsService);
+      this.performanceReportService.init();
+
+      this.clipboardService = new pskl.service.ClipboardService(this.piskelController);
+      this.clipboardService.init();
+
+      this.drawingLoop = new pskl.rendering.DrawingLoop();
+      this.drawingLoop.addCallback(this.render, this);
+      this.drawingLoop.start();
 
       this.initTooltips_();
 
       var piskelData = this.getPiskelInitData_();
       if (piskelData && piskelData.piskel) {
-        this.loadPiskel_(piskelData.piskel, piskelData.descriptor, piskelData.fps);
+        this.loadPiskel_(piskelData);
       }
 
       if (pskl.devtools) {
@@ -173,13 +198,28 @@
         mb.createMacBuiltin('Piskel');
         gui.Window.get().menu = mb;
       }
+
+      if (!pskl.utils.Environment.isIntegrationTest() && pskl.utils.UserAgent.isUnsupported()) {
+        $.publish(Events.DIALOG_SHOW, {
+          dialogId : 'unsupported-browser'
+        });
+      }
+
+      if (pskl.utils.Environment.isDebug()) {
+        pskl.app.shortcutService.registerShortcut(pskl.service.keyboard.Shortcuts.DEBUG.RELOAD_STYLES,
+          window.reloadStyles);
+      }
     },
 
-    loadPiskel_ : function (serializedPiskel, descriptor, fps) {
+    loadPiskel_ : function (piskelData) {
+      var serializedPiskel = piskelData.piskel;
       pskl.utils.serialization.Deserializer.deserialize(serializedPiskel, function (piskel) {
-        piskel.setDescriptor(descriptor);
         pskl.app.piskelController.setPiskel(piskel);
-        pskl.app.previewController.setFPS(fps);
+        $.publish(Events.PISKEL_SAVED);
+        if (piskelData.descriptor) {
+          // Backward compatibility for v2 or older
+          piskel.setDescriptor(piskelData.descriptor);
+        }
       });
     },
 

src/js/controller/DrawingController.js

@@ -2,14 +2,12 @@
 
   var ns = $.namespace('pskl.controller');
 
-  ns.DrawingController = function (piskelController, paletteController, container) {
+  ns.DrawingController = function (piskelController, container) {
     /**
      * @public
      */
     this.piskelController = piskelController;
 
-    this.paletteController = paletteController;
-
     this.dragHandler = new ns.drawing.DragHandler(this);
 
     /**
@@ -64,8 +62,12 @@
 
     var shortcuts = pskl.service.keyboard.Shortcuts;
     pskl.app.shortcutService.registerShortcut(shortcuts.MISC.RESET_ZOOM, this.resetZoom_.bind(this));
-    pskl.app.shortcutService.registerShortcut(shortcuts.MISC.INCREASE_ZOOM, this.increaseZoom_.bind(this, 1));
-    pskl.app.shortcutService.registerShortcut(shortcuts.MISC.DECREASE_ZOOM, this.decreaseZoom_.bind(this, 1));
+    pskl.app.shortcutService.registerShortcut(shortcuts.MISC.INCREASE_ZOOM, this.updateZoom_.bind(this, 1));
+    pskl.app.shortcutService.registerShortcut(shortcuts.MISC.DECREASE_ZOOM, this.updateZoom_.bind(this, -1));
+    pskl.app.shortcutService.registerShortcut(shortcuts.MISC.OFFSET_UP, this.updateOffset_.bind(this, 'up'));
+    pskl.app.shortcutService.registerShortcut(shortcuts.MISC.OFFSET_RIGHT, this.updateOffset_.bind(this, 'right'));
+    pskl.app.shortcutService.registerShortcut(shortcuts.MISC.OFFSET_DOWN, this.updateOffset_.bind(this, 'down'));
+    pskl.app.shortcutService.registerShortcut(shortcuts.MISC.OFFSET_LEFT, this.updateOffset_.bind(this, 'left'));
 
     window.setTimeout(function () {
       this.afterWindowResize_();
@@ -86,9 +88,10 @@
     window.addEventListener('mouseup', this.onMouseup_.bind(this));
     window.addEventListener('mousemove', this.onMousemove_.bind(this));
     window.addEventListener('keyup', this.onKeyup_.bind(this));
-    window.addEventListener('touchstart', this.onMousedown_.bind(this));
-    window.addEventListener('touchmove' , this.onMousemove_.bind(this));
-    window.addEventListener('touchend', this.onMouseup_.bind(this));
+    window.addEventListener('touchstart', this.onTouchstart_.bind(this));
+    window.addEventListener('touchmove' , this.onTouchmove_.bind(this));
+    window.addEventListener('touchend', this.onTouchend_.bind(this));
+
     // Deactivate right click:
     body.contextmenu(this.onCanvasContextMenu_);
 
@@ -136,6 +139,19 @@
     $.publish(Events.ZOOM_CHANGED);
   };
 
+  ns.DrawingController.prototype.onTouchstart_ = function (event) {
+    this.onMousedown_(event);
+  };
+
+  ns.DrawingController.prototype.onTouchmove_ = function (event) {
+    this.onMousemove_(event);
+    event.preventDefault();
+  };
+
+  ns.DrawingController.prototype.onTouchend_ = function (event) {
+    this.onMouseup_(event);
+  };
+
   /**
    * @private
    */
@@ -151,6 +167,9 @@
 
     if (event.button === Constants.MIDDLE_BUTTON) {
       this.dragHandler.startDrag(event.clientX, event.clientY);
+    } else if (event.altKey && !this.currentToolBehavior.supportsAlt()) {
+      this.currentToolBehavior.hideHighlightedPixel(this.overlayFrame);
+      this.isPickingColor = true;
     } else {
       this.currentToolBehavior.hideHighlightedPixel(this.overlayFrame);
       $.publish(Events.TOOL_PRESSED);
@@ -198,6 +217,8 @@
     if (this.isClicked) {
       if (pskl.app.mouseStateService.isMiddleButtonPressed()) {
         this.dragHandler.updateDrag(x, y);
+      } else if (this.isPickingColor) {
+        // Nothing to do on mousemove when picking a color with ALT+click.
       } else {
         $.publish(Events.MOUSE_EVENT, [event, this]);
         this.currentToolBehavior.moveToolAt(
@@ -224,14 +245,16 @@
     var evt = jQueryEvent.originalEvent;
     // Ratio between wheelDeltaY (mousewheel event) and deltaY (wheel event) is -40
     var delta;
-    if (pskl.utils.UserAgent.isChrome) {
-      delta = evt.wheelDeltaY;
-    } else if (pskl.utils.UserAgent.isIE11) {
+    if (pskl.utils.UserAgent.isIE11) {
       delta = evt.wheelDelta;
     } else if (pskl.utils.UserAgent.isFirefox) {
       delta = -40 * evt.deltaY;
+    } else {
+      delta = evt.wheelDeltaY;
     }
-    var modifier = Math.abs(delta / 120);
+
+    delta = delta || 0;
+    var modifier = (delta / 120);
 
     if (pskl.utils.UserAgent.isMac ? evt.metaKey : evt.ctrlKey) {
       modifier = modifier * 5;
@@ -239,33 +262,79 @@
       evt.preventDefault();
     }
 
-    if (delta > 0) {
-      this.increaseZoom_(modifier);
-    } else if (delta < 0) {
-      this.decreaseZoom_(modifier);
+    var coords = this.getSpriteCoordinates(evt.clientX, evt.clientY);
+    this.updateZoom_(modifier, coords);
+  };
+
+  /**
+   * Update the current viewport offset of 1 pixel in the provided direction.
+   * Direction can be one of 'up', 'right', 'down', 'left'.
+   * Callback for the OFFSET_${DIR} shortcuts.
+   */
+  ns.DrawingController.prototype.updateOffset_ = function (direction) {
+    var off = this.getOffset();
+    if (direction === 'up') {
+      off.y -= 1;
+    } else if (direction === 'right') {
+      off.x += 1;
+    } else if (direction === 'down') {
+      off.y += 1;
+    } else if (direction === 'left') {
+      off.x -= 1;
     }
+
+    this.setOffset(
+      off.x,
+      off.y
+    );
   };
 
-  ns.DrawingController.prototype.increaseZoom_ = function (zoomMultiplier) {
-    var step = (zoomMultiplier || 1) * this.getZoomStep_();
+  /**
+   * Update the current zoom level by a given multiplier.
+   *
+   * @param {Number} zoomMultiplier: factor by which the zoom should be modified. Negative
+   *        values will decrease the zoom, positive values will increase it.
+   * @param {Object} centerCoords, optional:
+   *        - {Number} x: x coordinate of the desired center the zoomed canvas
+   *        - {Number} y: y coordinate of the desired center the zoomed canvas
+   */
+  ns.DrawingController.prototype.updateZoom_ = function (zoomMultiplier, centerCoords) {
+    if (zoomMultiplier === 0) {
+      return;
+    }
+
+    var off = this.getOffset();
+    var oldWidth = this.getContainerWidth_() / this.renderer.getZoom();
+    var oldHeight = this.getContainerHeight_() / this.renderer.getZoom();
+
+    var step = zoomMultiplier * this.getZoomStep_();
     this.setZoom_(this.renderer.getZoom() + step);
-  };
 
-  ns.DrawingController.prototype.decreaseZoom_ = function (zoomMultiplier) {
-    var step = (zoomMultiplier || 1) * this.getZoomStep_();
-    this.setZoom_(this.renderer.getZoom() - step);
+    if (typeof centerCoords === 'object') {
+      var xRatio = (centerCoords.x - off.x) / oldWidth;
+      var yRatio = (centerCoords.y - off.y) / oldHeight;
+      var newWidth = this.getContainerWidth_() / this.renderer.getZoom();
+      var newHeight = this.getContainerHeight_() / this.renderer.getZoom();
+      this.setOffset(
+        off.x - ((newWidth - oldWidth) * xRatio),
+        off.y - ((newHeight - oldHeight) * yRatio)
+      );
+    }
   };
 
   /**
    * @private
    */
   ns.DrawingController.prototype.onMouseup_ = function (event) {
-    var frame = this.piskelController.getCurrentFrame();
+    if (!this.isClicked) {
+      return;
+    }
+
     var coords = this.getSpriteCoordinates(event.clientX, event.clientY);
     if (event.changedTouches && event.changedTouches[0]) {
       coords = this.getSpriteCoordinates(event.changedTouches[0].clientX, event.changedTouches[0].clientY);
     }
-    if (this.isClicked) {
+
     // A mouse button was clicked on the drawing canvas before this mouseup event,
     // the user was probably drawing on the canvas.
     // Note: The mousemove movement (and the mouseup) may end up outside
@@ -273,13 +342,19 @@
 
     this.isClicked = false;
 
-      if (pskl.app.mouseStateService.isMiddleButtonPressed()) {
-        if (this.dragHandler.isDragging()) {
+    var isMiddleButton = pskl.app.mouseStateService.isMiddleButtonPressed();
+    var isMiddleClick = isMiddleButton && !this.dragHandler.isDragging();
+    var isMiddleDrag = isMiddleButton && this.dragHandler.isDragging();
+
+    if (this.isPickingColor || isMiddleClick) {
+      // Picking color after ALT+click or middle mouse button click.
+      this.pickColorAt_(coords);
+      this.isPickingColor = false;
+    } else if (isMiddleDrag) {
+      // Stop the drag handler after a middle button drag action.
       this.dragHandler.stopDrag();
-        } else if (frame.containsPixel(coords.x, coords.y)) {
-          $.publish(Events.SELECT_PRIMARY_COLOR, [frame.getPixel(coords.x, coords.y)]);
-        }
     } else {
+      // Regular tool click, release the current tool.
       this.currentToolBehavior.releaseToolAt(
         coords.x,
         coords.y,
@@ -287,11 +362,27 @@
         this.overlayFrame,
         event
       );
-
       $.publish(Events.TOOL_RELEASED);
     }
+
     $.publish(Events.MOUSE_EVENT, [event, this]);
+  };
+
+  /**
+   * Send a COLOR selection event for the color contained at the provided coordinates.
+   * No-op if the coordinate is outside of the drawing canvas.
+   * @param  {Object} coords {x: Number, y: Number}
+   */
+  ns.DrawingController.prototype.pickColorAt_ = function (coords) {
+    var frame = this.piskelController.getCurrentFrame();
+    if (!frame.containsPixel(coords.x, coords.y)) {
+      return;
     }
+
+    var color = pskl.utils.intToColor(frame.getPixel(coords.x, coords.y));
+    var isRightButton = pskl.app.mouseStateService.isRightButtonPressed();
+    var evt = isRightButton ? Events.SELECT_SECONDARY_COLOR : Events.SELECT_PRIMARY_COLOR;
+    $.publish(evt, [color]);
   };
 
   /**

src/js/controller/FramesListController.js

@@ -11,29 +11,39 @@
   ns.FramesListController = function (piskelController, container) {
     this.piskelController = piskelController;
     this.container = container;
+    this.previewList = container.querySelector('#preview-list');
     this.refreshZoom_();
 
     this.redrawFlag = true;
+    this.regenerateDomFlag = true;
+    this.justDropped = false;
 
     this.cachedFrameProcessor = new pskl.model.frame.CachedFrameProcessor();
     this.cachedFrameProcessor.setFrameProcessor(this.frameToPreviewCanvas_.bind(this));
     this.cachedFrameProcessor.setOutputCloner(this.clonePreviewCanvas_.bind(this));
+
+    this.initDragndropBehavior_();
   };
 
   ns.FramesListController.prototype.init = function() {
     $.subscribe(Events.TOOL_RELEASED, this.flagForRedraw_.bind(this));
-    $.subscribe(Events.PISKEL_RESET, this.flagForRedraw_.bind(this));
+    $.subscribe(Events.PISKEL_RESET, this.flagForRedraw_.bind(this, true));
     $.subscribe(Events.USER_SETTINGS_CHANGED, this.flagForRedraw_.bind(this));
 
     $.subscribe(Events.PISKEL_RESET, this.refreshZoom_.bind(this));
 
-    $('#preview-list-scroller').scroll(this.updateScrollerOverflows.bind(this));
-    this.container.get(0).addEventListener('click', this.onContainerClick_.bind(this));
+    this.previewListScroller = document.querySelector('#preview-list-scroller');
+    this.previewListScroller.addEventListener('scroll', this.updateScrollerOverflows.bind(this));
+    this.container.addEventListener('click', this.onContainerClick_.bind(this));
     this.updateScrollerOverflows();
   };
 
-  ns.FramesListController.prototype.flagForRedraw_ = function () {
+  ns.FramesListController.prototype.flagForRedraw_ = function (regenerateDom) {
     this.redrawFlag = true;
+
+    if (regenerateDom) {
+      this.regenerateDomFlag = true;
+    }
   };
 
   ns.FramesListController.prototype.refreshZoom_ = function () {
@@ -42,17 +52,25 @@
 
   ns.FramesListController.prototype.render = function () {
     if (this.redrawFlag) {
+      if (this.regenerateDomFlag) {
+        this.tiles = [];
+        this.addFrameTile = null;
         this.createPreviews_();
+
+        this.regenerateDomFlag = false;
+      }
+
+      this.updatePreviews_();
       this.redrawFlag = false;
     }
   };
 
   ns.FramesListController.prototype.updateScrollerOverflows = function () {
-    var scroller = $('#preview-list-scroller');
-    var scrollerHeight = scroller.height();
-    var scrollTop = scroller.scrollTop();
-    var scrollerContentHeight = $('#preview-list').height();
-    var treshold = $('.top-overflow').height();
+    var scroller = this.previewListScroller;
+    var scrollerHeight = scroller.offsetHeight;
+    var scrollTop = scroller.scrollTop;
+    var scrollerContentHeight = this.previewList.offsetHeight;
+    var treshold = this.container.querySelector('.top-overflow').offsetHeight;
     var overflowTop = false;
     var overflowBottom = false;
 
@@ -65,9 +83,8 @@
         overflowBottom = true;
       }
     }
-    var wrapper = $('#preview-list-wrapper');
-    wrapper.toggleClass('top-overflow-visible', overflowTop);
-    wrapper.toggleClass('bottom-overflow-visible', overflowBottom);
+    this.container.classList.toggle('top-overflow-visible', overflowTop);
+    this.container.classList.toggle('bottom-overflow-visible', overflowBottom);
   };
 
   ns.FramesListController.prototype.onContainerClick_ = function (event) {
@@ -80,27 +97,79 @@
 
     if (action === ACTION.CLONE) {
       this.piskelController.duplicateFrameAt(index);
+      var clonedTile = this.createPreviewTile_(index + 1);
+      this.previewList.insertBefore(clonedTile, this.tiles[index].nextSibling);
+      this.tiles.splice(index, 0, clonedTile);
       this.updateScrollerOverflows();
     } else if (action === ACTION.DELETE) {
       this.piskelController.removeFrameAt(index);
+      this.previewList.removeChild(this.tiles[index]);
+      this.tiles.splice(index, 1);
       this.updateScrollerOverflows();
-    } else if (action === ACTION.SELECT) {
+    } else if (action === ACTION.SELECT && !this.justDropped) {
       this.piskelController.setCurrentFrameIndex(index);
     } else if (action === ACTION.NEW_FRAME) {
       this.piskelController.addFrame();
+      var newtile = this.createPreviewTile_(this.tiles.length);
+      this.tiles.push(newtile);
+      this.previewList.insertBefore(newtile, this.addFrameTile);
       this.updateScrollerOverflows();
     }
+
+    this.flagForRedraw_();
+  };
+
+  ns.FramesListController.prototype.updatePreviews_ = function () {
+    var i;
+    var length;
+
+    for (i = 0, length = this.tiles.length; i < length; i++) {
+      // Remove selected class
+      this.tiles[i].classList.remove('selected');
+
+      // Update tile numbers
+      this.tiles[i].setAttribute('data-tile-number', i);
+      this.tiles[i].querySelector('.tile-count').innerHTML = (i + 1);
+
+      // Check if any tile is updated
+      var hash = this.piskelController.getCurrentLayer().getFrameAt(i).getHash();
+      if (this.tiles[i].getAttribute('data-tile-hash') !== hash) {
+        if (this.tiles[i].querySelector('canvas')) {
+          this.tiles[i].querySelector('.canvas-container').replaceChild(
+            this.getCanvasForFrame(this.piskelController.getCurrentLayer().getFrameAt(i)),
+            this.tiles[i].querySelector('canvas')
+          );
+        } else {
+          this.tiles[i].querySelector('.canvas-container').appendChild(
+            this.getCanvasForFrame(this.piskelController.getCurrentLayer().getFrameAt(i))
+          );
+        }
+      }
+    }
+
+    // Hide/Show buttons if needed
+    var buttons = this.container.querySelectorAll('.delete-frame-action, .dnd-action');
+    var display = (this.piskelController.getFrameCount() > 1) ? 'block' : 'none';
+    for (i = 0, length = buttons.length; i < length; i++) {
+      buttons[i].style.display = display;
+    }
+
+    // Add selected class
+    this.tiles[this.piskelController.getCurrentFrameIndex()].classList.add('selected');
   };
 
   ns.FramesListController.prototype.createPreviews_ = function () {
-    this.container.html('');
+    this.previewList.innerHTML = '';
+
     // Manually remove tooltips since mouseout events were shortcut by the DOM refresh:
     $('.tooltip').remove();
 
     var frameCount = this.piskelController.getFrameCount();
 
     for (var i = 0 ; i < frameCount ; i++) {
-      this.container.append(this.createPreviewTile_(i));
+      var tile = this.createPreviewTile_(i);
+      this.previewList.appendChild(tile);
+      this.tiles[i] = tile;
     }
     // Append 'new empty frame' button
     var newFrameButton = document.createElement('div');
@@ -109,12 +178,9 @@
     newFrameButton.setAttribute('data-tile-action', ACTION.NEW_FRAME);
     newFrameButton.innerHTML = '<div class="add-frame-action-icon icon-frame-plus-white">' +
       '</div><div class="label">Add new frame</div>';
-    this.container.append(newFrameButton);
+    this.previewList.appendChild(newFrameButton);
+    this.addFrameTile = newFrameButton;
 
-    var needDragndropBehavior = (frameCount > 1);
-    if (needDragndropBehavior) {
-      this.initDragndropBehavior_();
-    }
     this.updateScrollerOverflows();
   };
 
@@ -122,15 +188,15 @@
    * @private
    */
   ns.FramesListController.prototype.initDragndropBehavior_ = function () {
-
-    $('#preview-list').sortable({
+    $(this.previewList).sortable({
       placeholder: 'preview-tile preview-tile-drop-proxy',
       update: $.proxy(this.onUpdate_, this),
+      stop: $.proxy(this.onSortableStop_, this),
       items: '.preview-tile',
       axis: 'y',
       tolerance: 'pointer'
     });
-    $('#preview-list').disableSelection();
+    $(this.previewList).disableSelection();
   };
 
   /**
@@ -142,6 +208,21 @@
 
     this.piskelController.moveFrame(originFrameId, targetInsertionId);
     this.piskelController.setCurrentFrameIndex(targetInsertionId);
+
+    var tile = this.tiles.splice(originFrameId, 1)[0];
+    this.tiles.splice(targetInsertionId, 0, tile);
+    this.flagForRedraw_();
+  };
+
+  /**
+   * @private
+   */
+  ns.FramesListController.prototype.onSortableStop_ = function (event, ui) {
+    this.justDropped = true;
+
+    this.resizeTimer = window.setTimeout($.proxy(function() {
+      this.justDropped = false;
+    }, this), 200);
   };
 
   /**
@@ -153,6 +234,7 @@
 
     var previewTileRoot = document.createElement('li');
     previewTileRoot.setAttribute('data-tile-number', tileNumber);
+    previewTileRoot.setAttribute('data-tile-hash', currentFrame.getHash());
     previewTileRoot.setAttribute('data-tile-action', ACTION.SELECT);
     previewTileRoot.classList.add('preview-tile');
     if (this.piskelController.getCurrentFrame() == currentFrame) {
@@ -171,10 +253,14 @@
     canvasContainer.style.marginLeft = verticalMargin + 'px';
     canvasContainer.style.marginRight = verticalMargin + 'px';
 
+    // Add canvas background and canvas
     var canvasBackground = document.createElement('div');
     canvasBackground.className = 'canvas-background';
     canvasContainer.appendChild(canvasBackground);
+    canvasContainer.appendChild(this.getCanvasForFrame(currentFrame));
+    previewTileRoot.appendChild(canvasContainer);
 
+    // Add clone button
     var cloneFrameButton = document.createElement('button');
     cloneFrameButton.setAttribute('rel', 'tooltip');
     cloneFrameButton.setAttribute('data-placement', 'right');
@@ -184,11 +270,7 @@
     cloneFrameButton.className = 'tile-overlay duplicate-frame-action icon-frame-duplicate-white';
     previewTileRoot.appendChild(cloneFrameButton);
 
-    canvasContainer.appendChild(this.getCanvasForFrame(currentFrame));
-    previewTileRoot.appendChild(canvasContainer);
-
-    if (tileNumber > 0 || this.piskelController.getFrameCount() > 1) {
-      // Add 'remove frame' button.
+    // Add delete button
     var deleteButton = document.createElement('button');
     deleteButton.setAttribute('rel', 'tooltip');
     deleteButton.setAttribute('data-placement', 'right');
@@ -202,7 +284,8 @@
     var dndHandle = document.createElement('div');
     dndHandle.className = 'tile-overlay dnd-action icon-frame-dragndrop-white' ;
     previewTileRoot.appendChild(dndHandle);
-    }
+
+    // Add tile count
     var tileCount = document.createElement('div');
     tileCount.className = 'tile-overlay tile-count';
     tileCount.innerHTML = tileNumber + 1;

src/js/controller/HeaderController.js

@@ -31,7 +31,7 @@
       }
 
       if (this.piskelName_) {
-        this.piskelName_.innerHTML = name;
+        this.piskelName_.textContent = name;
       }
     } catch (e) {
       console.warn('Could not update header : ' + e.message);

src/js/controller/LayersListController.js

@@ -17,6 +17,7 @@
     this.rootEl.addEventListener('click', this.onClick_.bind(this));
     this.toggleLayerPreviewEl.addEventListener('click', this.toggleLayerPreview_.bind(this));
 
+    this.createButtonTooltips_();
     this.initToggleLayerPreview_();
 
     this.renderLayerList_();
@@ -27,18 +28,44 @@
   };
 
   ns.LayersListController.prototype.renderLayerList_ = function () {
+    // Backup scroll before refresh.
+    var scrollTop = this.layersListEl.scrollTop;
+
     this.layersListEl.innerHTML = '';
     var layers = this.piskelController.getLayers();
     layers.forEach(this.addLayerItem.bind(this));
     this.updateButtonStatus_();
 
+    // Restore scroll
+    this.layersListEl.scrollTop = scrollTop;
+
     // Ensure the currently the selected layer is visible.
     var currentLayerEl = this.layersListEl.querySelector('.current-layer-item');
     if (currentLayerEl) {
-      currentLayerEl.scrollIntoView();
+      currentLayerEl.scrollIntoViewIfNeeded(false);
     }
   };
 
+  ns.LayersListController.prototype.createButtonTooltips_ = function () {
+    var addTooltip = pskl.utils.TooltipFormatter.format('Create a layer', null, [
+      {key : 'shift', description : 'Clone current layer'}
+    ]);
+    var addButton = this.rootEl.querySelector('[data-action="add"]');
+    addButton.setAttribute('title', addTooltip);
+
+    var moveDownTooltip = pskl.utils.TooltipFormatter.format('Move layer down', null, [
+      {key : 'shift', description : 'Move to the bottom'}
+    ]);
+    var moveDownButton = this.rootEl.querySelector('[data-action="down"]');
+    moveDownButton.setAttribute('title', moveDownTooltip);
+
+    var moveUpTooltip = pskl.utils.TooltipFormatter.format('Move layer up', null, [
+      {key : 'shift', description : 'Move to the top'}
+    ]);
+    var moveUpButton = this.rootEl.querySelector('[data-action="up"]');
+    moveUpButton.setAttribute('title', moveUpTooltip);
+  };
+
   ns.LayersListController.prototype.initToggleLayerPreview_ = function () {
     var descriptors = [{description : 'Opacity defined in PREFERENCES'}];
     var helpText = 'Preview all layers';
@@ -99,15 +126,21 @@
     });
     var layerItem = pskl.utils.Template.createFromHTML(layerItemHtml);
     this.layersListEl.insertBefore(layerItem, this.layersListEl.firstChild);
+    if (layerItem.offsetWidth < layerItem.scrollWidth) {
+      $(layerItem).find('.layer-name')
+        .addClass('overflowing-name')
+        .attr('title', layer.getName())
+        .tooltip();
+    }
   };
 
   ns.LayersListController.prototype.onClick_ = function (evt) {
     var el = evt.target || evt.srcElement;
     var index;
     if (el.classList.contains('button')) {
-      this.onButtonClick_(el);
-    } else if (el.classList.contains('layer-item')) {
-      index = el.dataset.layerIndex;
+      this.onButtonClick_(el, evt);
+    } else if (el.classList.contains('layer-name')) {
+      index = pskl.utils.Dom.getData(el, 'layerIndex');
       this.piskelController.setCurrentLayerIndex(parseInt(index, 10));
     } else if (el.classList.contains('layer-item-opacity')) {
       index = pskl.utils.Dom.getData(el, 'layerIndex');
@@ -133,14 +166,18 @@
     this.renderLayerList_();
   };
 
-  ns.LayersListController.prototype.onButtonClick_ = function (button) {
+  ns.LayersListController.prototype.onButtonClick_ = function (button, evt) {
     var action = button.getAttribute('data-action');
     if (action == 'up') {
-      this.piskelController.moveLayerUp();
+      this.piskelController.moveLayerUp(evt.shiftKey);
     } else if (action == 'down') {
-      this.piskelController.moveLayerDown();
+      this.piskelController.moveLayerDown(evt.shiftKey);
     } else if (action == 'add') {
+      if (evt.shiftKey) {
+        this.piskelController.duplicateCurrentLayer();
+      } else {
         this.piskelController.createLayer();
+      }
     } else if (action == 'delete') {
       this.piskelController.removeCurrentLayer();
     } else if (action == 'merge') {

src/js/controller/PaletteController.js

@@ -1,6 +1,10 @@
 (function () {
   var ns = $.namespace('pskl.controller');
 
+  /**
+   * The PaletteController is responsible for handling the two color picker
+   * widgets found in the left column, below the tools.
+   */
   ns.PaletteController = function () {};
 
   /**
@@ -92,7 +96,8 @@
   };
 
   ns.PaletteController.prototype.resetColors = function () {
-    pskl.app.selectedColorsService.reset();
+    this.setPrimaryColor_(Constants.DEFAULT_PEN_COLOR);
+    this.setSecondaryColor_(Constants.TRANSPARENT_COLOR);
   };
 
   /**

src/js/controller/PalettesListController.js

@@ -51,12 +51,17 @@
   };
 
   ns.PalettesListController.prototype.fillColorListContainer = function () {
-
     var colors = this.getSelectedPaletteColors_();
 
     if (colors.length > 0) {
-      var html = colors.map(function (color, index) {
-        return pskl.utils.Template.replace(this.paletteColorTemplate_, {color : color, index : index});
+      var html = colors.filter(function (color) {
+        return !!color;
+      }).map(function (color, index) {
+        return pskl.utils.Template.replace(this.paletteColorTemplate_, {
+          color : color,
+          index : index + 1,
+          title : color.toUpperCase()
+        });
       }.bind(this)).join('');
       this.colorListContainer_.innerHTML = html;
 
@@ -64,6 +69,10 @@
     } else {
       this.colorListContainer_.innerHTML = pskl.utils.Template.get('palettes-list-no-colors-partial');
     }
+
+    // If we have more than 10 colors, use tiny mode, where 10 colors will fit on the same
+    // line.
+    this.colorListContainer_.classList.toggle('tiny', colors.length > 10);
   };
 
   ns.PalettesListController.prototype.selectPalette = function (paletteId) {
@@ -100,8 +109,8 @@
   ns.PalettesListController.prototype.getCurrentColorIndex_ = function () {
     var currentIndex = 0;
     var selectedColor = document.querySelector('.' + PRIMARY_COLOR_CLASSNAME);
-    if (selectedColor) {
-      currentIndex = parseInt(selectedColor.dataset.colorIndex, 10);
+    if (selectedColor) {
+      currentIndex = parseInt(selectedColor.dataset.colorIndex, 10) - 1;
     }
     return currentIndex;
   };
@@ -139,14 +148,14 @@
   };
 
   ns.PalettesListController.prototype.onCreatePaletteClick_ = function (evt) {
-    $.publish(Events.DIALOG_DISPLAY, {
+    $.publish(Events.DIALOG_SHOW, {
       dialogId : 'create-palette'
     });
   };
 
   ns.PalettesListController.prototype.onEditPaletteClick_ = function (evt) {
     var paletteId = this.colorPaletteSelect_.value;
-    $.publish(Events.DIALOG_DISPLAY, {
+    $.publish(Events.DIALOG_SHOW, {
       dialogId : 'create-palette',
       initArgs : paletteId
     });

src/js/controller/PenSizeController.js

@@ -1,23 +1,19 @@
 (function () {
   var ns = $.namespace('pskl.controller');
 
-  ns.PenSizeController = function () {};
+  ns.PenSizeController = function () {
+    this.sizePicker = new pskl.widgets.SizePicker(this.onSizePickerChanged_.bind(this));
+  };
 
   ns.PenSizeController.prototype.init = function () {
-    this.container = document.querySelector('.pen-size-container');
-    pskl.utils.Event.addEventListener(this.container, 'click', this.onPenSizeOptionClick_, this);
+    this.sizePicker.init(document.querySelector('.pen-size-container'));
 
     $.subscribe(Events.PEN_SIZE_CHANGED, this.onPenSizeChanged_.bind(this));
-
     this.updateSelectedOption_();
   };
 
-  ns.PenSizeController.prototype.onPenSizeOptionClick_ = function (e) {
-    var size = e.target.dataset.size;
-    if (!isNaN(size)) {
-      size = parseInt(size, 10);
+  ns.PenSizeController.prototype.onSizePickerChanged_ = function (size) {
     pskl.app.penSizeService.setPenSize(size);
-    }
   };
 
   ns.PenSizeController.prototype.onPenSizeChanged_ = function (e) {
@@ -25,11 +21,7 @@
   };
 
   ns.PenSizeController.prototype.updateSelectedOption_ = function () {
-    pskl.utils.Dom.removeClass('selected', this.container);
     var size = pskl.app.penSizeService.getPenSize();
-    var selectedOption = this.container.querySelector('[data-size="' + size + '"]');
-    if (selectedOption) {
-      selectedOption.classList.add('selected');
-    }
+    this.sizePicker.setSize(size);
   };
 })();

src/js/controller/TransformationsController.js

@@ -1,22 +1,30 @@
 (function () {
   var ns = $.namespace('pskl.controller');
+  var SHOW_MORE_CLASS = 'show-more';
 
   ns.TransformationsController = function () {
     this.tools = [
       new pskl.tools.transform.Flip(),
       new pskl.tools.transform.Rotate(),
       new pskl.tools.transform.Clone(),
-      new pskl.tools.transform.Center()
+      new pskl.tools.transform.Center(),
+      new pskl.tools.transform.Crop(),
     ];
 
     this.toolIconBuilder = new pskl.tools.ToolIconBuilder();
   };
 
   ns.TransformationsController.prototype.init = function () {
-    var container = document.querySelector('.transformations-container');
-    this.toolsContainer = container.querySelector('.tools-wrapper');
-    container.addEventListener('click', this.onTransformationClick_.bind(this));
+    this.container = document.querySelector('.transformations-container');
+    this.container.addEventListener('click', this.onTransformationClick_.bind(this));
+
+    this.showMoreLink = this.container.querySelector('.transformations-show-more-link');
+    this.showMoreLink.addEventListener('click', this.toggleShowMoreTools_.bind(this));
+
     this.createToolsDom_();
+    this.updateShowMoreLink_();
+
+    $.subscribe(Events.USER_SETTINGS_CHANGED, this.onUserSettingsChange_.bind(this));
   };
 
   ns.TransformationsController.prototype.applyTool = function (toolId, evt) {
@@ -30,13 +38,35 @@
 
   ns.TransformationsController.prototype.onTransformationClick_ = function (evt) {
     var toolId = evt.target.dataset.toolId;
+    if (toolId) {
       this.applyTool(toolId, evt);
+    }
+  };
+
+  ns.TransformationsController.prototype.toggleShowMoreTools_ = function (evt) {
+    var showMore = pskl.UserSettings.get(pskl.UserSettings.TRANSFORM_SHOW_MORE);
+    pskl.UserSettings.set(pskl.UserSettings.TRANSFORM_SHOW_MORE, !showMore);
+  };
+
+  ns.TransformationsController.prototype.onUserSettingsChange_ = function (evt, settingName) {
+    if (settingName == pskl.UserSettings.TRANSFORM_SHOW_MORE) {
+      this.updateShowMoreLink_();
+    }
+  };
+
+  ns.TransformationsController.prototype.updateShowMoreLink_ = function () {
+    var showMoreEnabled = pskl.UserSettings.get(pskl.UserSettings.TRANSFORM_SHOW_MORE);
+    this.container.classList.toggle(SHOW_MORE_CLASS, showMoreEnabled);
+
+    // Hide the link in case there are 4 or less tools available.
+    this.showMoreLink.classList.toggle('hidden', this.tools.length < 5);
   };
 
   ns.TransformationsController.prototype.createToolsDom_ = function() {
     var html = this.tools.reduce(function (p, tool) {
       return p + this.toolIconBuilder.createIcon(tool, 'left');
     }.bind(this), '');
-    this.toolsContainer.innerHTML = html;
+    var toolsContainer = this.container.querySelector('.tools-wrapper');
+    toolsContainer.innerHTML = html;
   };
 })();

src/js/controller/UserWarningController.js

@@ -0,0 +1,59 @@
+(function () {
+  var ns = $.namespace('pskl.controller');
+
+  ns.UserWarningController = function (piskelController, currentColorsService) {
+    this.piskelController = piskelController;
+    this.currentColorsService = currentColorsService;
+  };
+
+  // This method is not attached to the prototype because we want to trigger it
+  // from markup generated for a notification message.
+  ns.UserWarningController.showPerformanceInfoDialog = function () {
+    $.publish(Events.DIALOG_SHOW, {
+      dialogId: 'performance-info'
+    });
+  };
+
+  ns.UserWarningController.prototype.init = function () {
+    $.subscribe(Events.PERFORMANCE_REPORT_CHANGED, this.onPerformanceReportChanged_.bind(this));
+
+    this.performanceLinkEl = document.querySelector('.performance-link');
+    pskl.utils.Event.addEventListener(
+      this.performanceLinkEl,
+      'click',
+      ns.UserWarningController.showPerformanceInfoDialog,
+      this
+    );
+  };
+
+  ns.UserWarningController.prototype.destroy = function () {
+    pskl.utils.Event.removeAllEventListeners(this);
+    this.performanceLinkEl = null;
+  };
+
+  ns.UserWarningController.prototype.onPerformanceReportChanged_ = function (event, report) {
+    var shouldDisplayWarning = report.hasProblem();
+
+    // Check if a performance warning is already displayed.
+    var isWarningDisplayed = this.performanceLinkEl.classList.contains('visible');
+
+    // Show/hide the performance warning link depending on the received report.
+    if (shouldDisplayWarning) {
+      this.performanceLinkEl.classList.add('visible');
+    } else {
+      this.performanceLinkEl.classList.remove('visible');
+    }
+
+    // Show a notification message if the new report indicates a performance issue
+    // and we were not displaying a warning before.
+    if (shouldDisplayWarning && !isWarningDisplayed) {
+      $.publish(Events.SHOW_NOTIFICATION, [{
+        'content': 'Performance problem detected, ' +
+                   '<a href="#" style="color:red;"' +
+                       'onclick="pskl.controller.UserWarningController.showPerformanceInfoDialog()">' +
+                      'learn more?</a>',
+        'hideDelay' : 5000
+      }]);
+    }
+  };
+})();

src/js/controller/dialogs/AbstractDialogController.js

@@ -4,14 +4,19 @@
   ns.AbstractDialogController = function () {};
 
   ns.AbstractDialogController.prototype.init = function () {
-    this.closeButton = document.querySelector('.dialog-close');
-    this.closeButton.addEventListener('click', this.closeDialog.bind(this));
+    var closeButton = document.querySelector('.dialog-close');
+    this.addEventListener(closeButton, 'click', this.closeDialog);
   };
 
-  ns.AbstractDialogController.prototype.destroy = function () {};
+  ns.AbstractDialogController.prototype.addEventListener = function (el, type, cb) {
+    pskl.utils.Event.addEventListener(el, type, cb, this);
+  };
+
+  ns.AbstractDialogController.prototype.destroy = function () {
+    pskl.utils.Event.removeAllEventListeners(this);
+  };
 
   ns.AbstractDialogController.prototype.closeDialog = function () {
-    this.destroy();
     $.publish(Events.DIALOG_HIDE);
   };
 

src/js/controller/dialogs/BrowseLocalController.js

@@ -1,8 +1,7 @@
 (function () {
   var ns = $.namespace('pskl.controller.dialogs');
 
-  ns.BrowseLocalController = function (piskelController) {
-  };
+  ns.BrowseLocalController = function (piskelController) {};
 
   pskl.utils.inherit(ns.BrowseLocalController, ns.AbstractDialogController);
 
@@ -11,7 +10,7 @@
 
     this.localStorageItemTemplate_ = pskl.utils.Template.get('local-storage-item-template');
 
-    this.service_ = pskl.app.localStorageService;
+    this.service_ = pskl.app.indexedDbStorageService;
     this.piskelList = $('.local-piskel-list');
     this.prevSessionContainer = $('.previous-session');
 
@@ -37,9 +36,8 @@
   };
 
   ns.BrowseLocalController.prototype.fillLocalPiskelsList_ = function () {
+    this.service_.getKeys().then(function (keys) {
       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;}
@@ -48,10 +46,14 @@
 
       keys.forEach((function (key) {
         var date = pskl.utils.DateUtils.format(key.date, '{{Y}}/{{M}}/{{D}} {{H}}:{{m}}');
-      html += pskl.utils.Template.replace(this.localStorageItemTemplate_, {name : key.name, date : date});
+        html += pskl.utils.Template.replace(this.localStorageItemTemplate_, {
+          name : key.name,
+          date : date
+        });
       }).bind(this));
 
       var tableBody_ = this.piskelList.get(0).tBodies[0];
       tableBody_.innerHTML = html;
+    }.bind(this));
   };
 })();

src/js/controller/dialogs/CheatsheetController.js

@@ -13,11 +13,12 @@
     this.cheatsheetEl = document.getElementById('cheatsheetContainer');
     this.eventTrapInput = document.getElementById('cheatsheetEventTrap');
 
-    pskl.utils.Event.addEventListener('.cheatsheet-restore-defaults', 'click', this.onRestoreDefaultsClick_, this);
-    pskl.utils.Event.addEventListener(this.cheatsheetEl, 'click', this.onCheatsheetClick_, this);
-    pskl.utils.Event.addEventListener(this.eventTrapInput, 'keydown', this.onEventTrapKeydown_, this);
+    this.addEventListener('.cheatsheet-restore-defaults', 'click', this.onRestoreDefaultsClick_);
+    this.addEventListener(this.cheatsheetEl, 'click', this.onCheatsheetClick_);
+    this.addEventListener(this.eventTrapInput, 'keydown', this.onEventTrapKeydown_);
 
-    $.subscribe(Events.SHORTCUTS_CHANGED, this.onShortcutsChanged_.bind(this));
+    this.onShortcutsChanged_ = this.onShortcutsChanged_.bind(this);
+    $.subscribe(Events.SHORTCUTS_CHANGED, this.onShortcutsChanged_);
 
     this.initMarkup_();
     document.querySelector('.cheatsheet-helptext').setAttribute('title', this.getHelptextTitle_());
@@ -25,8 +26,11 @@
 
   ns.CheatsheetController.prototype.destroy = function () {
     this.eventTrapInput.blur();
-    pskl.utils.Event.removeAllEventListeners();
+
+    $.unsubscribe(Events.SHORTCUTS_CHANGED, this.onShortcutsChanged_);
     this.cheatsheetEl = null;
+
+    this.superclass.destroy.call(this);
   };
 
   ns.CheatsheetController.prototype.onRestoreDefaultsClick_ = function () {
@@ -140,7 +144,8 @@
       title : title,
       icon : descriptor.iconClass,
       description : description,
-      key : this.formatKey_(shortcut.getDisplayKey()),
+      // Avoid sanitization
+      '!key!' : this.formatKey_(shortcut.getDisplayKey()),
       className : shortcutClasses.join(' ')
     });
 
@@ -152,10 +157,10 @@
       key = key.replace('ctrl', 'cmd');
       key = key.replace('alt', 'option');
     }
-    key = key.replace(/left/i, '￩');
-    key = key.replace(/up/i, '￪');
-    key = key.replace(/right/i, '￫');
-    key = key.replace(/down/i, '￬');
+    key = key.replace(/left/i, '←');
+    key = key.replace(/up/i, '↑');
+    key = key.replace(/right/i, '→');
+    key = key.replace(/down/i, '↓');
     key = key.replace(/>/g, '>');
     key = key.replace(/</g, '&lt;');
     // add spaces around '+' delimiters

src/js/controller/dialogs/CreatePaletteController.js

@@ -19,12 +19,12 @@
     var downloadButton = document.querySelector('.create-palette-download-button');
     var importFileButton = document.querySelector('.create-palette-import-button');
 
-    this.nameInput.addEventListener('input', this.onNameInputChange_.bind(this));
-    this.hiddenFileInput.addEventListener('change', this.onFileInputChange_.bind(this));
+    this.addEventListener(this.nameInput, 'input', this.onNameInputChange_);
+    this.addEventListener(this.hiddenFileInput, 'change', this.onFileInputChange_);
 
-    buttonsContainer.addEventListener('click', this.onButtonClick_.bind(this));
-    downloadButton.addEventListener('click', this.onDownloadButtonClick_.bind(this));
-    importFileButton.addEventListener('click', this.onImportFileButtonClick_.bind(this));
+    this.addEventListener(buttonsContainer, 'click', this.onButtonClick_);
+    this.addEventListener(downloadButton, 'click', this.onDownloadButtonClick_);
+    this.addEventListener(importFileButton, 'click', this.onImportFileButtonClick_);
 
     var colorsListContainer = document.querySelector('.colors-container');
     this.colorsListWidget = new pskl.widgets.ColorsList(colorsListContainer);
@@ -66,7 +66,10 @@
 
   ns.CreatePaletteController.prototype.destroy = function () {
     this.colorsListWidget.destroy();
+    this.superclass.destroy.call(this);
+
     this.nameInput = null;
+    this.hiddenFileInput = null;
   };
 
   ns.CreatePaletteController.prototype.onButtonClick_ = function (evt) {

src/js/controller/dialogs/DialogsController.js

@@ -14,9 +14,21 @@
       template : 'templates/dialogs/browse-local.html',
       controller : ns.BrowseLocalController
     },
-    'import-image' : {
-      template : 'templates/dialogs/import-image.html',
-      controller : ns.ImportImageController
+    'import' : {
+      template : 'templates/dialogs/import.html',
+      controller : ns.importwizard.ImportWizard
+    },
+    'performance-info' : {
+      template : 'templates/dialogs/performance-info.html',
+      controller : ns.PerformanceInfoController
+    },
+    'unsupported-browser' : {
+      template : 'templates/dialogs/unsupported-browser.html',
+      controller : ns.UnsupportedBrowserController
+    },
+    'browse-backups' : {
+      template : 'templates/dialogs/browse-backups.html',
+      controller : ns.backups.BrowseBackups
     }
   };
 
@@ -30,7 +42,7 @@
     this.dialogContainer_ = document.getElementById('dialog-container');
     this.dialogWrapper_ = document.getElementById('dialog-container-wrapper');
 
-    $.subscribe(Events.DIALOG_DISPLAY, this.onDialogDisplayEvent_.bind(this));
+    $.subscribe(Events.DIALOG_SHOW, this.onDialogDisplayEvent_.bind(this));
     $.subscribe(Events.DIALOG_HIDE, this.hideDialog.bind(this));
 
     var createPaletteShortcut = pskl.service.keyboard.Shortcuts.COLOR.CREATE_PALETTE;
@@ -42,6 +54,7 @@
 
     // adding the .animated class here instead of in the markup to avoid an animation during app startup
     this.dialogWrapper_.classList.add('animated');
+    pskl.utils.Event.addEventListener(this.dialogWrapper_, 'click', this.onWrapperClicked_, this);
   };
 
   ns.DialogsController.prototype.onCreatePaletteShortcut_ = function () {
@@ -69,6 +82,12 @@
     this.showDialog(args.dialogId, args.initArgs);
   };
 
+  ns.DialogsController.prototype.onWrapperClicked_ = function (evt) {
+    if (evt.target === this.dialogWrapper_) {
+      this.hideDialog();
+    }
+  };
+
   ns.DialogsController.prototype.showDialog = function (dialogId, initArgs) {
     if (this.isDisplayingDialog_()) {
       return;

src/js/controller/dialogs/ImportImageController.js

@@ -1,261 +0,0 @@
-(function () {
-  var ns = $.namespace('pskl.controller.dialogs');
-
-  ns.ImportImageController = function (piskelController) {
-    this.importedImage_ = null;
-    this.file_ = null;
-  };
-
-  pskl.utils.inherit(ns.ImportImageController, ns.AbstractDialogController);
-
-  ns.ImportImageController.prototype.init = function (file) {
-    this.superclass.init.call(this);
-
-    this.file_ = file;
-
-    this.importPreview = $('.import-section-preview');
-
-    this.fileNameContainer = $('.import-image-file-name');
-
-    this.importType = $('[name=import-type]');
-
-    this.resizeWidth = $('[name=resize-width]');
-    this.resizeHeight = $('[name=resize-height]');
-    this.smoothResize =  $('[name=smooth-resize-checkbox]');
-
-    this.frameSizeX = $('[name=frame-size-x]');
-    this.frameSizeY = $('[name=frame-size-y]');
-    this.frameOffsetX = $('[name=frame-offset-x]');
-    this.frameOffsetY = $('[name=frame-offset-y]');
-
-    this.importType.change(this.onImportTypeChange_.bind(this));
-
-    this.resizeWidth.keyup(this.onResizeInputKeyUp_.bind(this, 'width'));
-    this.resizeHeight.keyup(this.onResizeInputKeyUp_.bind(this, 'height'));
-    this.frameSizeX.keyup(this.onFrameInputKeyUp_.bind(this, 'frameSizeX'));
-    this.frameSizeY.keyup(this.onFrameInputKeyUp_.bind(this, 'frameSizeY'));
-    this.frameOffsetX.keyup(this.onFrameInputKeyUp_.bind(this, 'frameOffsetX'));
-    this.frameOffsetY.keyup(this.onFrameInputKeyUp_.bind(this, 'frameOffsetY'));
-
-    this.importImageForm = $('[name=import-image-form]');
-    this.importImageForm.submit(this.onImportFormSubmit_.bind(this));
-
-    pskl.utils.FileUtils.readImageFile(this.file_, this.onImageLoaded_.bind(this));
-  };
-
-  ns.ImportImageController.prototype.onImportTypeChange_ = function (evt) {
-    if (this.getImportType_() === 'single') {
-      // Using single image, so remove the frame grid
-      this.hideFrameGrid_();
-    } else {
-      // Using spritesheet import, so draw the frame grid in the preview
-      var x = this.sanitizeInputValue_(this.frameOffsetX, 0);
-      var y = this.sanitizeInputValue_(this.frameOffsetY, 0);
-      var w = this.sanitizeInputValue_(this.frameSizeX, 1);
-      var h = this.sanitizeInputValue_(this.frameSizeY, 1);
-      this.drawFrameGrid_(x, y, w, h);
-    }
-  };
-
-  ns.ImportImageController.prototype.onImportFormSubmit_ = function (evt) {
-    evt.originalEvent.preventDefault();
-    this.importImageToPiskel_();
-  };
-
-  ns.ImportImageController.prototype.onResizeInputKeyUp_ = function (from, evt) {
-    if (this.importedImage_) {
-      this.synchronizeResizeFields_(evt.target.value, from);
-    }
-  };
-
-  ns.ImportImageController.prototype.onFrameInputKeyUp_ = function (from, evt) {
-    if (this.importedImage_) {
-      this.synchronizeFrameFields_(evt.target.value, from);
-    }
-  };
-
-  ns.ImportImageController.prototype.synchronizeResizeFields_ = function (value, from) {
-    value = parseInt(value, 10);
-    if (isNaN(value)) {
-      value = 0;
-    }
-    var height = this.importedImage_.height;
-    var width = this.importedImage_.width;
-
-    // Select single image import type since the user changed a value here
-    this.importType.filter('[value="single"]').attr('checked', 'checked');
-
-    if (from === 'width') {
-      this.resizeHeight.val(Math.round(value * height / width));
-    } else {
-      this.resizeWidth.val(Math.round(value * width / height));
-    }
-  };
-
-  ns.ImportImageController.prototype.synchronizeFrameFields_ = function (value, from) {
-    value = parseInt(value, 10);
-    if (isNaN(value)) {
-      value = 0;
-    }
-
-    // Parse the frame input values
-    var frameSizeX = this.sanitizeInputValue_(this.frameSizeX, 1);
-    var frameSizeY = this.sanitizeInputValue_(this.frameSizeY, 1);
-    var frameOffsetX = this.sanitizeInputValue_(this.frameOffsetX, 0);
-    var frameOffsetY = this.sanitizeInputValue_(this.frameOffsetY, 0);
-
-    // Select spritesheet import type since the user changed a value here
-    this.importType.filter('[value="sheet"]').attr('checked', 'checked');
-
-    // Draw the grid
-    this.drawFrameGrid_(frameOffsetX, frameOffsetY, frameSizeX, frameSizeY);
-  };
-
-  ns.ImportImageController.prototype.sanitizeInputValue_ = function(input, minValue) {
-    var value = parseInt(input.val(), 10);
-    if (value <= minValue || isNaN(value)) {
-      input.val(minValue);
-      value = minValue;
-    }
-    return value;
-  };
-
-  ns.ImportImageController.prototype.getImportType_ = function () {
-    return this.importType.filter(':checked').val();
-  };
-
-  ns.ImportImageController.prototype.onImageLoaded_ = function (image) {
-    this.importedImage_ = image;
-
-    var w = this.importedImage_.width;
-    var h = this.importedImage_.height;
-
-    // FIXME : We remove the onload callback here because JsGif will insert
-    // the image again and we want to avoid retriggering the image onload
-    this.importedImage_.onload = function () {};
-
-    var fileName = this.extractFileNameFromPath_(this.file_.name);
-    this.fileNameContainer.html(fileName);
-    this.fileNameContainer.attr('title', fileName);
-
-    this.resizeWidth.val(w);
-    this.resizeHeight.val(h);
-
-    this.frameSizeX.val(w);
-    this.frameSizeY.val(h);
-    this.frameOffsetX.val(0);
-    this.frameOffsetY.val(0);
-
-    this.importPreview.width('auto');
-    this.importPreview.height('auto');
-    this.importPreview.html('');
-    this.importPreview.append(this.createImagePreview_());
-  };
-
-  ns.ImportImageController.prototype.createImagePreview_ = function () {
-    var image = document.createElement('IMG');
-    image.src = this.importedImage_.src;
-    return image;
-  };
-
-  ns.ImportImageController.prototype.extractFileNameFromPath_ = function (path) {
-    var parts = [];
-    if (path.indexOf('/') !== -1) {
-      parts = path.split('/');
-    } else if (path.indexOf('\\') !== -1) {
-      parts = path.split('\\');
-    } else {
-      parts = [path];
-    }
-    return parts[parts.length - 1];
-  };
-
-  ns.ImportImageController.prototype.importImageToPiskel_ = function () {
-    if (this.importedImage_) {
-      if (window.confirm('You are about to create a new Piskel, unsaved changes will be lost.')) {
-        pskl.app.importService.newPiskelFromImage(
-          this.importedImage_,
-          {
-            importType: this.getImportType_(),
-            frameSizeX: this.getImportType_() === 'single' ?
-                this.resizeWidth.val() : this.sanitizeInputValue_(this.frameSizeX, 1),
-            frameSizeY: this.getImportType_() === 'single' ?
-                this.resizeHeight.val() : this.sanitizeInputValue_(this.frameSizeY, 1),
-            frameOffsetX: this.sanitizeInputValue_(this.frameOffsetX, 0),
-            frameOffsetY: this.sanitizeInputValue_(this.frameOffsetY, 0),
-            smoothing: !!this.smoothResize.prop('checked')
-          },
-          this.closeDialog.bind(this)
-        );
-      }
-    }
-  };
-
-  ns.ImportImageController.prototype.drawFrameGrid_ = function (frameX, frameY, frameW, frameH) {
-    if (!this.importedImage_) {
-      return;
-    }
-
-    // Grab the sizes of the source and preview images
-    var width = this.importedImage_.width;
-    var height = this.importedImage_.height;
-    var previewWidth = this.importPreview.width();
-    var previewHeight = this.importPreview.height();
-
-    var canvasWrapper = this.importPreview.children('canvas');
-    var canvas = canvasWrapper.get(0);
-    if (!canvasWrapper.length) {
-      // Create a new canvas for the grid
-      canvas = pskl.utils.CanvasUtils.createCanvas(
-        previewWidth + 1,
-        previewHeight + 1);
-      this.importPreview.append(canvas);
-      canvasWrapper = $(canvas);
-    }
-
-    var context = canvas.getContext('2d');
-    context.clearRect(0, 0, canvas.width, canvas.height);
-    context.beginPath();
-
-    // Calculate the number of whole frames
-    var countX = Math.floor((width - frameX) / frameW);
-    var countY = Math.floor((height - frameY) / frameH);
-
-    if (countX > 0 && countY > 0) {
-      var scaleX = previewWidth / width;
-      var scaleY = previewHeight / height;
-      var maxWidth = countX * frameW + frameX;
-      var maxHeight = countY * frameH + frameY;
-
-      // Draw the vertical lines
-      for (var x = frameX + 0.5; x < maxWidth + 1 && x < width + 1; x += frameW) {
-        context.moveTo(x * scaleX, frameY * scaleY);
-        context.lineTo(x * scaleX, maxHeight * scaleY);
-      }
-
-      // Draw the horizontal lines
-      for (var y = frameY + 0.5; y < maxHeight + 1 && y < height + 1; y += frameH) {
-        context.moveTo(frameX * scaleX, y * scaleY);
-        context.lineTo(maxWidth * scaleX, y * scaleY);
-      }
-
-      // Set the line style to dashed
-      context.lineWidth = 1;
-      context.setLineDash([2, 1]);
-      context.strokeStyle = '#000000';
-      context.stroke();
-
-      // Show the canvas
-      canvasWrapper.show();
-      this.importPreview.addClass('no-border');
-    } else {
-      this.hideFrameGrid_();
-    }
-  };
-
-  ns.ImportImageController.prototype.hideFrameGrid_ = function() {
-    this.importPreview.children('canvas').hide();
-    this.importPreview.removeClass('no-border');
-  };
-
-})();

src/js/controller/dialogs/PerformanceInfoController.js

@@ -0,0 +1,11 @@
+(function () {
+  var ns = $.namespace('pskl.controller.dialogs');
+
+  ns.PerformanceInfoController = function () {};
+
+  pskl.utils.inherit(ns.PerformanceInfoController, ns.AbstractDialogController);
+
+  ns.PerformanceInfoController.prototype.init = function () {
+    this.superclass.init.call(this);
+  };
+})();

src/js/controller/dialogs/UnsupportedBrowserController.js

@@ -0,0 +1,13 @@
+(function () {
+  var ns = $.namespace('pskl.controller.dialogs');
+
+  ns.UnsupportedBrowserController = function () {};
+
+  pskl.utils.inherit(ns.UnsupportedBrowserController, ns.AbstractDialogController);
+
+  ns.UnsupportedBrowserController.prototype.init = function () {
+    this.superclass.init.call(this);
+    var currentUserAgentElement = document.querySelector('#current-user-agent');
+    currentUserAgentElement.innerText = pskl.utils.UserAgent.getDisplayName();
+  };
+})();

src/js/controller/dialogs/backups/BrowseBackups.js

@@ -0,0 +1,81 @@
+(function () {
+  var ns = $.namespace('pskl.controller.dialogs.backups');
+
+  var stepDefinitions = {
+    'SELECT_SESSION' : {
+      controller : ns.steps.SelectSession,
+      template : 'backups-select-session'
+    },
+    'SESSION_DETAILS' : {
+      controller : ns.steps.SessionDetails,
+      template : 'backups-session-details'
+    },
+  };
+
+  ns.BrowseBackups = function (piskelController, args) {
+    this.piskelController = piskelController;
+
+    // Backups data object used by steps to communicate and share their
+    // results.
+    this.backupsData = {
+      sessions: [],
+      selectedSession : null
+    };
+  };
+
+  pskl.utils.inherit(ns.BrowseBackups, pskl.controller.dialogs.AbstractDialogController);
+
+  ns.BrowseBackups.prototype.init = function () {
+    this.superclass.init.call(this);
+
+    // Prepare wizard steps.
+    this.steps = this.createSteps_();
+
+    // Start wizard widget.
+    var wizardContainer = document.querySelector('.backups-wizard-container');
+    this.wizard = new pskl.widgets.Wizard(this.steps, wizardContainer);
+    this.wizard.init();
+
+    this.wizard.goTo('SELECT_SESSION');
+  };
+
+  ns.BrowseBackups.prototype.back = function () {
+    this.wizard.back();
+    this.wizard.getCurrentStep().instance.onShow();
+  };
+
+  ns.BrowseBackups.prototype.next = function () {
+    var step = this.wizard.getCurrentStep();
+    if (step.name === 'SELECT_SESSION') {
+      this.wizard.goTo('SESSION_DETAILS');
+    }
+  };
+
+  ns.BrowseBackups.prototype.destroy = function (file) {
+    Object.keys(this.steps).forEach(function (stepName) {
+      var step = this.steps[stepName];
+      step.instance.destroy();
+      step.instance = null;
+      step.el = null;
+    }.bind(this));
+
+    this.superclass.destroy.call(this);
+  };
+
+  ns.BrowseBackups.prototype.createSteps_ = function () {
+    var steps = {};
+    Object.keys(stepDefinitions).forEach(function (stepName) {
+      var definition = stepDefinitions[stepName];
+      var el = pskl.utils.Template.getAsHTML(definition.template);
+      var instance = new definition.controller(this.piskelController, this, el);
+      instance.init();
+      steps[stepName] = {
+        name: stepName,
+        el: el,
+        instance: instance
+      };
+    }.bind(this));
+
+    return steps;
+  };
+})();

src/js/controller/dialogs/backups/steps/SelectSession.js

@@ -0,0 +1,101 @@
+(function () {
+  var ns = $.namespace('pskl.controller.dialogs.backups.steps');
+
+  // Should match the transition duration for.session-item defined in dialogs-browse-backups.css
+  var DELETE_TRANSITION_DURATION = 500;
+  /**
+   * Helper that returns a promise that will resolve after waiting for a
+   * given time (in ms).
+   *
+   * @param {Number} time
+   *        The time to wait.
+   * @return {Promise} promise that resolves after time.
+   */
+  var wait = function (time) {
+    var deferred = Q.defer();
+    setTimeout(function () {
+      deferred.resolve();
+    }, time);
+    return deferred.promise;
+  };
+
+  ns.SelectSession = function (piskelController, backupsController, container) {
+    this.piskelController = piskelController;
+    this.backupsController = backupsController;
+    this.container = container;
+  };
+
+  ns.SelectSession.prototype.addEventListener = function (el, type, cb) {
+    pskl.utils.Event.addEventListener(el, type, cb, this);
+  };
+
+  ns.SelectSession.prototype.init = function () {
+    this.addEventListener(this.container, 'click', this.onContainerClick_);
+  };
+
+  ns.SelectSession.prototype.onShow = function () {
+    this.update();
+  };
+
+  ns.SelectSession.prototype.update = function () {
+    pskl.app.backupService.list().then(function (sessions) {
+      var html = this.getMarkupForSessions_(sessions);
+      this.container.querySelector('.session-list').innerHTML = html;
+    }.bind(this)).catch(function () {
+      var html = pskl.utils.Template.get('session-list-error');
+      this.container.querySelector('.session-list').innerHTML = html;
+    }.bind(this));
+  };
+
+  ns.SelectSession.prototype.getMarkupForSessions_ = function (sessions) {
+    if (sessions.length === 0) {
+      return pskl.utils.Template.get('session-list-empty');
+    }
+
+    var sessionItemTemplate = pskl.utils.Template.get('session-list-item');
+    return sessions.reduce(function (previous, session) {
+      if (session.id === pskl.app.sessionId) {
+        // Do not show backups for the current session.
+        return previous;
+      }
+      var view = {
+        id: session.id,
+        name: session.name,
+        description: session.description ? '- ' + session.description : '',
+        date: pskl.utils.DateUtils.format(session.endDate, 'the {{Y}}/{{M}}/{{D}} at {{H}}:{{m}}'),
+        count: session.count === 1 ? '1 snapshot' : session.count + ' snapshots'
+      };
+      return previous + pskl.utils.Template.replace(sessionItemTemplate, view);
+    }, '');
+  };
+
+  ns.SelectSession.prototype.destroy = function () {
+    pskl.utils.Event.removeAllEventListeners(this);
+  };
+
+  ns.SelectSession.prototype.onContainerClick_ = function (evt) {
+    var sessionId = evt.target.dataset.sessionId;
+    if (!sessionId) {
+      return;
+    }
+
+    var action = evt.target.dataset.action;
+    if (action == 'view') {
+      this.backupsController.backupsData.selectedSession = sessionId;
+      this.backupsController.next();
+    } else if (action == 'delete') {
+      if (window.confirm('Are you sure you want to delete this session?')) {
+        evt.target.closest('.session-item').classList.add('deleting');
+        Q.all([
+          pskl.app.backupService.deleteSession(sessionId),
+          // Wait for 500ms for the .hide opacity transition.
+          wait(DELETE_TRANSITION_DURATION)
+        ]).then(function () {
+          // Refresh the list of sessions
+          this.update();
+        }.bind(this));
+      }
+    }
+  };
+
+})();

src/js/controller/dialogs/backups/steps/SessionDetails.js

@@ -0,0 +1,102 @@
+(function () {
+  var ns = $.namespace('pskl.controller.dialogs.backups.steps');
+
+  // Should match the preview dimensions defined in dialogs-browse-backups.css
+  var PREVIEW_SIZE = 60;
+
+  ns.SessionDetails = function (piskelController, backupsController, container) {
+    this.piskelController = piskelController;
+    this.backupsController = backupsController;
+    this.container = container;
+  };
+
+  ns.SessionDetails.prototype.init = function () {
+    this.backButton = this.container.querySelector('.back-button');
+    this.addEventListener(this.backButton, 'click', this.onBackClick_);
+    this.addEventListener(this.container, 'click', this.onContainerClick_);
+  };
+
+  ns.SessionDetails.prototype.destroy = function () {
+    pskl.utils.Event.removeAllEventListeners(this);
+  };
+
+  ns.SessionDetails.prototype.addEventListener = function (el, type, cb) {
+    pskl.utils.Event.addEventListener(el, type, cb, this);
+  };
+
+  ns.SessionDetails.prototype.onShow = function () {
+    var sessionId = this.backupsController.backupsData.selectedSession;
+    pskl.app.backupService.getSnapshotsBySessionId(sessionId).then(function (snapshots) {
+      var html = this.getMarkupForSnapshots_(snapshots);
+      this.container.querySelector('.snapshot-list').innerHTML = html;
+
+      // Load the image of the first frame for each sprite and update the list.
+      snapshots.forEach(function (snapshot) {
+        this.updateSnapshotPreview_(snapshot);
+      }.bind(this));
+    }.bind(this)).catch(function () {
+      var html = pskl.utils.Template.get('snapshot-list-error');
+      this.container.querySelector('.snapshot-list').innerHTML = html;
+    }.bind(this));
+  };
+
+  ns.SessionDetails.prototype.getMarkupForSnapshots_ = function (snapshots) {
+    if (snapshots.length === 0) {
+      // This should normally never happen, all sessions have at least one snapshot and snapshots
+      // can not be individually deleted.
+      console.warn('Could not retrieve snapshots for a session');
+      return pskl.utils.Template.get('snapshot-list-empty');
+    }
+
+    var sessionItemTemplate = pskl.utils.Template.get('snapshot-list-item');
+    return snapshots.reduce(function (previous, snapshot) {
+      var view = {
+        id: snapshot.id,
+        name: snapshot.name,
+        description: snapshot.description ? '- ' + snapshot.description : '',
+        date: pskl.utils.DateUtils.format(snapshot.date, 'the {{Y}}/{{M}}/{{D}} at {{H}}:{{m}}'),
+        frames: snapshot.frames === 1 ? '1 frame' : snapshot.frames + ' frames',
+        resolution: pskl.utils.StringUtils.formatSize(snapshot.width, snapshot.height),
+        fps: snapshot.fps
+      };
+      return previous + pskl.utils.Template.replace(sessionItemTemplate, view);
+    }, '');
+  };
+
+  ns.SessionDetails.prototype.updateSnapshotPreview_ = function (snapshot) {
+    pskl.utils.serialization.Deserializer.deserialize(
+      JSON.parse(snapshot.serialized),
+      function (piskel) {
+        var selector = '.snapshot-item[data-snapshot-id="' + snapshot.id + '"] .snapshot-preview';
+        var previewContainer = this.container.querySelector(selector);
+        if (!previewContainer) {
+          return;
+        }
+        var image = this.getFirstFrameAsImage_(piskel);
+        previewContainer.appendChild(image);
+      }.bind(this)
+    );
+  };
+
+  ns.SessionDetails.prototype.getFirstFrameAsImage_ = function (piskel) {
+    var frame = pskl.utils.LayerUtils.mergeFrameAt(piskel.getLayers(), 0);
+    var wZoom = PREVIEW_SIZE / piskel.width;
+    var hZoom = PREVIEW_SIZE / piskel.height;
+    var zoom = Math.min(hZoom, wZoom);
+    return pskl.utils.FrameUtils.toImage(frame, zoom);
+  };
+
+  ns.SessionDetails.prototype.onBackClick_ = function () {
+    this.backupsController.back(this);
+  };
+
+  ns.SessionDetails.prototype.onContainerClick_ = function (evt) {
+    var action = evt.target.dataset.action;
+    if (action == 'load' && window.confirm(Constants.CONFIRM_OVERWRITE)) {
+      var snapshotId = evt.target.dataset.snapshotId * 1;
+      pskl.app.backupService.loadSnapshotById(snapshotId).then(function () {
+        $.publish(Events.DIALOG_HIDE);
+      });
+    }
+  };
+})();

src/js/controller/dialogs/importwizard/ImportWizard.js

@@ -0,0 +1,202 @@
+(function () {
+  var ns = $.namespace('pskl.controller.dialogs.importwizard');
+
+  var stepDefinitions = {
+    'IMAGE_IMPORT' : {
+      controller : ns.steps.ImageImport,
+      template : 'import-image-import'
+    },
+    'ADJUST_SIZE' : {
+      controller : ns.steps.AdjustSize,
+      template : 'import-adjust-size'
+    },
+    'INSERT_LOCATION' : {
+      controller : ns.steps.InsertLocation,
+      template : 'import-insert-location'
+    },
+    'SELECT_MODE' : {
+      controller : ns.steps.SelectMode,
+      template : 'import-select-mode'
+    }
+  };
+
+  ns.ImportWizard = function (piskelController, args) {
+    this.piskelController = piskelController;
+
+    // Merge data object used by steps to communicate and share their
+    // results.
+    this.mergeData = {
+      rawFiles : [],
+      mergePiskel: null,
+      origin: null,
+      resize: null,
+      insertIndex: null,
+      insertMode: null
+    };
+  };
+
+  pskl.utils.inherit(ns.ImportWizard, pskl.controller.dialogs.AbstractDialogController);
+
+  ns.ImportWizard.prototype.init = function (initArgs) {
+    this.superclass.init.call(this);
+
+    // Prepare mergeData  object and wizard steps.
+    this.mergeData.rawFiles = initArgs.rawFiles;
+    this.steps = this.createSteps_();
+
+    // Start wizard widget.
+    var wizardContainer = document.querySelector('.import-wizard-container');
+    this.wizard = new pskl.widgets.Wizard(this.steps, wizardContainer);
+    this.wizard.init();
+
+    if (this.hasSingleImage_()) {
+      this.wizard.goTo('IMAGE_IMPORT');
+    } else if (this.hasSinglePiskelFile_()) {
+      // If a piskel file was provided we can directly go to
+      pskl.utils.PiskelFileUtils.loadFromFile(this.mergeData.rawFiles[0],
+        // onSuccess
+        function (piskel) {
+          this.mergeData.mergePiskel = piskel;
+          this.wizard.goTo('SELECT_MODE');
+        }.bind(this),
+        // onError
+        function (reason) {
+          this.closeDialog();
+          $.publish(Events.PISKEL_FILE_IMPORT_FAILED, [reason]);
+        }.bind(this)
+      );
+    } else {
+      console.error('Unsupported import. Only single piskel or single image are supported at the moment.');
+      this.closeDialog();
+    }
+  };
+
+  ns.ImportWizard.prototype.back = function () {
+    this.wizard.back();
+    this.wizard.getCurrentStep().instance.onShow();
+  };
+
+  ns.ImportWizard.prototype.next = function () {
+    var step = this.wizard.getCurrentStep();
+
+    if (step.name === 'IMAGE_IMPORT') {
+      if (this.piskelController.isEmpty()) {
+        // If the current sprite is empty finalize immediately and replace the current sprite.
+        this.mergeData.importMode = ns.steps.SelectMode.MODES.REPLACE;
+        this.finalizeImport_();
+      } else {
+        this.wizard.goTo('SELECT_MODE');
+      }
+    } else if (step.name === 'SELECT_MODE') {
+      if (this.mergeData.importMode === ns.steps.SelectMode.MODES.REPLACE) {
+        this.finalizeImport_();
+      } else if (this.hasSameSize_()) {
+        this.wizard.goTo('INSERT_LOCATION');
+      } else {
+        this.wizard.goTo('ADJUST_SIZE');
+      }
+    } else if (step.name === 'ADJUST_SIZE') {
+      this.wizard.goTo('INSERT_LOCATION');
+    } else if (step.name === 'INSERT_LOCATION') {
+      this.finalizeImport_();
+    }
+  };
+
+  ns.ImportWizard.prototype.destroy = function (file) {
+    Object.keys(this.steps).forEach(function (stepName) {
+      var step = this.steps[stepName];
+      step.instance.destroy();
+      step.instance = null;
+      step.el = null;
+    }.bind(this));
+
+    this.superclass.destroy.call(this);
+  };
+
+  ns.ImportWizard.prototype.createSteps_ = function () {
+    // The IMAGE_IMPORT step is used only if there is a single image file
+    // being imported.
+    var hasSingleImage = this.hasSingleImage_();
+
+    var steps = {};
+    Object.keys(stepDefinitions).forEach(function (stepName) {
+      if (stepName === 'IMAGE_IMPORT' && !hasSingleImage) {
+        return;
+      }
+
+      var definition = stepDefinitions[stepName];
+      var el = pskl.utils.Template.getAsHTML(definition.template);
+      var instance = new definition.controller(this.piskelController, this, el);
+      instance.init();
+      steps[stepName] = {
+        name: stepName,
+        el: el,
+        instance: instance
+      };
+    }.bind(this));
+
+    if (hasSingleImage) {
+      steps.IMAGE_IMPORT.el.classList.add('import-first-step');
+    } else {
+      steps.SELECT_MODE.el.classList.add('import-first-step');
+    }
+
+    return steps;
+  };
+
+  ns.ImportWizard.prototype.finalizeImport_ = function () {
+    var piskel = this.mergeData.mergePiskel;
+    var mode = this.mergeData.importMode;
+
+    if (mode === ns.steps.SelectMode.MODES.REPLACE) {
+      // Replace the current piskel and close the dialog.
+      if (window.confirm(Constants.CONFIRM_OVERWRITE)) {
+        this.piskelController.setPiskel(piskel);
+        this.closeDialog();
+      }
+    } else if (mode === ns.steps.SelectMode.MODES.MERGE) {
+      var merge = pskl.utils.MergeUtils.merge(this.piskelController.getPiskel(), piskel, {
+        insertIndex: this.mergeData.insertIndex,
+        insertMode: this.mergeData.insertMode,
+        origin: this.mergeData.origin,
+        resize: this.mergeData.resize
+      });
+      this.piskelController.setPiskel(merge);
+
+      // Set the first imported layer as selected.
+      var importedLayers = piskel.getLayers().length;
+      var currentLayers = this.piskelController.getLayers().length;
+      this.piskelController.setCurrentLayerIndex(currentLayers - importedLayers);
+
+      this.closeDialog();
+    }
+  };
+
+  ns.ImportWizard.prototype.hasSameSize_ = function () {
+    var piskel = this.mergeData.mergePiskel;
+    if (!piskel) {
+      return false;
+    }
+
+    return piskel.width === this.piskelController.getWidth() &&
+           piskel.height === this.piskelController.getHeight();
+  };
+
+  ns.ImportWizard.prototype.hasSingleImage_ = function () {
+    if (this.mergeData.rawFiles.length !== 1) {
+      return false;
+    }
+
+    var file = this.mergeData.rawFiles[0];
+    return file.type.indexOf('image') === 0;
+  };
+
+  ns.ImportWizard.prototype.hasSinglePiskelFile_ = function () {
+    if (this.mergeData.rawFiles.length !== 1) {
+      return false;
+    }
+
+    var file = this.mergeData.rawFiles[0];
+    return (/\.piskel$/).test(file.name);
+  };
+})();

src/js/controller/dialogs/importwizard/steps/AbstractImportStep.js

@@ -0,0 +1,65 @@
+(function () {
+  var ns = $.namespace('pskl.controller.dialogs.importwizard.steps');
+
+  ns.AbstractImportStep = function (piskelController, importController, container) {
+    this.piskelController = piskelController;
+    this.container = container;
+    this.importController = importController;
+    this.mergeData = this.importController.mergeData;
+  };
+
+  ns.AbstractImportStep.prototype.init = function () {
+    this.nextButton = this.container.querySelector('.import-next-button');
+    this.backButton = this.container.querySelector('.import-back-button');
+
+    this.addEventListener(this.nextButton, 'click', this.onNextClick);
+    this.addEventListener(this.backButton, 'click', this.onBackClick);
+  };
+
+  ns.AbstractImportStep.prototype.addEventListener = function (el, type, cb) {
+    pskl.utils.Event.addEventListener(el, type, cb, this);
+  };
+
+  ns.AbstractImportStep.prototype.destroy = function () {
+    if (this.framePickerWidget) {
+      this.framePickerWidget.destroy();
+    }
+
+    pskl.utils.Event.removeAllEventListeners(this);
+  };
+
+  ns.AbstractImportStep.prototype.onNextClick = function () {
+    this.importController.next(this);
+  };
+
+  ns.AbstractImportStep.prototype.onBackClick = function () {
+    this.importController.back(this);
+  };
+
+  ns.AbstractImportStep.prototype.onShow = function () {
+    var mergePiskel = this.mergeData.mergePiskel;
+    if (!mergePiskel) {
+      return;
+    }
+
+    if (!this.framePickerWidget) {
+      var framePickerContainer = this.container.querySelector('.import-preview');
+      this.framePickerWidget = new pskl.widgets.FramePicker(mergePiskel, framePickerContainer);
+      this.framePickerWidget.init();
+    } else if (this.framePickerWidget.piskel != mergePiskel) {
+      // If the piskel displayed by the frame picker is different from the previous one,
+      // refresh the widget.
+      this.framePickerWidget.piskel = mergePiskel;
+      this.framePickerWidget.setFrameIndex(1);
+    }
+
+    var metaHtml = pskl.utils.Template.getAndReplace('import-meta-content', {
+      name : mergePiskel.getDescriptor().name,
+      dimensions : pskl.utils.StringUtils.formatSize(mergePiskel.getWidth(), mergePiskel.getHeight()),
+      frames : mergePiskel.getFrameCount(),
+      layers : mergePiskel.getLayers().length
+    });
+    this.container.querySelector('.import-meta').innerHTML = metaHtml;
+  };
+
+})();

src/js/controller/dialogs/importwizard/steps/AdjustSize.js

@@ -0,0 +1,109 @@
+(function () {
+  var ns = $.namespace('pskl.controller.dialogs.importwizard.steps');
+
+  ns.AdjustSize = function (piskelController, importController, container) {
+    this.superclass.constructor.apply(this, arguments);
+  };
+
+  ns.AdjustSize.OPTIONS = {
+    KEEP: 'keep',
+    EXPAND: 'expand'
+  };
+
+  pskl.utils.inherit(ns.AdjustSize, ns.AbstractImportStep);
+
+  ns.AdjustSize.prototype.init = function () {
+    this.superclass.init.call(this);
+
+    // Create anchor widget
+    var anchorContainer = this.container.querySelector('.import-resize-anchor-container');
+    this.anchorWidget = new pskl.widgets.AnchorWidget(anchorContainer, this.onAnchorChange_.bind(this));
+    this.anchorWidget.setOrigin('TOPLEFT');
+
+    this.resizeInfoContainer = this.container.querySelector('.import-resize-info');
+    this.addEventListener(this.resizeInfoContainer, 'change', this.onResizeOptionChange_);
+
+    // By default, set the mode to expand to avoid losing any image content.
+    this.mergeData.resize = ns.AdjustSize.OPTIONS.EXPAND;
+  };
+
+  ns.AdjustSize.prototype.destroy = function () {
+    this.anchorWidget.destroy();
+    this.superclass.destroy.call(this);
+  };
+
+  ns.AdjustSize.prototype.onShow = function () {
+    this.refresh_();
+    this.superclass.onShow.call(this);
+  };
+
+  ns.AdjustSize.prototype.refresh_ = function () {
+    var isBigger = this.isImportedPiskelBigger_();
+    var keep = this.mergeData.resize === ns.AdjustSize.OPTIONS.KEEP;
+
+    // Refresh resize partial
+    var size = this.formatPiskelSize_(this.piskelController.getPiskel());
+    var newSize = this.formatPiskelSize_(this.mergeData.mergePiskel);
+    var markup;
+    if (isBigger) {
+      markup = pskl.utils.Template.getAndReplace('import-resize-bigger-partial', {
+        size : size,
+        newSize : newSize,
+        keepChecked : keep ? 'checked="checked"' : '',
+        expandChecked : keep ? '' : 'checked="checked"'
+      });
+    } else {
+      markup = pskl.utils.Template.getAndReplace('import-resize-smaller-partial', {
+        size : size,
+        newSize : newSize
+      });
+    }
+    this.resizeInfoContainer.innerHTML = markup;
+
+    // Update anchor widget
+    if (this.mergeData.origin) {
+      this.anchorWidget.setOrigin(this.mergeData.origin);
+    }
+
+    // Update anchor widget info
+    var anchorInfo = this.container.querySelector('.import-resize-anchor-info');
+    if (isBigger && keep) {
+      anchorInfo.innerHTML = [
+        '<div class="import-resize-warning">',
+        '  Imported content will be cropped!',
+        '</div>',
+        'Select crop anchor:'
+      ].join('');
+    } else if (isBigger) {
+      anchorInfo.innerHTML = 'Select resize anchor:';
+    } else {
+      anchorInfo.innerHTML = 'Select position anchor:';
+    }
+  };
+
+  ns.AdjustSize.prototype.onAnchorChange_ = function (origin) {
+    this.mergeData.origin = origin;
+  };
+
+  ns.AdjustSize.prototype.onResizeOptionChange_ = function () {
+    var value = this.resizeInfoContainer.querySelector(':checked').value;
+    if (this.mergeData.resize != value) {
+      this.mergeData.resize = value;
+      this.refresh_();
+    }
+  };
+
+  ns.AdjustSize.prototype.isImportedPiskelBigger_ = function () {
+    var piskel = this.mergeData.mergePiskel;
+    if (!piskel) {
+      return false;
+    }
+
+    return piskel.width > this.piskelController.getWidth() ||
+           piskel.height > this.piskelController.getHeight();
+  };
+
+  ns.AdjustSize.prototype.formatPiskelSize_ = function (piskel) {
+    return pskl.utils.StringUtils.formatSize(piskel.width, piskel.height);
+  };
+})();

src/js/controller/dialogs/importwizard/steps/ImageImport.js

@@ -0,0 +1,282 @@
+(function () {
+  var ns = $.namespace('pskl.controller.dialogs.importwizard.steps');
+
+  ns.ImageImport = function (piskelController, importController, container) {
+    this.superclass.constructor.apply(this, arguments);
+    this.importedImage_ = null;
+    this.file_ = null;
+  };
+
+  pskl.utils.inherit(ns.ImageImport, ns.AbstractImportStep);
+
+  ns.ImageImport.prototype.init = function (file) {
+    this.superclass.init.call(this);
+
+    // This step is only used if rawFiles contains a single image.
+    this.file_ = this.mergeData.rawFiles[0];
+
+    this.importPreview = this.container.querySelector('.import-section-preview');
+
+    this.fileNameContainer = this.container.querySelector('.import-image-file-name');
+
+    this.singleImportType = this.container.querySelector('[name=import-type][value=single]');
+    this.sheetImportType = this.container.querySelector('[name=import-type][value=sheet]');
+
+    this.resizeWidth = this.container.querySelector('[name=resize-width]');
+    this.resizeHeight = this.container.querySelector('[name=resize-height]');
+    this.smoothResize =  this.container.querySelector('[name=smooth-resize-checkbox]');
+
+    this.frameSizeX = this.container.querySelector('[name=frame-size-x]');
+    this.frameSizeY = this.container.querySelector('[name=frame-size-y]');
+    this.frameOffsetX = this.container.querySelector('[name=frame-offset-x]');
+    this.frameOffsetY = this.container.querySelector('[name=frame-offset-y]');
+
+    this.addEventListener(this.singleImportType, 'change', this.onImportTypeChange_);
+    this.addEventListener(this.sheetImportType, 'change', this.onImportTypeChange_);
+
+    this.addEventListener(this.resizeWidth, 'keyup', this.onResizeInputKeyUp_);
+    this.addEventListener(this.resizeHeight, 'keyup', this.onResizeInputKeyUp_);
+    this.addEventListener(this.frameSizeX, 'keyup', this.onFrameInputKeyUp_);
+    this.addEventListener(this.frameSizeY, 'keyup', this.onFrameInputKeyUp_);
+    this.addEventListener(this.frameOffsetX, 'keyup', this.onFrameInputKeyUp_);
+    this.addEventListener(this.frameOffsetY, 'keyup', this.onFrameInputKeyUp_);
+
+    pskl.utils.FileUtils.readImageFile(this.file_, this.onImageLoaded_.bind(this));
+
+    if (this.piskelController.isEmpty()) {
+      this.nextButton.textContent = 'import';
+    }
+  };
+
+  ns.ImageImport.prototype.onNextClick = function () {
+    this.container.classList.add('import-image-loading');
+    this.createPiskelFromImage().then(function (piskel) {
+      this.mergeData.mergePiskel = piskel;
+      this.container.classList.remove('import-image-loading');
+      this.superclass.onNextClick.call(this);
+    }.bind(this)).catch(function (e) {
+      console.error(e);
+    });
+  };
+
+  ns.ImageImport.prototype.onShow = function () {
+    this.container.classList.remove('import-image-loading');
+  };
+
+  ns.ImageImport.prototype.createPiskelFromImage = function () {
+    var name = this.extractFileNameFromPath_(this.file_.name);
+    // Remove extension from filename.
+    name = name.replace(/\.[a-zA-Z]+$/, '');
+
+    var deferred = Q.defer();
+    pskl.app.importService.newPiskelFromImage(
+      this.importedImage_,
+      {
+        importType: this.getImportType_(),
+        frameSizeX: this.getImportType_() === 'single' ?
+            this.resizeWidth.value : this.sanitizeInputValue_(this.frameSizeX, 1),
+        frameSizeY: this.getImportType_() === 'single' ?
+            this.resizeHeight.value : this.sanitizeInputValue_(this.frameSizeY, 1),
+        frameOffsetX: this.sanitizeInputValue_(this.frameOffsetX, 0),
+        frameOffsetY: this.sanitizeInputValue_(this.frameOffsetY, 0),
+        smoothing: !!this.smoothResize.checked,
+        name: name
+      },
+      deferred.resolve
+    );
+    return deferred.promise;
+  };
+
+  ns.ImageImport.prototype.onImportTypeChange_ = function (evt) {
+    if (this.getImportType_() === 'single') {
+      // Using single image, so remove the frame grid
+      this.hideFrameGrid_();
+    } else {
+      // Using spritesheet import, so draw the frame grid in the preview
+      var x = this.sanitizeInputValue_(this.frameOffsetX, 0);
+      var y = this.sanitizeInputValue_(this.frameOffsetY, 0);
+      var w = this.sanitizeInputValue_(this.frameSizeX, 1);
+      var h = this.sanitizeInputValue_(this.frameSizeY, 1);
+      this.drawFrameGrid_(x, y, w, h);
+    }
+  };
+
+  ns.ImageImport.prototype.onResizeInputKeyUp_ = function (evt) {
+    var from = evt.target.getAttribute('name');
+    if (this.importedImage_) {
+      this.synchronizeResizeFields_(evt.target.value, from);
+    }
+  };
+
+  ns.ImageImport.prototype.onFrameInputKeyUp_ = function (evt) {
+    if (this.importedImage_) {
+      this.synchronizeFrameFields_(evt.target.value);
+    }
+  };
+
+  ns.ImageImport.prototype.synchronizeResizeFields_ = function (value, from) {
+    value = parseInt(value, 10);
+    if (isNaN(value)) {
+      value = 0;
+    }
+    var height = this.importedImage_.height;
+    var width = this.importedImage_.width;
+
+    // Select single image import type since the user changed a value here
+    this.singleImportType.checked = true;
+
+    if (from === 'resize-width') {
+      this.resizeHeight.value = Math.round(value * height / width);
+    } else {
+      this.resizeWidth.value = Math.round(value * width / height);
+    }
+  };
+
+  ns.ImageImport.prototype.synchronizeFrameFields_ = function (value) {
+    value = parseInt(value, 10);
+    if (isNaN(value)) {
+      value = 0;
+    }
+
+    // Parse the frame input values
+    var frameSizeX = this.sanitizeInputValue_(this.frameSizeX, 1);
+    var frameSizeY = this.sanitizeInputValue_(this.frameSizeY, 1);
+    var frameOffsetX = this.sanitizeInputValue_(this.frameOffsetX, 0);
+    var frameOffsetY = this.sanitizeInputValue_(this.frameOffsetY, 0);
+
+    // Select spritesheet import type since the user changed a value here
+    this.sheetImportType.checked = true;
+
+    // Draw the grid
+    this.drawFrameGrid_(frameOffsetX, frameOffsetY, frameSizeX, frameSizeY);
+  };
+
+  ns.ImageImport.prototype.sanitizeInputValue_ = function(input, minValue) {
+    var value = parseInt(input.value, 10);
+    if (value <= minValue || isNaN(value)) {
+      input.value = minValue;
+      value = minValue;
+    }
+    return value;
+  };
+
+  ns.ImageImport.prototype.getImportType_ = function () {
+    if (this.singleImportType.checked) {
+      return this.singleImportType.value;
+    } else if (this.sheetImportType.checked) {
+      return this.sheetImportType.value;
+    } else {
+      throw 'Could not find the currently selected import type';
+    }
+  };
+
+  ns.ImageImport.prototype.onImageLoaded_ = function (image) {
+    this.importedImage_ = image;
+
+    var w = this.importedImage_.width;
+    var h = this.importedImage_.height;
+
+    // FIXME : We remove the onload callback here because JsGif will insert
+    // the image again and we want to avoid retriggering the image onload
+    this.importedImage_.onload = function () {};
+
+    var fileName = this.extractFileNameFromPath_(this.file_.name);
+    this.fileNameContainer.textContent = fileName;
+    this.fileNameContainer.setAttribute('title', fileName);
+
+    this.resizeWidth.value = w;
+    this.resizeHeight.value = h;
+
+    this.frameSizeX.value = w;
+    this.frameSizeY.value = h;
+    this.frameOffsetX.value = 0;
+    this.frameOffsetY.value = 0;
+
+    this.importPreview.innerHTML = '';
+    this.importPreview.appendChild(this.createImagePreview_());
+  };
+
+  ns.ImageImport.prototype.createImagePreview_ = function () {
+    var image = document.createElement('IMG');
+    image.src = this.importedImage_.src;
+    return image;
+  };
+
+  ns.ImageImport.prototype.extractFileNameFromPath_ = function (path) {
+    var parts = [];
+    if (path.indexOf('/') !== -1) {
+      parts = path.split('/');
+    } else if (path.indexOf('\\') !== -1) {
+      parts = path.split('\\');
+    } else {
+      parts = [path];
+    }
+    return parts[parts.length - 1];
+  };
+
+  ns.ImageImport.prototype.drawFrameGrid_ = function (frameX, frameY, frameW, frameH) {
+    if (!this.importedImage_) {
+      return;
+    }
+
+    // Grab the sizes of the source and preview images
+    var width = this.importedImage_.width;
+    var height = this.importedImage_.height;
+
+    var image = this.importPreview.querySelector('img');
+    var previewWidth = image.offsetWidth;
+    var previewHeight = image.offsetHeight;
+
+    var canvas = this.importPreview.querySelector('canvas');
+    if (!canvas) {
+      // Create a new canvas for the grid
+      canvas = pskl.utils.CanvasUtils.createCanvas(
+        previewWidth + 1,
+        previewHeight + 1);
+      this.importPreview.appendChild(canvas);
+    }
+
+    var context = canvas.getContext('2d');
+    context.clearRect(0, 0, canvas.width, canvas.height);
+    context.beginPath();
+
+    // Calculate the number of whole frames
+    var countX = Math.floor((width - frameX) / frameW);
+    var countY = Math.floor((height - frameY) / frameH);
+
+    if (countX > 0 && countY > 0) {
+      var scaleX = previewWidth / width;
+      var scaleY = previewHeight / height;
+      var maxWidth = countX * frameW + frameX;
+      var maxHeight = countY * frameH + frameY;
+
+      // Draw the vertical lines
+      for (var x = frameX + 0.5; x < maxWidth + 1 && x < width + 1; x += frameW) {
+        context.moveTo(x * scaleX, frameY * scaleY);
+        context.lineTo(x * scaleX, maxHeight * scaleY);
+      }
+
+      // Draw the horizontal lines
+      for (var y = frameY + 0.5; y < maxHeight + 1 && y < height + 1; y += frameH) {
+        context.moveTo(frameX * scaleX, y * scaleY);
+        context.lineTo(maxWidth * scaleX, y * scaleY);
+      }
+
+      context.lineWidth = 1;
+      context.strokeStyle = 'gold';
+      context.stroke();
+
+      // Show the canvas
+      canvas.style.display = 'block';
+    } else {
+      this.hideFrameGrid_();
+    }
+  };
+
+  ns.ImageImport.prototype.hideFrameGrid_ = function() {
+    var canvas = this.importPreview.querySelector('canvas');
+    if (canvas) {
+      canvas.style.display = 'none';
+    }
+  };
+})();

src/js/controller/dialogs/importwizard/steps/InsertLocation.js

@@ -0,0 +1,59 @@
+(function () {
+  var ns = $.namespace('pskl.controller.dialogs.importwizard.steps');
+
+  ns.InsertLocation = function () {
+    this.superclass.constructor.apply(this, arguments);
+  };
+
+  ns.InsertLocation.MODES = {
+    ADD : 'add',
+    INSERT : 'insert'
+  };
+
+  pskl.utils.inherit(ns.InsertLocation, ns.AbstractImportStep);
+
+  ns.InsertLocation.prototype.init = function () {
+    this.superclass.init.call(this);
+    this.framePreview = this.container.querySelector('.insert-frame-preview');
+    this.currentPiskelFramePickerWidget = new pskl.widgets.FramePicker(
+      this.piskelController.getPiskel(), this.framePreview);
+
+    this.insertModeContainer = this.container.querySelector('.insert-mode-container');
+    this.addEventListener(this.insertModeContainer, 'change', this.onInsertModeChange_);
+    this.mergeData.insertMode = ns.InsertLocation.MODES.ADD;
+  };
+
+  ns.InsertLocation.prototype.onInsertModeChange_  = function () {
+    var value = this.insertModeContainer.querySelector(':checked').value;
+    this.mergeData.insertMode = value;
+
+    if (this.mergeData.insertMode === ns.InsertLocation.MODES.ADD) {
+      this.currentPiskelFramePickerWidget.setFirstFrameIndex(0);
+    } else {
+      this.currentPiskelFramePickerWidget.setFirstFrameIndex(1);
+    }
+  };
+
+  ns.InsertLocation.prototype.onShow = function () {
+    // Initialize the frame picker on show, to be able to calculate correctly the
+    // container's offsetWidth and offsetHeight.
+    this.currentPiskelFramePickerWidget.init();
+
+    var currentFrameIndex = this.piskelController.getCurrentFrameIndex();
+    this.currentPiskelFramePickerWidget.setFrameIndex(currentFrameIndex + 1);
+    this.currentPiskelFramePickerWidget.setFirstFrameIndex(0);
+
+    this.superclass.onShow.call(this);
+  };
+
+  ns.InsertLocation.prototype.onNextClick = function () {
+    var insertIndex = this.currentPiskelFramePickerWidget.getFrameIndex();
+    this.mergeData.insertIndex = insertIndex;
+    this.superclass.onNextClick.call(this);
+  };
+
+  ns.InsertLocation.prototype.destroy = function () {
+    this.currentPiskelFramePickerWidget.destroy();
+    this.superclass.destroy.call(this);
+  };
+})();

src/js/controller/dialogs/importwizard/steps/SelectMode.js

@@ -0,0 +1,42 @@
+(function () {
+  var ns = $.namespace('pskl.controller.dialogs.importwizard.steps');
+
+  ns.SelectMode = function (piskelController, importController, container) {
+    this.superclass.constructor.apply(this, arguments);
+  };
+
+  ns.SelectMode.MODES = {
+    REPLACE : 'replace',
+    MERGE : 'merge'
+  };
+
+  pskl.utils.inherit(ns.SelectMode, ns.AbstractImportStep);
+
+  ns.SelectMode.prototype.init = function () {
+    this.superclass.init.call(this);
+
+    var replaceButton = this.container.querySelector('.import-mode-replace-button');
+    var mergeButton = this.container.querySelector('.import-mode-merge-button');
+
+    this.addEventListener(replaceButton, 'click', this.onReplaceButtonClick_);
+    this.addEventListener(mergeButton, 'click', this.onMergeButtonClick_);
+  };
+
+  ns.SelectMode.prototype.onShow = function () {
+    this.superclass.onShow.call(this);
+  };
+
+  ns.SelectMode.prototype.destroy = function () {
+    this.superclass.destroy.call(this);
+  };
+
+  ns.SelectMode.prototype.onReplaceButtonClick_ = function () {
+    this.mergeData.importMode = ns.SelectMode.MODES.REPLACE;
+    this.onNextClick();
+  };
+
+  ns.SelectMode.prototype.onMergeButtonClick_ = function () {
+    this.mergeData.importMode = ns.SelectMode.MODES.MERGE;
+    this.onNextClick();
+  };
+})();

src/js/controller/piskel/PiskelController.js

@@ -12,11 +12,15 @@
   /**
    * Set the current piskel. Will reset the selected frame and layer unless specified
    * @param {Object} piskel
-   * @param {Boolean} preserveState if true, keep the selected frame and layer
+   * @param {Object} options:
+   *                 preserveState {Boolean} if true, keep the selected frame and layer
+   *                 noSnapshot {Boolean} if true, do not save a snapshot in the piskel
+   *                            history for this call to setPiskel
    */
-  ns.PiskelController.prototype.setPiskel = function (piskel, preserveState) {
+  ns.PiskelController.prototype.setPiskel = function (piskel, options) {
     this.piskel = piskel;
-    if (!preserveState) {
+    options = options || {};
+    if (!options.preserveState) {
       this.currentLayerIndex = 0;
       this.currentFrameIndex = 0;
     }
@@ -35,15 +39,16 @@
     return this.piskel.getWidth();
   };
 
-  /**
-   * TODO : this should be removed
-   * FPS should be stored in the Piskel model and not in the
-   * previewController
-   * Then piskelController should be able to return this information
-   * @return {Number} Frames per second for the current animation
-   */
   ns.PiskelController.prototype.getFPS = function () {
-    return pskl.app.previewController.getFPS();
+    return this.piskel.fps;
+  };
+
+  ns.PiskelController.prototype.setFPS = function (fps) {
+    if (typeof fps !== 'number') {
+      return;
+    }
+    this.piskel.fps = fps;
+    $.publish(Events.FPS_CHANGED);
   };
 
   ns.PiskelController.prototype.getLayers = function () {
@@ -154,8 +159,7 @@
   };
 
   ns.PiskelController.prototype.getFrameCount = function () {
-    var layer = this.piskel.getLayerAt(0);
-    return layer.size();
+    return this.piskel.getFrameCount();
   };
 
   ns.PiskelController.prototype.setCurrentFrameIndex = function (index) {
@@ -230,6 +234,14 @@
     return name;
   };
 
+  ns.PiskelController.prototype.duplicateCurrentLayer = function () {
+    var layer = this.getCurrentLayer();
+    var clone = pskl.utils.LayerUtils.clone(layer);
+    var currentLayerIndex = this.getCurrentLayerIndex();
+    this.piskel.addLayerAt(clone, currentLayerIndex + 1);
+    this.setCurrentLayerIndex(currentLayerIndex + 1);
+  };
+
   ns.PiskelController.prototype.createLayer = function (name) {
     if (!name) {
       name = this.generateLayerName_();
@@ -239,9 +251,9 @@
       for (var i = 0 ; i < this.getFrameCount() ; i++) {
         layer.addFrame(this.createEmptyFrame_());
       }
-      this.piskel.addLayer(layer);
-      this.setCurrentLayerIndex(this.piskel.getLayers().length - 1);
-
+      var currentLayerIndex = this.getCurrentLayerIndex();
+      this.piskel.addLayerAt(layer, currentLayerIndex + 1);
+      this.setCurrentLayerIndex(currentLayerIndex + 1);
     } else {
       throw 'Layer name should be unique';
     }
@@ -251,15 +263,15 @@
     return this.piskel.getLayersByName(name).length > 0;
   };
 
-  ns.PiskelController.prototype.moveLayerUp = function () {
+  ns.PiskelController.prototype.moveLayerUp = function (toTop) {
     var layer = this.getCurrentLayer();
-    this.piskel.moveLayerUp(layer);
+    this.piskel.moveLayerUp(layer, toTop);
     this.selectLayer(layer);
   };
 
-  ns.PiskelController.prototype.moveLayerDown = function () {
+  ns.PiskelController.prototype.moveLayerDown = function (toBottom) {
     var layer = this.getCurrentLayer();
-    this.piskel.moveLayerDown(layer);
+    this.piskel.moveLayerDown(layer, toBottom);
     this.selectLayer(layer);
   };
 
@@ -269,16 +281,28 @@
   };
 
   ns.PiskelController.prototype.removeLayerAt = function (index) {
-    if (this.getLayers().length > 1) {
-      var layer = this.getLayerAt(index);
-      if (layer) {
-        this.piskel.removeLayer(layer);
-        this.setCurrentLayerIndex(0);
+    if (!this.hasLayerAt(index)) {
+      return;
     }
+
+    var layer = this.getLayerAt(index);
+    this.piskel.removeLayer(layer);
+
+    // Update the selected layer if needed.
+    if (this.getCurrentLayerIndex() === index) {
+      this.setCurrentLayerIndex(Math.max(0, index - 1));
     }
   };
 
-  ns.PiskelController.prototype.serialize = function (expanded) {
-    return pskl.utils.Serializer.serializePiskel(this.piskel, expanded);
+  ns.PiskelController.prototype.serialize = function () {
+    return pskl.utils.serialization.Serializer.serialize(this.piskel);
+  };
+
+  /**
+   * Check if the current sprite is empty. Emptiness here means no pixel has been filled
+   * on any layer or frame for the current sprite.
+   */
+  ns.PiskelController.prototype.isEmpty = function () {
+    return pskl.app.currentColorsService.getCurrentColors().length === 0;
   };
 })();