release: bump version to 0.11.1

Dependencies

.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/

.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

@@ -28,6 +28,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

.travis.yml

@@ -6,7 +6,7 @@ before_install:
   - npm install -g grunt-cli
   - git clone git://github.com/n1k0/casperjs.git ~/casperjs
   - cd ~/casperjs
-  - git checkout tags/1.0.2
+  - git checkout tags/1.1.3
   - export PATH=$PATH:`pwd`/bin
   - cd -
 before_script:

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') {
@@ -110,13 +102,15 @@ module.exports = function(grunt) {
         browser : true,
         trailing : true,
         curly : true,
-        globals : {'$':true, 'jQuery' : true, 'pskl':true, 'Events':true, 'Constants':true, 'console' : true, 'module':true, 'require':true, 'Q':true}
+        globals : {'$':true, 'jQuery' : true, 'pskl':true, 'Events':true, 'Constants':true, 'console' : true, 'module':true, 'require':true, 'Q':true, 'Promise': true}
       },
       files: [
+        // Includes
         'Gruntfile.js',
         'package.json',
         'src/js/**/*.js',
-        '!src/js/**/lib/**/*.js' // Exclude lib folder (note the leading !)
+        // Excludes
+        '!src/js/**/lib/**/*.js'
       ]
     },
 
@@ -135,7 +129,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 +174,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 +195,8 @@ module.exports = function(grunt) {
         dest: 'dest/tmp/index.html',
         options : {
           globals : {
-            'version' : version
+            'version' : version,
+            'releaseVersion' : releaseVersion
           }
         }
       }
@@ -231,6 +226,19 @@ module.exports = function(grunt) {
           {src: ['dest/tmp/index.html'], dest: 'dest/prod/piskelapp-partials/main-partial.html'}
         ]
       },
+
+      css: {
+        options: {
+          patterns: [{
+            match: /var\(--highlight-color\)/g,
+            replacement: "gold",
+          }]
+        },
+        files: [{
+          src: ['dest/tmp/css/piskel-style-packaged' + version + '.css'],
+          dest: 'dest/prod/css/piskel-style-packaged' + version + '.css'
+        }]
+      },
       // remove the fake header from the desktop build
       desktop: {
         options: {
@@ -282,9 +290,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 +316,76 @@ 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
+  // TEST TASKS
+  // Run linting
   grunt.registerTask('lint', ['jscs:js', 'leadingIndent:css', 'jshint']);
-
-  // karma/unit-tests task
+  // Run unit-tests
   grunt.registerTask('unit-test', ['karma']);
+  // Run integration tests
+  grunt.registerTask('integration-test', ['build-dev', 'connect:test', 'casperjs:integration']);
+  // 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']);
-
-  // 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']);
+  grunt.registerTask('desktop-mac-old', ['clean:desktop', 'default', 'replace:desktop', 'nwjs:macos_old']);
 
+  // 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']);
 };

bin/copy-to-piskel-website.js

@@ -0,0 +1,75 @@
+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.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

@@ -8,7 +8,10 @@ module.exports = function(config) {
   var piskelScripts = require('./src/piskel-script-list.js').scripts.map(mapToSrcFolder);
   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-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/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,6 +1,6 @@
 {
   "name": "piskel",
-  "version": "0.8.3",
+  "version": "0.11.1",
   "description": "Pixel art editor",
   "author": "Julian Descottes <julian.descottes@gmail.com>",
   "contributors": [
@@ -23,35 +23,39 @@
   "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-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",

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-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,292 @@
+#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;
+  border: 1px solid gold;
+}
+
+.import-meta-label {
+  border-radius: 2px 0 0 2px;
+  color: var(--highlight-color);
+  border-right-width: 0;
+}
+
+.import-meta-title .import-meta-label {
+  border-right-width: 1px;
+  border-radius: 2px;
+}
+
+.import-meta-value {
+  border-radius: 0 2px 2px 0;
+  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-bottom: 5px;
+}
+
+.import-resize-option :checked + span,
+.insert-mode-option :checked + span {
+  color: var(--highlight-color);
+}
+
+/**
+ * ADJUST SIZE
+ */
+.import-resize-anchor-info,
+.import-resize-option-label {
+  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

@@ -83,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

@@ -16,17 +16,17 @@
 }
 
 .pen-size-option[data-size='1'] {
-  padding: 6px;
-}
-.pen-size-option[data-size='2'] {
   padding: 5px;
 }
-.pen-size-option[data-size='3'] {
+.pen-size-option[data-size='2'] {
   padding: 4px;
 }
-.pen-size-option[data-size='4'] {
+.pen-size-option[data-size='3'] {
   padding: 3px;
 }
+.pen-size-option[data-size='4'] {
+  padding: 2px;
+}
 
 .pen-size-option:before {
   content: '';
@@ -34,6 +34,9 @@
   height: 100%;
   background-color: white;
   display: block;
+  text-align: center;
+  line-height: 12px;
+  font-size: 90%;
 }
 
 .pen-size-option:hover {
@@ -41,9 +44,14 @@
 }
 
 .pen-size-option.selected:before {
-  background-color: gold;
+  background-color: var(--highlight-color);
 }
 
 .pen-size-option.selected {
-  border-color: gold;
-}
+  border-color: var(--highlight-color);
+}
+
+.pen-size-option.labeled:before {
+  content: attr(real-pen-size);
+  color: black;
+}

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,16 @@
 /*******************************/
 /*  Application Setting panel  */
 /*******************************/
+.application-settings-form {
+  height: 100%;
+}
+
+.settings-section-application {
+  position: relative;
+  overflow: hidden;
+  margin: 0 20px;
+  height: 100%;
+}
 
 .background-picker-wrapper {
   display: inline-block;
@@ -27,16 +37,23 @@
 }
 
 .background-picker.selected {
-  border-color: gold;
+  border-color: var(--highlight-color);
+}
+
+.settings-opacity-input {
+  margin: 5px;
+  vertical-align: middle;
 }
 
 .layer-opacity-input {
-  margin: 5px;
-  vertical-align: middle;
   width: 100px;
 }
 
-.layer-opacity-text {
+.seamless-opacity-input {
+  width: 75px;
+}
+
+.settings-opacity-text {
   height: 31px;
   display: inline-block;
   line-height: 30px;
@@ -47,7 +64,8 @@
   text-align: center;
 }
 
-.grid-width-select {
+.grid-width-select,
+.color-format-select {
   margin: 5px 5px 0 5px;
 }
 
@@ -55,3 +73,22 @@
   /* Override the default 10px margin bottom for this panel */
   margin-bottom: 15px;
 }
+
+.settings-section-application .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

@@ -113,7 +113,7 @@
   width: 100%;
   height: 1px;
   z-index: 0;
-  background-color: gold;
+  background-color: var(--highlight-color);
 }
 
 .export-tab {
@@ -121,6 +121,7 @@
   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;
@@ -128,11 +129,12 @@
 
 .export-tab.selected,
 .export-tab:hover {
-  color: gold;
+  color: var(--highlight-color);
 }
 
 .export-tab.selected {
-  border-color: gold gold #444 gold;
+  border-color: var(--highlight-color);
+  border-bottom-color: #444;
   border-style: solid;
   border-width: 1px;
 }

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,
@@ -59,7 +59,7 @@ body {
  * 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

@@ -127,7 +127,7 @@
   right: 0;
 
   background-color: black;
-  color: gold;
+  color: var(--highlight-color);
 
   font-family: Tahoma;
   font-size: 0.5em;

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;
 }
 

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-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

@@ -71,13 +71,18 @@
   @@include('templates/misc-templates.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-local.html', {})
   @@include('templates/dialogs/cheatsheet.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', {})

src/js/Constants.js

@@ -13,13 +13,16 @@ var Constants = {
   MAX_WIDTH : 1024,
 
   MAX_PALETTE_COLORS : 100,
+  // 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,6 +52,12 @@ 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,
+
   // SERVICE URLS
   APPENGINE_SAVE_URL : 'save',
   IMAGE_SERVICE_UPLOAD_URL : 'http://piskel-imgstore-b.appspot.com/__/upload',

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,6 +59,7 @@ 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',
@@ -79,6 +80,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

@@ -19,8 +19,9 @@
       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 +36,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 +61,6 @@
 
       this.drawingController = new pskl.controller.DrawingController(
         this.piskelController,
-        this.paletteController,
         $('#drawing-canvas-container'));
       this.drawingController.init();
 
@@ -76,7 +78,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 +96,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();
@@ -124,12 +126,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 +143,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 +154,26 @@
       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.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 +186,23 @@
         mb.createMacBuiltin('Piskel');
         gui.Window.get().menu = mb;
       }
+
+      if (!pskl.utils.Environment.isIntegrationTest() && pskl.utils.UserAgent.isUnsupported()) {
+        $.publish(Events.DIALOG_SHOW, {
+          dialogId : 'unsupported-browser'
+        });
+      }
     },
 
-    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);
 
     /**
@@ -165,6 +163,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);
@@ -212,6 +213,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(
@@ -296,38 +299,63 @@
    * @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
-      // of the drawing canvas.
 
-      this.isClicked = false;
+    // 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
+    // of the drawing canvas.
 
-      if (pskl.app.mouseStateService.isMiddleButtonPressed()) {
-        if (this.dragHandler.isDragging()) {
-          this.dragHandler.stopDrag();
-        } else if (frame.containsPixel(coords.x, coords.y)) {
-          $.publish(Events.SELECT_PRIMARY_COLOR, [frame.getPixel(coords.x, coords.y)]);
-        }
-      } else {
-        this.currentToolBehavior.releaseToolAt(
-          coords.x,
-          coords.y,
-          this.piskelController.getCurrentFrame(),
-          this.overlayFrame,
-          event
-        );
+    this.isClicked = false;
 
-        $.publish(Events.TOOL_RELEASED);
-      }
-      $.publish(Events.MOUSE_EVENT, [event, this]);
+    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 {
+      // Regular tool click, release the current tool.
+      this.currentToolBehavior.releaseToolAt(
+        coords.x,
+        coords.y,
+        this.piskelController.getCurrentFrame(),
+        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) {
-      this.createPreviews_();
+      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,25 +270,22 @@
     cloneFrameButton.className = 'tile-overlay duplicate-frame-action icon-frame-duplicate-white';
     previewTileRoot.appendChild(cloneFrameButton);
 
-    canvasContainer.appendChild(this.getCanvasForFrame(currentFrame));
-    previewTileRoot.appendChild(canvasContainer);
+    // Add delete button
+    var deleteButton = document.createElement('button');
+    deleteButton.setAttribute('rel', 'tooltip');
+    deleteButton.setAttribute('data-placement', 'right');
+    deleteButton.setAttribute('title', 'Delete this frame');
+    deleteButton.setAttribute('data-tile-number', tileNumber);
+    deleteButton.setAttribute('data-tile-action', ACTION.DELETE);
+    deleteButton.className = 'tile-overlay delete-frame-action icon-frame-recyclebin-white';
+    previewTileRoot.appendChild(deleteButton);
 
-    if (tileNumber > 0 || this.piskelController.getFrameCount() > 1) {
-      // Add 'remove frame' button.
-      var deleteButton = document.createElement('button');
-      deleteButton.setAttribute('rel', 'tooltip');
-      deleteButton.setAttribute('data-placement', 'right');
-      deleteButton.setAttribute('title', 'Delete this frame');
-      deleteButton.setAttribute('data-tile-number', tileNumber);
-      deleteButton.setAttribute('data-tile-action', ACTION.DELETE);
-      deleteButton.className = 'tile-overlay delete-frame-action icon-frame-recyclebin-white';
-      previewTileRoot.appendChild(deleteButton);
+    // Add 'dragndrop handle'.
+    var dndHandle = document.createElement('div');
+    dndHandle.className = 'tile-overlay dnd-action icon-frame-dragndrop-white' ;
+    previewTileRoot.appendChild(dndHandle);
 
-      // Add 'dragndrop handle'.
-      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.initCreateLayerButton_();
     this.initToggleLayerPreview_();
 
     this.renderLayerList_();
@@ -27,18 +28,32 @@
   };
 
   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.initCreateLayerButton_ = function () {
+    var tooltip = 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', tooltip);
+  };
+
   ns.LayersListController.prototype.initToggleLayerPreview_ = function () {
     var descriptors = [{description : 'Opacity defined in PREFERENCES'}];
     var helpText = 'Preview all layers';
@@ -99,15 +114,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 +154,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();
     } else if (action == 'down') {
       this.piskelController.moveLayerDown();
     } else if (action == 'add') {
-      this.piskelController.createLayer();
+      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

@@ -100,7 +100,7 @@
   ns.PalettesListController.prototype.getCurrentColorIndex_ = function () {
     var currentIndex = 0;
     var selectedColor = document.querySelector('.' + PRIMARY_COLOR_CLASSNAME);
-    if (selectedColor) {
+    if (selectedColor) {
       currentIndex = parseInt(selectedColor.dataset.colorIndex, 10);
     }
     return currentIndex;
@@ -139,14 +139,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

@@ -25,9 +25,17 @@
   };
 
   ns.PenSizeController.prototype.updateSelectedOption_ = function () {
+    pskl.utils.Dom.removeClass('labeled', this.container);
     pskl.utils.Dom.removeClass('selected', this.container);
     var size = pskl.app.penSizeService.getPenSize();
-    var selectedOption = this.container.querySelector('[data-size="' + size + '"]');
+    var selectedOption;
+    if (size <= 4) {
+      selectedOption = this.container.querySelector('[data-size="' + size + '"]');
+    } else {
+      selectedOption = this.container.querySelector('[data-size="4"]');
+      selectedOption.classList.add('labeled');
+      selectedOption.setAttribute('real-pen-size', size);
+    }
     if (selectedOption) {
       selectedOption.classList.add('selected');
     }

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);
 
@@ -48,7 +47,10 @@
 
     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];

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,17 @@
       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
     }
   };
 
@@ -30,7 +38,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 +50,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 +78,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/importwizard/ImportWizard.js

@@ -0,0 +1,198 @@
+(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') {
+      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.
+      var message = 'This will replace your current animation,' +
+                      ' are you sure you want to continue?';
+      if (window.confirm(message)) {
+        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,110 @@
+(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 = [
+        '<span class="import-resize-warning">',
+          'Imported content will be cropped!',
+        '</span>',
+        ' ',
+        'Select crop origin'
+      ].join('');
+    } else if (isBigger) {
+      anchorInfo.innerHTML = 'Select the anchor for resizing the canvas';
+    } else {
+      anchorInfo.innerHTML = 'Select where the import should be positioned';
+    }
+  };
+
+  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,279 @@
+(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));
+  };
+
+  ns.ImageImport.prototype.onNextClick = function () {
+    this.container.classList.add('import-image-loading');
+    this.createPiskelFromImage().then(function (piskel) {
+      this.mergeData.mergePiskel = piskel;
+      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);
+      }
+
+      // Set the line style to dashed
+      context.lineWidth = 1;
+      // context.setLineDash([2, 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

@@ -35,15 +35,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 +155,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 +230,13 @@
     return name;
   };
 
+  ns.PiskelController.prototype.duplicateCurrentLayer = function () {
+    var layer = this.getCurrentLayer();
+    var clone = pskl.utils.LayerUtils.clone(layer);
+    this.piskel.addLayer(clone);
+    this.setCurrentLayerIndex(this.piskel.getLayers().length - 1);
+  };
+
   ns.PiskelController.prototype.createLayer = function (name) {
     if (!name) {
       name = this.generateLayerName_();
@@ -269,16 +276,20 @@
   };
 
   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);
   };
 })();

src/js/controller/piskel/PublicPiskelController.js

@@ -1,6 +1,12 @@
 (function () {
   var ns = $.namespace('pskl.controller.piskel');
 
+  /**
+   * The PublicPiskelController is a decorator on PiskelController, provides the same API
+   * but will fire RESET/SAVE events when appropriate so that other objects get notified
+   * when important changes are made on the current Piskel.
+   * @param {PiskelController} piskelController the wrapped PiskelController
+   */
   ns.PublicPiskelController = function (piskelController) {
     this.piskelController = piskelController;
     pskl.utils.wrap(this, this.piskelController);
@@ -25,6 +31,7 @@
     this.saveWrap_('duplicateFrameAt', true);
     this.saveWrap_('moveFrame', true);
     this.saveWrap_('createLayer', true);
+    this.saveWrap_('duplicateCurrentLayer', true);
     this.saveWrap_('mergeDownLayerAt', true);
     this.saveWrap_('moveLayerUp', true);
     this.saveWrap_('moveLayerDown', true);
@@ -38,6 +45,10 @@
     pskl.app.shortcutService.registerShortcut(shortcuts.MISC.DUPLICATE_FRAME, this.duplicateCurrentFrame.bind(this));
   };
 
+  ns.PublicPiskelController.prototype.getWrappedPiskelController = function () {
+    return this.piskelController;
+  };
+
   ns.PublicPiskelController.prototype.setPiskel = function (piskel, preserveState) {
     this.piskelController.setPiskel(piskel, preserveState);
 

src/js/controller/preview/PreviewController.js

@@ -3,9 +3,7 @@
 
   // Preview is a square of PREVIEW_SIZE x PREVIEW_SIZE
   var PREVIEW_SIZE = 200;
-
-  var ONION_SKIN_SHORTCUT = 'alt+O';
-  var ORIGINAL_SIZE_SHORTCUT = 'alt+1';
+  var RENDER_MINIMUM_DELAY = 300;
 
   ns.PreviewController = function (piskelController, container) {
     this.piskelController = piskelController;
@@ -15,27 +13,33 @@
     this.currentIndex = 0;
 
     this.onionSkinShortcut = pskl.service.keyboard.Shortcuts.MISC.ONION_SKIN;
-    this.originalSizeShortcut = pskl.service.keyboard.Shortcuts.MISC.X1_PREVIEW;
 
+    this.lastRenderTime = 0;
     this.renderFlag = true;
 
-    /**
-     * !! WARNING !! ALL THE INITIALISATION BELOW SHOULD BE MOVED TO INIT()
-     * IT WILL STAY HERE UNTIL WE CAN REMOVE SETFPS (see comment below)
-     */
     this.fpsRangeInput = document.querySelector('#preview-fps');
     this.fpsCounterDisplay = document.querySelector('#display-fps');
     this.openPopupPreview = document.querySelector('.open-popup-preview-button');
-    this.originalSizeButton = document.querySelector('.original-size-button');
+    this.previewSizeDropdown = document.querySelector('.preview-drop-down');
+    this.previewSizes = {
+      original: {
+        button: document.querySelector('.original-size-button'),
+        shortcut: pskl.service.keyboard.Shortcuts.MISC.X1_PREVIEW,
+        tooltip: 'Original size preview'
+      },
+      best: {
+        button: document.querySelector('.best-size-button'),
+        shortcut: pskl.service.keyboard.Shortcuts.MISC.BEST_PREVIEW,
+        tooltip: 'Best size preview'
+      },
+      full: {
+        button: document.querySelector('.full-size-button'),
+        shortcut: pskl.service.keyboard.Shortcuts.MISC.FULL_PREVIEW,
+        tooltip: 'Full size preview'
+      }
+    };
     this.toggleOnionSkinButton = document.querySelector('.preview-toggle-onion-skin');
 
-    /**
-     * !! WARNING !! THIS SHOULD REMAIN HERE UNTIL, BECAUSE THE PREVIEW CONTROLLER
-     * IS THE SOURCE OF TRUTH AT THE MOMENT WHEN IT COMES TO FPSs
-     * IT WILL BE QUERIED BY OTHER OBJECTS SO DEFINE IT AS SOON AS POSSIBLE
-     */
-    this.setFPS(Constants.DEFAULT.FPS);
-
     this.renderer = new pskl.rendering.frame.BackgroundImageFrameRenderer(this.container);
     this.popupPreviewController = new ns.PopupPreviewController(piskelController);
   };
@@ -46,42 +50,117 @@
 
     document.querySelector('.right-column').style.width = Constants.ANIMATED_PREVIEW_WIDTH + 'px';
 
-    pskl.utils.Event.addEventListener(this.toggleOnionSkinButton, 'click', this.toggleOnionSkin_, this);
-    pskl.utils.Event.addEventListener(this.openPopupPreview, 'click', this.onOpenPopupPreviewClick_, this);
-    pskl.utils.Event.addEventListener(this.originalSizeButton, 'click', this.onOriginalSizeButtonClick_, this);
+    var addEvent = pskl.utils.Event.addEventListener;
+    addEvent(this.toggleOnionSkinButton, 'click', this.toggleOnionSkin_, this);
+    addEvent(this.openPopupPreview, 'click', this.onOpenPopupPreviewClick_, this);
 
-    pskl.app.shortcutService.registerShortcut(this.onionSkinShortcut, this.toggleOnionSkin_.bind(this));
-    pskl.app.shortcutService.registerShortcut(this.originalSizeShortcut, this.onOriginalSizeButtonClick_.bind(this));
+    var registerShortcut = pskl.app.shortcutService.registerShortcut.bind(pskl.app.shortcutService);
+    registerShortcut(this.onionSkinShortcut, this.toggleOnionSkin_.bind(this));
+
+    var onionSkinTooltip = pskl.utils.TooltipFormatter.format('Toggle onion skin', this.onionSkinShortcut);
+    this.toggleOnionSkinButton.setAttribute('title', onionSkinTooltip);
+
+    for (var size in this.previewSizes) {
+      if (this.previewSizes.hasOwnProperty(size)) {
+        var previewSize = this.previewSizes[size];
+        addEvent(previewSize.button, 'click', this.onChangePreviewSize_, this, size);
+        registerShortcut(previewSize.shortcut, this.onChangePreviewSize_.bind(this, size));
+        var tooltip = pskl.utils.TooltipFormatter.format(previewSize.tooltip, previewSize.shortcut);
+        previewSize.button.setAttribute('title', tooltip);
+      }
+    }
 
     $.subscribe(Events.FRAME_SIZE_CHANGED, this.onFrameSizeChange_.bind(this));
     $.subscribe(Events.USER_SETTINGS_CHANGED, $.proxy(this.onUserSettingsChange_, this));
     $.subscribe(Events.PISKEL_SAVE_STATE, this.setRenderFlag_.bind(this, true));
+    $.subscribe(Events.FPS_CHANGED, this.updateFPS_.bind(this));
+    // On PISKEL_RESET, set the render flag and update the FPS input
     $.subscribe(Events.PISKEL_RESET, this.setRenderFlag_.bind(this, true));
+    $.subscribe(Events.PISKEL_RESET, this.updateFPS_.bind(this));
 
-    this.initTooltips_();
+    this.updatePreviewSizeButtons_();
     this.popupPreviewController.init();
 
     this.updateZoom_();
     this.updateOnionSkinPreview_();
-    this.updateOriginalSizeButton_();
+    this.selectPreviewSizeButton_();
+    this.updateFPS_();
     this.updateMaxFPS_();
     this.updateContainerDimensions_();
   };
 
-  ns.PreviewController.prototype.initTooltips_ = function () {
-    var onionSkinTooltip = pskl.utils.TooltipFormatter.format('Toggle onion skin', this.onionSkinShortcut);
-    this.toggleOnionSkinButton.setAttribute('title', onionSkinTooltip);
-    var originalSizeTooltip = pskl.utils.TooltipFormatter.format('Original size preview', this.originalSizeShortcut);
-    this.originalSizeButton.setAttribute('title', originalSizeTooltip);
+  ns.PreviewController.prototype.updatePreviewSizeButtons_ = function () {
+    var fullZoom = this.calculateZoom_();
+    var bestZoom = Math.floor(fullZoom);
+    var seamlessModeEnabled = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_MODE);
+
+    var validSizes;
+    if (fullZoom < 1) {
+      this.disablePreviewSizeWidget_('No other option available');
+      validSizes = ['full'];
+    } else if (fullZoom === 1) {
+      this.disablePreviewSizeWidget_('No other option available');
+      validSizes = ['original'];
+    } else if (seamlessModeEnabled) {
+      this.disablePreviewSizeWidget_('Disabled in seamless mode');
+      validSizes = ['original'];
+    } else {
+      this.enablePreviewSizeWidget_();
+      if (fullZoom === bestZoom) {
+        // If the full zoom is the same as the best zoom, display the best option only as
+        // it gives the exact factor information.
+        validSizes = ['original', 'best'];
+      } else if (bestZoom === 1) {
+        // If best zoom is 1x, remove it as it is redundant with the original option.
+        validSizes = ['full', 'original'];
+      } else {
+        validSizes = ['full', 'original', 'best'];
+      }
+    }
+
+    // Update buttons content and status.
+    this.previewSizes.best.button.textContent = Math.floor(fullZoom) + 'x';
+    for (var size in this.previewSizes) {
+      if (this.previewSizes.hasOwnProperty(size)) {
+        var previewSize = this.previewSizes[size];
+        var isSizeEnabled = validSizes.indexOf(size) != -1;
+
+        // classList.toggle is not available on IE11.
+        if (isSizeEnabled) {
+          previewSize.button.classList.remove('preview-contextual-action-hidden');
+        } else {
+          previewSize.button.classList.add('preview-contextual-action-hidden');
+        }
+      }
+    }
+
+    // Update the selected preview size if the currently selected size is not valid.
+    var selectedSize = pskl.UserSettings.get(pskl.UserSettings.PREVIEW_SIZE);
+    if (validSizes.indexOf(selectedSize) === -1) {
+      this.onChangePreviewSize_(validSizes[0]);
+    }
+  };
+
+  ns.PreviewController.prototype.enablePreviewSizeWidget_ = function () {
+    this.previewSizeDropdown.classList.remove('preview-drop-down-disabled');
+  };
+
+  ns.PreviewController.prototype.disablePreviewSizeWidget_ = function (reason) {
+    // The .preview-disable-overlay is displayed on top of the preview size widget
+    document.querySelector('.preview-disable-overlay').setAttribute('data-original-title', reason);
+    this.previewSizeDropdown.classList.add('preview-drop-down-disabled');
   };
 
   ns.PreviewController.prototype.onOpenPopupPreviewClick_ = function () {
     this.popupPreviewController.open();
   };
 
-  ns.PreviewController.prototype.onOriginalSizeButtonClick_ = function () {
-    var isEnabled = pskl.UserSettings.get(pskl.UserSettings.ORIGINAL_SIZE_PREVIEW);
-    pskl.UserSettings.set(pskl.UserSettings.ORIGINAL_SIZE_PREVIEW, !isEnabled);
+  ns.PreviewController.prototype.onChangePreviewSize_ = function (size) {
+    var previewSize = this.previewSizes[size];
+    var isEnabled = !previewSize.button.classList.contains('preview-contextual-action-hidden');
+    if (isEnabled) {
+      pskl.UserSettings.set(pskl.UserSettings.PREVIEW_SIZE, size);
+    }
   };
 
   ns.PreviewController.prototype.onUserSettingsChange_ = function (evt, name, value) {
@@ -89,9 +168,11 @@
       this.updateOnionSkinPreview_();
     } else if (name == pskl.UserSettings.MAX_FPS) {
       this.updateMaxFPS_();
+    } else if (name === pskl.UserSettings.SEAMLESS_MODE) {
+      this.onFrameSizeChange_();
     } else {
       this.updateZoom_();
-      this.updateOriginalSizeButton_();
+      this.selectPreviewSizeButton_();
       this.updateContainerDimensions_();
     }
   };
@@ -99,27 +180,44 @@
   ns.PreviewController.prototype.updateOnionSkinPreview_ = function () {
     var enabledClassname = 'preview-toggle-onion-skin-enabled';
     var isEnabled = pskl.UserSettings.get(pskl.UserSettings.ONION_SKIN);
-    this.toggleOnionSkinButton.classList.toggle(enabledClassname, isEnabled);
+
+    // classList.toggle is not available on IE11.
+    if (isEnabled) {
+      this.toggleOnionSkinButton.classList.add(enabledClassname);
+    } else {
+      this.toggleOnionSkinButton.classList.remove(enabledClassname);
+    }
   };
 
-  ns.PreviewController.prototype.updateOriginalSizeButton_ = function () {
-    var enabledClassname = 'original-size-button-enabled';
-    var isEnabled = pskl.UserSettings.get(pskl.UserSettings.ORIGINAL_SIZE_PREVIEW);
-    this.originalSizeButton.classList.toggle(enabledClassname, isEnabled);
+  ns.PreviewController.prototype.selectPreviewSizeButton_ = function () {
+    var currentlySelected = document.querySelector('.size-button-selected');
+    if (currentlySelected) {
+      currentlySelected.classList.remove('size-button-selected');
+    }
+
+    var selectedSize = pskl.UserSettings.get(pskl.UserSettings.PREVIEW_SIZE);
+    var previewSize = this.previewSizes[selectedSize];
+    previewSize.button.classList.add('size-button-selected');
   };
 
   ns.PreviewController.prototype.updateMaxFPS_ = function () {
     var maxFps = pskl.UserSettings.get(pskl.UserSettings.MAX_FPS);
     this.fpsRangeInput.setAttribute('max', maxFps);
-    this.setFPS(Math.min(this.fps, maxFps));
+    this.piskelController.setFPS(Math.min(maxFps, this.piskelController.getFPS()));
   };
 
   ns.PreviewController.prototype.updateZoom_ = function () {
-    var originalSizeEnabled = pskl.UserSettings.get(pskl.UserSettings.ORIGINAL_SIZE_PREVIEW);
-    var seamlessModeEnabled = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_MODE);
-    var useOriginalSize = originalSizeEnabled || seamlessModeEnabled;
+    var previewSize = pskl.UserSettings.get(pskl.UserSettings.PREVIEW_SIZE);
+
+    var zoom;
+    if (previewSize === 'original') {
+      zoom = 1;
+    } else if (previewSize === 'best') {
+      zoom = Math.floor(this.calculateZoom_());
+    } else if (previewSize === 'full') {
+      zoom = this.calculateZoom_();
+    }
 
-    var zoom = useOriginalSize ? 1 : this.calculateZoom_();
     this.renderer.setZoom(zoom);
     this.setRenderFlag_(true);
   };
@@ -143,15 +241,17 @@
    * Event handler triggered on 'input' or 'change' events.
    */
   ns.PreviewController.prototype.onFpsRangeInputUpdate_ = function (evt) {
-    this.setFPS(parseInt(this.fpsRangeInput.value, 10));
+    var fps = parseInt(this.fpsRangeInput.value, 10);
+    this.piskelController.setFPS(fps);
     // blur only on 'change' events, as blurring on 'input' breaks on Firefox
     if (evt.type === 'change') {
       this.fpsRangeInput.blur();
     }
   };
 
-  ns.PreviewController.prototype.setFPS = function (fps) {
-    if (typeof fps === 'number') {
+  ns.PreviewController.prototype.updateFPS_ = function () {
+    var fps = this.piskelController.getFPS();
+    if (fps !== this.fps) {
       this.fps = fps;
       // reset
       this.fpsRangeInput.value = 0;
@@ -161,10 +261,6 @@
     }
   };
 
-  ns.PreviewController.prototype.getFPS = function () {
-    return this.fps;
-  };
-
   ns.PreviewController.prototype.render = function (delta) {
     this.elapsedTime += delta;
     var index = this.getNextIndex_(delta);
@@ -173,6 +269,7 @@
       var frame = pskl.utils.LayerUtils.mergeFrameAt(this.piskelController.getLayers(), index);
       this.renderer.render(frame);
       this.renderFlag = false;
+      this.lastRenderTime = Date.now();
 
       this.popupPreviewController.render(frame);
     }
@@ -205,6 +302,7 @@
   ns.PreviewController.prototype.onFrameSizeChange_ = function () {
     this.updateZoom_();
     this.updateContainerDimensions_();
+    this.updatePreviewSizeButtons_();
   };
 
   ns.PreviewController.prototype.updateContainerDimensions_ = function () {
@@ -241,7 +339,8 @@
   };
 
   ns.PreviewController.prototype.shouldRender_ = function () {
-    return this.renderFlag || this.popupPreviewController.renderFlag;
+    return (this.renderFlag || this.popupPreviewController.renderFlag) &&
+            (Date.now() - this.lastRenderTime > RENDER_MINIMUM_DELAY);
   };
 
   ns.PreviewController.prototype.toggleOnionSkin_ = function () {

src/js/controller/settings/ApplicationSettingsController.js

@@ -39,12 +39,30 @@
     maxFpsInput.value = pskl.UserSettings.get(pskl.UserSettings.MAX_FPS);
     this.addEventListener(maxFpsInput, 'change', this.onMaxFpsChange_);
 
+    // Color format
+    var colorFormat = pskl.UserSettings.get(pskl.UserSettings.COLOR_FORMAT);
+    var colorFormatSelect = document.querySelector('.color-format-select');
+    var selectedColorFormatOption = colorFormatSelect.querySelector('option[value="' + colorFormat + '"]');
+    if (selectedColorFormatOption) {
+      selectedColorFormatOption.setAttribute('selected', 'selected');
+    }
+
+    this.addEventListener(colorFormatSelect, 'change', this.onColorFormatChange_);
+
     // Layer preview opacity
     var layerOpacityInput = document.querySelector('.layer-opacity-input');
     layerOpacityInput.value = pskl.UserSettings.get(pskl.UserSettings.LAYER_OPACITY);
     this.addEventListener(layerOpacityInput, 'change', this.onLayerOpacityChange_);
+    this.addEventListener(layerOpacityInput, 'input', this.onLayerOpacityChange_);
     this.updateLayerOpacityText_(layerOpacityInput.value);
 
+    // Seamless mask opacity
+    var seamlessOpacityInput = document.querySelector('.seamless-opacity-input');
+    seamlessOpacityInput.value = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_OPACITY);
+    this.addEventListener(seamlessOpacityInput, 'change', this.onSeamlessOpacityChange_);
+    this.addEventListener(seamlessOpacityInput, 'input', this.onSeamlessOpacityChange_);
+    this.updateSeamlessOpacityText_(seamlessOpacityInput.value);
+
     // Form
     this.applicationSettingsForm = document.querySelector('[name="application-settings-form"]');
     this.addEventListener(this.applicationSettingsForm, 'submit', this.onFormSubmit_);
@@ -55,6 +73,10 @@
     pskl.UserSettings.set(pskl.UserSettings.GRID_WIDTH, width);
   };
 
+  ns.ApplicationSettingsController.prototype.onColorFormatChange_ = function (evt) {
+    pskl.UserSettings.set(pskl.UserSettings.COLOR_FORMAT, evt.target.value);
+  };
+
   ns.ApplicationSettingsController.prototype.onSeamlessModeChange_ = function (evt) {
     pskl.UserSettings.set(pskl.UserSettings.SEAMLESS_MODE, evt.currentTarget.checked);
   };
@@ -65,7 +87,7 @@
     if (background) {
       pskl.UserSettings.set(pskl.UserSettings.CANVAS_BACKGROUND, background);
       var selected = this.backgroundContainer.querySelector('.selected');
-      if (selected) {
+      if (selected) {
         selected.classList.remove('selected');
       }
       target.classList.add('selected');
@@ -94,11 +116,27 @@
     }
   };
 
+  ns.ApplicationSettingsController.prototype.onSeamlessOpacityChange_ = function (evt) {
+    var target = evt.target;
+    var opacity = parseFloat(target.value);
+    if (!isNaN(opacity)) {
+      pskl.UserSettings.set(pskl.UserSettings.SEAMLESS_OPACITY, opacity);
+      this.updateSeamlessOpacityText_(opacity);
+    } else {
+      target.value = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_OPACITY);
+    }
+  };
+
   ns.ApplicationSettingsController.prototype.updateLayerOpacityText_ = function (opacity) {
     var layerOpacityText = document.querySelector('.layer-opacity-text');
     layerOpacityText.innerHTML = opacity;
   };
 
+  ns.ApplicationSettingsController.prototype.updateSeamlessOpacityText_ = function (opacity) {
+    var seamlessOpacityText = document.querySelector('.seamless-opacity-text');
+    seamlessOpacityText.innerHTML = opacity;
+  };
+
   ns.ApplicationSettingsController.prototype.onFormSubmit_ = function (evt) {
     evt.preventDefault();
     $.publish(Events.CLOSE_SETTINGS_DRAWER);

src/js/controller/settings/ImportController.js

@@ -71,7 +71,7 @@
   };
 
   ns.ImportController.prototype.onBrowseLocalClick_ = function (evt) {
-    $.publish(Events.DIALOG_DISPLAY, {
+    $.publish(Events.DIALOG_SHOW, {
       dialogId : 'browse-local'
     });
     this.closeDrawer_();
@@ -79,36 +79,39 @@
 
   ns.ImportController.prototype.openPiskelFile_ = function (file) {
     if (this.isPiskel_(file)) {
-      pskl.utils.PiskelFileUtils.loadFromFile(file, function (piskel, descriptor, fps) {
-        piskel.setDescriptor(descriptor);
-        pskl.app.piskelController.setPiskel(piskel);
-        pskl.app.previewController.setFPS(fps);
+      $.publish(Events.DIALOG_SHOW, {
+        dialogId : 'import',
+        initArgs : {
+          rawFiles: [file]
+        }
       });
       this.closeDrawer_();
+    } else {
+      this.closeDrawer_();
+      console.error('The selected file is not a piskel file');
     }
   };
 
   ns.ImportController.prototype.importPictureFromFile_ = function () {
     var files = this.hiddenFileInput.files;
-    if (files.length == 1) {
-      var file = files[0];
-      if (this.isImage_(file)) {
-        $.publish(Events.DIALOG_DISPLAY, {
-          dialogId : 'import-image',
-          initArgs : file
-        });
-        this.closeDrawer_();
-      } else {
-        this.closeDrawer_();
-        console.error('File is not an image : ' + file.type);
-      }
+    // TODO : Simply filter and remove stuff
+    var areImages = Array.prototype.every.call(files, function (file) {
+      return file.type.indexOf('image') === 0;
+    });
+    if (areImages) {
+      $.publish(Events.DIALOG_SHOW, {
+        dialogId : 'import',
+        initArgs : {
+          rawFiles: files
+        }
+      });
+      this.closeDrawer_();
+    } else {
+      this.closeDrawer_();
+      console.error('Some files are not images');
     }
   };
 
-  ns.ImportController.prototype.isImage_ = function (file) {
-    return file.type.indexOf('image') === 0;
-  };
-
   ns.ImportController.prototype.isPiskel_ = function (file) {
     return (/\.piskel$/).test(file.name);
   };

src/js/controller/settings/SaveController.js

@@ -46,13 +46,23 @@
       this.disableSaveButtons_();
     }
 
+    this.updateSaveToGalleryMessage_();
+
     $.subscribe(Events.BEFORE_SAVING_PISKEL, this.disableSaveButtons_.bind(this));
     $.subscribe(Events.AFTER_SAVING_PISKEL, this.enableSaveButtons_.bind(this));
   };
 
+  ns.SaveController.prototype.updateSaveToGalleryMessage_ = function (spritesheetSize) {
+    var saveToGalleryStatus = document.querySelector('.save-online-status');
+    if (saveToGalleryStatus && pskl.app.performanceReportService.hasProblem()) {
+      var warningPartial = pskl.utils.Template.get('save-gallery-warning-partial');
+      saveToGalleryStatus.innerHTML = warningPartial;
+    }
+  };
+
   ns.SaveController.prototype.insertSavePartials_ = function () {
     this.getPartials_().forEach(function (partial) {
-      pskl.utils.Template.insert(this.saveForm, 'beforeend', partial);
+      this.saveForm.insertAdjacentHTML('beforeend', pskl.utils.Template.get(partial));
     }.bind(this));
   };
 

src/js/controller/settings/exportimage/GifExportController.js

@@ -150,7 +150,7 @@
 
   ns.GifExportController.prototype.updateStatus_ = function (imageUrl, error) {
     if (imageUrl) {
-      var linkTpl = '<a class="image-link" href="{{link}}" target="_blank">{{shortLink}}</a>';
+      var linkTpl = '<a class="highlight" href="{{link}}" target="_blank">{{shortLink}}</a>';
       var linkHtml = pskl.utils.Template.replace(linkTpl, {
         link : imageUrl,
         shortLink : this.shorten_(imageUrl, URL_MAX_LENGTH, '...')

src/js/controller/settings/exportimage/MiscExportController.js

@@ -12,6 +12,9 @@
   ns.MiscExportController.prototype.init = function () {
     var cDownloadButton = document.querySelector('.c-download-button');
     this.addEventListener(cDownloadButton, 'click', this.onDownloadCFileClick_);
+
+    var selectedFrameDownloadButton = document.querySelector('.selected-frame-download-button');
+    this.addEventListener(selectedFrameDownloadButton, 'click', this.onDownloadSelectedFrameClick_);
   };
 
   ns.MiscExportController.prototype.onDownloadCFileClick_ = function (evt) {
@@ -73,4 +76,14 @@
     hexStr += ('00' + r.toString(16)).substr(-2);
     return hexStr;
   };
+
+  ns.MiscExportController.prototype.onDownloadSelectedFrameClick_ = function (evt) {
+    var frameIndex = this.piskelController.getCurrentFrameIndex();
+    var fileName = this.getPiskelName_() + '-' + (frameIndex + 1) + '.png';
+    var canvas = this.piskelController.renderFrameAt(frameIndex, true);
+
+    pskl.utils.BlobUtils.canvasToBlob(canvas, function(blob) {
+      pskl.utils.FileUtils.downloadAsFile(blob, fileName);
+    });
+  };
 })();

src/js/controller/settings/exportimage/PngExportController.js

@@ -3,11 +3,9 @@
 
   var dimensionInfoPattern = '{{width}} x {{height}} px, {{frames}}<br/>{{columns}}, {{rows}}.';
 
-  // Shortcut to pskl.utils.Template.replace
   var replace = pskl.utils.Template.replace;
 
-  // Helper to return "X items" or "1 item" if X is 1. Can be cnsidered as an overkill,
-  // but the one-liner equivalent is hard to read.
+  // Helper to return "X items" or "1 item" if X is 1.
   var pluralize = function (word, count) {
     if (count === 1) {
       return '1 ' + word;
@@ -31,6 +29,7 @@
     this.columnsInput = document.querySelector('#png-export-columns');
 
     var downloadButton = document.querySelector('.png-download-button');
+    var downloadPixiButton = document.querySelector('.png-pixi-download-button');
     var dataUriButton = document.querySelector('.datauri-open-button');
 
     this.initLayoutSection_();
@@ -38,6 +37,7 @@
 
     this.addEventListener(this.columnsInput, 'input', this.onColumnsInput_);
     this.addEventListener(downloadButton, 'click', this.onDownloadClick_);
+    this.addEventListener(downloadPixiButton, 'click', this.onPixiDownloadClick_);
     this.addEventListener(dataUriButton, 'click', this.onDataUriClick_);
     $.subscribe(Events.EXPORT_SCALE_CHANGED, this.onScaleChanged_);
   };
@@ -118,7 +118,7 @@
       value = 1;
     }
 
-    // Force the value to be in bounds, in the user tried to update it by directly typing
+    // Force the value to be in bounds, if the user tried to update it by directly typing
     // a value.
     value = pskl.utils.Math.minmax(value, 1, this.piskelController.getFrameCount());
     this.columnsInput.value = value;
@@ -145,7 +145,11 @@
   ns.PngExportController.prototype.onDownloadClick_ = function (evt) {
     // Create PNG export.
     var canvas = this.createPngSpritesheet_();
+    this.downloadCanvas_(canvas);
+  };
 
+  // Used and overridden in casper integration tests.
+  ns.PngExportController.prototype.downloadCanvas_ = function (canvas) {
     // Generate file name
     var name = this.piskelController.getPiskel().getDescriptor().name;
     var fileName = name + '.png';
@@ -156,6 +160,52 @@
     });
   };
 
+  ns.PngExportController.prototype.onPixiDownloadClick_ = function () {
+    var zip = new window.JSZip();
+
+    // Create PNG export.
+    var canvas = this.createPngSpritesheet_();
+    var name = this.piskelController.getPiskel().getDescriptor().name;
+
+    zip.file(name + '.png', pskl.utils.CanvasUtils.getBase64FromCanvas(canvas) + '\n', {base64: true});
+
+    var width = canvas.width / this.getColumns_();
+    var height = canvas.height / this.getRows_();
+
+    var numFrames = this.piskelController.getFrameCount();
+    var frames = {};
+    for (var i = 0; i < numFrames; i++) {
+      var column = i % this.getColumns_();
+      var row = (i - column) / this.getColumns_();
+      var frame = {
+        'frame': {'x': width * column,'y': height * row,'w': width,'h': height},
+        'rotated': false,
+        'trimmed': false,
+        'spriteSourceSize': {'x': 0,'y': 0,'w': width,'h': height},
+        'sourceSize': {'w': width,'h': height}
+      };
+      frames[name + i + '.png'] = frame;
+    }
+
+    var json = {
+      'frames': frames,
+      'meta': {
+        'app': 'https://github.com/juliandescottes/piskel/',
+        'version': '1.0',
+        'image': name + '.png',
+        'format': 'RGBA8888',
+        'size': {'w': canvas.width,'h': canvas.height}
+      }
+    };
+    zip.file(name + '.json', JSON.stringify(json));
+
+    var blob = zip.generate({
+      type : 'blob'
+    });
+
+    pskl.utils.FileUtils.downloadAsFile(blob, name + '.zip');
+  };
+
   ns.PngExportController.prototype.onDataUriClick_ = function (evt) {
     window.open(this.createPngSpritesheet_().toDataURL('image/png'));
   };

src/js/controller/settings/resize/ResizeController.js

@@ -6,8 +6,8 @@
 
     this.container = document.querySelector('.resize-canvas');
 
-    var anchorWidgetContainer = this.container.querySelector('.resize-origin-container');
-    this.anchorWidget = new ns.AnchorWidget(anchorWidgetContainer);
+    var anchorWidgetContainer = this.container.querySelector('.resize-anchor-container');
+    this.anchorWidget = new pskl.widgets.AnchorWidget(anchorWidgetContainer);
     this.defaultSizeController = new ns.DefaultSizeController(piskelController);
   };
 
@@ -28,7 +28,7 @@
     });
 
     var settings = pskl.UserSettings.get('RESIZE_SETTINGS');
-    var origin = ns.AnchorWidget.ORIGIN[settings.origin] || ns.AnchorWidget.ORIGIN.TOPLEFT;
+    var origin = pskl.widgets.AnchorWidget.ORIGIN[settings.origin] || 'TOPLEFT';
     this.anchorWidget.setOrigin(origin);
 
     if (settings.resizeContent) {
@@ -61,26 +61,19 @@
   ns.ResizeController.prototype.onResizeFormSubmit_ = function (evt) {
     evt.preventDefault();
 
-    var resizedLayers = this.piskelController.getLayers().map(this.resizeLayer_.bind(this));
-
     var currentPiskel = this.piskelController.getPiskel();
-    var piskel = pskl.model.Piskel.fromLayers(resizedLayers, currentPiskel.getDescriptor());
-    // propagate savepath to new Piskel
-    piskel.savePath = currentPiskel.savePath;
+    var piskel = pskl.utils.ResizeUtils.resizePiskel(currentPiskel, {
+      width :  parseInt(this.widthInput.value, 10),
+      height :  parseInt(this.heightInput.value, 10),
+      origin: this.anchorWidget.getOrigin(),
+      resizeContent: this.resizeContentCheckbox.checked
+    });
 
     pskl.app.piskelController.setPiskel(piskel, true);
 
     $.publish(Events.CLOSE_SETTINGS_DRAWER);
   };
 
-  ns.ResizeController.prototype.resizeLayer_ = function (layer) {
-    var opacity = layer.getOpacity();
-    var resizedFrames = layer.getFrames().map(this.resizeFrame_.bind(this));
-    var resizedLayer = pskl.model.Layer.fromFrames(layer.getName(), resizedFrames);
-    resizedLayer.setOpacity(opacity);
-    return resizedLayer;
-  };
-
   ns.ResizeController.prototype.onResizeContentChange_ = function (evt) {
     var target = evt.target;
     if (target.checked) {
@@ -106,55 +99,4 @@
       maintainRatio : !!this.maintainRatioCheckbox.checked
     });
   };
-
-  /***********************/
-  /* RESIZE LOGIC */
-  /***********************/
-
-  ns.ResizeController.prototype.resizeFrame_ = function (frame) {
-    var width = parseInt(this.widthInput.value, 10);
-    var height = parseInt(this.heightInput.value, 10);
-    if (this.resizeContentCheckbox.checked) {
-      return pskl.utils.FrameUtils.resize(frame, width, height, false);
-    } else {
-      var resizedFrame = new pskl.model.Frame(width, height);
-      frame.forEachPixel(function (color, x, y) {
-        var translated = this.translateCoordinates_(x, y, frame, resizedFrame);
-        if (resizedFrame.containsPixel(translated.x, translated.y)) {
-          resizedFrame.setPixel(translated.x, translated.y, color);
-        }
-      }.bind(this));
-
-      return resizedFrame;
-    }
-  };
-
-  ns.ResizeController.prototype.translateCoordinates_ = function (x, y, frame, resizedFrame) {
-    return {
-      x : this.translateX_(x, frame.width, resizedFrame.width),
-      y : this.translateY_(y, frame.height, resizedFrame.height)
-    };
-  };
-
-  ns.ResizeController.prototype.translateX_ = function (x, width, resizedWidth) {
-    var origin = this.anchorWidget.getOrigin();
-    if (origin.indexOf('LEFT') != -1) {
-      return x;
-    } else if (origin.indexOf('RIGHT') != -1) {
-      return x - (width - resizedWidth);
-    } else {
-      return x - Math.round((width - resizedWidth) / 2);
-    }
-  };
-
-  ns.ResizeController.prototype.translateY_ = function (y, height, resizedHeight) {
-    var origin = this.anchorWidget.getOrigin();
-    if (origin.indexOf('TOP') != -1) {
-      return y;
-    } else if (origin.indexOf('BOTTOM') != -1) {
-      return y - (height - resizedHeight);
-    } else {
-      return y - Math.round((height - resizedHeight) / 2);
-    }
-  };
 })();

src/js/devtools/DrawingTestPlayer.js

@@ -8,6 +8,8 @@
     this.step = step || this.initialState.step || ns.DrawingTestPlayer.DEFAULT_STEP;
     this.callbacks = [];
     this.shim = null;
+    this.performance = 0;
+
   };
 
   ns.DrawingTestPlayer.DEFAULT_STEP = 50;
@@ -15,7 +17,16 @@
   ns.DrawingTestPlayer.prototype.start = function () {
     this.setupInitialState_();
     this.createMouseShim_();
-    this.regenerateReferencePng().then(function () {
+
+    // Override the main drawing loop to record the time spent rendering.
+    this.loopBackup = pskl.app.drawingLoop.loop;
+    pskl.app.drawingLoop.loop = function () {
+      var before = window.performance.now();
+      this.loopBackup.call(pskl.app.drawingLoop);
+      this.performance += window.performance.now() - before;
+    }.bind(this);
+
+    this.regenerateReferencePng(function () {
       this.playEvent_(0);
     }.bind(this));
   };
@@ -35,7 +46,7 @@
 
   ns.DrawingTestPlayer.prototype.createPiskel_ = function (width, height) {
     var descriptor = new pskl.model.piskel.Descriptor('TestPiskel', '');
-    var piskel = new pskl.model.Piskel(width, height, descriptor);
+    var piskel = new pskl.model.Piskel(width, height, 12, descriptor);
     var layer = new pskl.model.Layer('Layer 1');
     var frame = new pskl.model.Frame(width, height);
 
@@ -45,21 +56,13 @@
     return piskel;
   };
 
-  ns.DrawingTestPlayer.prototype.regenerateReferencePng = function () {
+  ns.DrawingTestPlayer.prototype.regenerateReferencePng = function (callback) {
     var image = new Image();
-    var then = function () {};
-
     image.onload = function () {
-      this.referencePng = pskl.utils.CanvasUtils.createFromImage(image).toDataURL();
-      then();
+      this.referenceCanvas = pskl.utils.CanvasUtils.createFromImage(image);
+      callback();
     }.bind(this);
     image.src = this.referencePng;
-
-    return {
-      then : function (cb) {
-        then = cb;
-      }
-    };
   };
 
   /**
@@ -84,11 +87,13 @@
     this.timer = window.setTimeout(function () {
       var recordEvent = this.events[index];
 
+      // All events have already been replayed, finish the test.
       if (!recordEvent) {
         this.onTestEnd_();
         return;
       }
 
+      var before = window.performance.now();
       if (recordEvent.type === 'mouse-event') {
         this.playMouseEvent_(recordEvent);
       } else if (recordEvent.type === 'keyboard-event') {
@@ -105,6 +110,9 @@
         this.playInstrumentedEvent_(recordEvent);
       }
 
+      // Record the time spent replaying the event
+      this.performance += window.performance.now() - before;
+
       this.playEvent_(index + 1);
     }.bind(this), this.step);
   };
@@ -129,8 +137,8 @@
 
   ns.DrawingTestPlayer.prototype.playKeyboardEvent_ = function (recordEvent) {
     var event = recordEvent.event;
-    if (pskl.utils.UserAgent.isMac && event.ctrlKey) {
-      event.metaKey = true;
+    if (pskl.utils.UserAgent.isMac) {
+      event.metaKey = event.ctrlKey;
     }
 
     event.preventDefault = function () {};
@@ -163,16 +171,33 @@
 
   ns.DrawingTestPlayer.prototype.onTestEnd_ = function () {
     this.removeMouseShim_();
+    // Restore the original drawing loop.
+    pskl.app.drawingLoop.loop = this.loopBackup;
 
+    // Retrieve the imageData corresponding to the spritesheet created by the test.
     var renderer = new pskl.rendering.PiskelRenderer(pskl.app.piskelController);
-    var png = renderer.renderAsCanvas().toDataURL();
+    var canvas = renderer.renderAsCanvas();
+    var testData = canvas.getContext('2d').getImageData(0, 0, canvas.width, canvas.height);
 
-    var success = png === this.referencePng;
+    // Retrieve the reference imageData corresponding to the reference data-url png stored for this test.
+    var refCanvas = this.referenceCanvas;
+    this.referenceData = refCanvas.getContext('2d').getImageData(0, 0, refCanvas.width, refCanvas.height);
 
-    $.publish(Events.TEST_RECORD_END, [success, png, this.referencePng]);
+    // Compare the two imageData arrays.
+    var success = true;
+    for (var i = 0 ; i < this.referenceData.data.length ; i++) {
+      if (this.referenceData.data[i] != testData.data[i]) {
+        success = false;
+      }
+    }
+
+    $.publish(Events.TEST_RECORD_END, [success]);
     this.callbacks.forEach(function (callback) {
-      callback(success, png, this.referencePng);
-    });
+      callback({
+        success: success,
+        performance: this.performance
+      });
+    }.bind(this));
   };
 
   ns.DrawingTestPlayer.prototype.addEndTestCallback = function (callback) {

src/js/devtools/DrawingTestRecorder.js

@@ -64,7 +64,7 @@
       events : this.events,
       initialState : this.initialState,
       png : png
-    });
+    }, null, ' ');
 
     this.reset();
 

src/js/devtools/DrawingTestRunner.js

@@ -14,11 +14,11 @@
     }.bind(this));
   };
 
-  ns.DrawingTestRunner.prototype.onTestRecordEnd_ = function (evt, success, png) {
+  ns.DrawingTestRunner.prototype.onTestRecordEnd_ = function (evt, success) {
     var testResult = document.createElement('div');
     testResult.id = 'drawing-test-result';
     testResult.setAttribute('data-test-name', this.testName);
-    testResult.innerHTML = success ? 'OK' : ('KO:' + png);
+    testResult.innerHTML = success ? 'OK' : 'KO';
     document.body.appendChild(testResult);
   };
 })();

src/js/devtools/DrawingTestSuiteController.js

@@ -47,25 +47,33 @@
     this.testSuiteRunner.start();
   };
 
-  ns.DrawingTestSuiteController.prototype.onTestCaseEnd_ = function (evt, testPath, status) {
+  ns.DrawingTestSuiteController.prototype.onTestCaseEnd_ = function (evt, testPath, success, performance) {
     var testCaseStatus = document.createElement('li');
 
     testCaseStatus.innerHTML = pskl.utils.Template.replace(
-      '[{{path}}] finished : <b style="color:{{color}}">{{status}}</b>',
-      {path : this.shortenPath_(testPath), status : status ? 'OK' : 'KO', color : status ? 'green' : 'red'}
+      '[{{path}}] finished : <b style="color:{{color}}">{{status}} ({{performance}})</b>',
+      {
+        path : this.shortenPath_(testPath),
+        status : success ? 'OK' : 'KO',
+        color : success ? 'green' : 'red',
+        performance: performance.toFixed(2)
+      }
     );
     this.testListElt.appendChild(testCaseStatus);
   };
 
-  ns.DrawingTestSuiteController.prototype.onTestSuiteEnd_ = function (evt, status) {
-    console.log('on test suite end');
+  ns.DrawingTestSuiteController.prototype.onTestSuiteEnd_ = function (evt, status, performance) {
     var elapsed = Date.now() - this.startTime_;
     elapsed = (elapsed / 1000).toFixed(4);
 
     var testSuiteStatus = document.createElement('li');
     testSuiteStatus.innerHTML = pskl.utils.Template.replace(
-      '<b>Test finished : {{status}}</b> ({{elapsed}} seconds)',
-      {status : status, elapsed : elapsed}
+      '<b>Test finished : {{status}}</b> ({{elapsed}}s, performance: {{performance}})',
+      {
+        status : status,
+        elapsed : elapsed,
+        performance: performance.toFixed(2)
+      }
     );
     this.testListElt.appendChild(testSuiteStatus);
   };

src/js/devtools/DrawingTestSuiteRunner.js

@@ -44,20 +44,25 @@
     testPlayer.start();
   };
 
-  ns.DrawingTestSuiteRunner.prototype.onTestEnd_ = function (success, png, referencePng) {
+  ns.DrawingTestSuiteRunner.prototype.onTestEnd_ = function (data /* {success, performance} */) {
     var path = this.testPaths[this.currentIndex];
-    this.testStatus[path] = success;
-    $.publish(Events.TEST_CASE_END, [path, success]);
+    this.testStatus[path] = data;
+
+    $.publish(Events.TEST_CASE_END, [path, data.success, data.performance]);
 
     this.runTest(this.currentIndex + 1);
   };
 
   ns.DrawingTestSuiteRunner.prototype.onTestSuiteEnd_ = function () {
     var success = this.testPaths.every(function (path) {
-      return this.testStatus[path];
+      return this.testStatus[path].success;
     }.bind(this));
 
+    var performance = this.testPaths.reduce(function (p, path) {
+      return this.testStatus[path].performance + p;
+    }.bind(this), 0);
+
     this.status = success ? ns.DrawingTestSuiteRunner.STATUS.SUCCESS : ns.DrawingTestSuiteRunner.STATUS.ERROR;
-    $.publish(Events.TEST_SUITE_END, [this.status]);
+    $.publish(Events.TEST_SUITE_END, [this.status, performance]);
   };
 })();

src/js/lib/scrollifneeded/scrollifneeded.js

@@ -0,0 +1,27 @@
+if (!Element.prototype.scrollIntoViewIfNeeded) {
+  Element.prototype.scrollIntoViewIfNeeded = function (centerIfNeeded) {
+    centerIfNeeded = arguments.length === 0 ? true : !!centerIfNeeded;
+
+    var parent = this.parentNode,
+        parentComputedStyle = window.getComputedStyle(parent, null),
+        parentBorderTopWidth = parseInt(parentComputedStyle.getPropertyValue('border-top-width')),
+        parentBorderLeftWidth = parseInt(parentComputedStyle.getPropertyValue('border-left-width')),
+        overTop = this.offsetTop - parent.offsetTop < parent.scrollTop,
+        overBottom = (this.offsetTop - parent.offsetTop + this.clientHeight - parentBorderTopWidth) > (parent.scrollTop + parent.clientHeight),
+        overLeft = this.offsetLeft - parent.offsetLeft < parent.scrollLeft,
+        overRight = (this.offsetLeft - parent.offsetLeft + this.clientWidth - parentBorderLeftWidth) > (parent.scrollLeft + parent.clientWidth),
+        alignWithTop = overTop && !overBottom;
+
+    if ((overTop || overBottom) && centerIfNeeded) {
+      parent.scrollTop = this.offsetTop - parent.offsetTop - parent.clientHeight / 2 - parentBorderTopWidth + this.clientHeight / 2;
+    }
+
+    if ((overLeft || overRight) && centerIfNeeded) {
+      parent.scrollLeft = this.offsetLeft - parent.offsetLeft - parent.clientWidth / 2 - parentBorderLeftWidth + this.clientWidth / 2;
+    }
+
+    if ((overTop || overBottom || overLeft || overRight) && !centerIfNeeded) {
+      this.scrollIntoView(alignWithTop);
+    }
+  };
+}

src/js/lib/smoothscroll/LICENSE.txt

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Dustan Kasten
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/js/lib/smoothscroll/smoothscroll.js

@@ -0,0 +1,277 @@
+/*
+ * smoothscroll polyfill - v0.3.3
+ * https://iamdustan.github.io/smoothscroll
+ * 2016 (c) Dustan Kasten, Jeremias Menichelli - MIT License
+ */
+
+(function(w, d, undefined) {
+  'use strict';
+
+  /*
+   * aliases
+   * w: window global object
+   * d: document
+   * undefined: undefined
+   */
+
+  // polyfill
+  function polyfill() {
+    // return when scrollBehavior interface is supported
+    if ('scrollBehavior' in d.documentElement.style) {
+      return;
+    }
+
+    /*
+     * globals
+     */
+    var Element = w.HTMLElement || w.Element;
+    var SCROLL_TIME = 468;
+
+    /*
+     * object gathering original scroll methods
+     */
+    var original = {
+      scroll: w.scroll || w.scrollTo,
+      scrollBy: w.scrollBy,
+      scrollIntoView: Element.prototype.scrollIntoView
+    };
+
+    /*
+     * define timing method
+     */
+    var now = w.performance && w.performance.now
+      ? w.performance.now.bind(w.performance) : Date.now;
+
+    /**
+     * changes scroll position inside an element
+     * @method scrollElement
+     * @param {Number} x
+     * @param {Number} y
+     */
+    function scrollElement(x, y) {
+      this.scrollLeft = x;
+      this.scrollTop = y;
+    }
+
+    /**
+     * returns result of applying ease math function to a number
+     * @method ease
+     * @param {Number} k
+     * @returns {Number}
+     */
+    function ease(k) {
+      return 0.5 * (1 - Math.cos(Math.PI * k));
+    }
+
+    /**
+     * indicates if a smooth behavior should be applied
+     * @method shouldBailOut
+     * @param {Number|Object} x
+     * @returns {Boolean}
+     */
+    function shouldBailOut(x) {
+      if (typeof x !== 'object'
+            || x.behavior === undefined
+            || x.behavior === 'auto'
+            || x.behavior === 'instant') {
+        // first arg not an object, or behavior is auto, instant or undefined
+        return true;
+      }
+
+      if (typeof x === 'object'
+            && x.behavior === 'smooth') {
+        // first argument is an object and behavior is smooth
+        return false;
+      }
+
+      // throw error when behavior is not supported
+      throw new TypeError('behavior not valid');
+    }
+
+    /**
+     * finds scrollable parent of an element
+     * @method findScrollableParent
+     * @param {Node} el
+     * @returns {Node} el
+     */
+    function findScrollableParent(el) {
+      do {
+        el = el.parentNode;
+      } while (el !== d.body
+              && !(el.clientHeight < el.scrollHeight
+              || el.clientWidth < el.scrollWidth));
+
+      return el;
+    }
+
+    /**
+     * self invoked function that, given a context, steps through scrolling
+     * @method step
+     * @param {Object} context
+     */
+    function step(context) {
+      // call method again on next available frame
+      context.frame = w.requestAnimationFrame(step.bind(w, context));
+
+      var time = now();
+      var value;
+      var currentX;
+      var currentY;
+      var elapsed = (time - context.startTime) / SCROLL_TIME;
+
+      // avoid elapsed times higher than one
+      elapsed = elapsed > 1 ? 1 : elapsed;
+
+      // apply easing to elapsed time
+      value = ease(elapsed);
+
+      currentX = context.startX + (context.x - context.startX) * value;
+      currentY = context.startY + (context.y - context.startY) * value;
+
+      context.method.call(context.scrollable, currentX, currentY);
+
+      // return when end points have been reached
+      if (currentX === context.x && currentY === context.y) {
+        w.cancelAnimationFrame(context.frame);
+        return;
+      }
+    }
+
+    /**
+     * scrolls window with a smooth behavior
+     * @method smoothScroll
+     * @param {Object|Node} el
+     * @param {Number} x
+     * @param {Number} y
+     */
+    function smoothScroll(el, x, y) {
+      var scrollable;
+      var startX;
+      var startY;
+      var method;
+      var startTime = now();
+      var frame;
+
+      // define scroll context
+      if (el === d.body) {
+        scrollable = w;
+        startX = w.scrollX || w.pageXOffset;
+        startY = w.scrollY || w.pageYOffset;
+        method = original.scroll;
+      } else {
+        scrollable = el;
+        startX = el.scrollLeft;
+        startY = el.scrollTop;
+        method = scrollElement;
+      }
+
+      // cancel frame when a scroll event's happening
+      if (frame) {
+        w.cancelAnimationFrame(frame);
+      }
+
+      // scroll looping over a frame
+      step({
+        scrollable: scrollable,
+        method: method,
+        startTime: startTime,
+        startX: startX,
+        startY: startY,
+        x: x,
+        y: y,
+        frame: frame
+      });
+    }
+
+    /*
+     * ORIGINAL METHODS OVERRIDES
+     */
+
+    // w.scroll and w.scrollTo
+    w.scroll = w.scrollTo = function() {
+      // avoid smooth behavior if not required
+      if (shouldBailOut(arguments[0])) {
+        original.scroll.call(
+          w,
+          arguments[0].left || arguments[0],
+          arguments[0].top || arguments[1]
+        );
+        return;
+      }
+
+      // LET THE SMOOTHNESS BEGIN!
+      smoothScroll.call(
+        w,
+        d.body,
+        ~~arguments[0].left,
+        ~~arguments[0].top
+      );
+    };
+
+    // w.scrollBy
+    w.scrollBy = function() {
+      // avoid smooth behavior if not required
+      if (shouldBailOut(arguments[0])) {
+        original.scrollBy.call(
+          w,
+          arguments[0].left || arguments[0],
+          arguments[0].top || arguments[1]
+        );
+        return;
+      }
+
+      // LET THE SMOOTHNESS BEGIN!
+      smoothScroll.call(
+        w,
+        d.body,
+        ~~arguments[0].left + (w.scrollX || w.pageXOffset),
+        ~~arguments[0].top + (w.scrollY || w.pageYOffset)
+      );
+    };
+
+    // Element.prototype.scrollIntoView
+    Element.prototype.scrollIntoView = function() {
+      // avoid smooth behavior if not required
+      if (shouldBailOut(arguments[0])) {
+        original.scrollIntoView.call(this, arguments[0] || true);
+        return;
+      }
+
+      // LET THE SMOOTHNESS BEGIN!
+      var scrollableParent = findScrollableParent(this);
+      var parentRects = scrollableParent.getBoundingClientRect();
+      var clientRects = this.getBoundingClientRect();
+
+      if (scrollableParent !== d.body) {
+        // reveal element inside parent
+        smoothScroll.call(
+          this,
+          scrollableParent,
+          scrollableParent.scrollLeft + clientRects.left - parentRects.left,
+          scrollableParent.scrollTop + clientRects.top - parentRects.top
+        );
+        // reveal parent in viewport
+        w.scrollBy({
+          left: parentRects.left,
+          top: parentRects.top,
+          behavior: 'smooth'
+        });
+      } else {
+        // reveal element in viewport
+        w.scrollBy({
+          left: clientRects.left,
+          top: clientRects.top,
+          behavior: 'smooth'
+        });
+      }
+    };
+  }
+
+  if (typeof exports === 'object') {
+    // commonjs
+    module.exports = { polyfill: polyfill };
+  } else {
+    // global
+    polyfill();
+  }
+})(window, document);

src/js/lib/spectrum/spectrum.js

@@ -671,7 +671,8 @@
 
             // Update the text entry input as it changes happen
             if (opts.showInput) {
-                textInput.val(realColor.toString(format));
+                var displayFormat = pskl.UserSettings.get(pskl.UserSettings.COLOR_FORMAT);
+                textInput.val(realColor.toString(displayFormat));
             }
 
             if (opts.showPalette) {

src/js/model/Frame.js

@@ -14,28 +14,54 @@
     }
   };
 
-  ns.Frame.fromPixelGrid = function (pixels) {
-    if (pixels.length && pixels[0].length) {
-      var w = pixels.length;
-      var h = pixels[0].length;
+  ns.Frame.fromPixelGrid = function (pixels, width, height) {
+    if (pixels.length) {
+      var w;
+      var h;
+      var buffer;
+
+      if (pixels[0].length) {
+        w = pixels.length;
+        h = pixels[0].length;
+        buffer = [];
+        for (var y = 0; y < h; y++) {
+          for (var x = 0; x < w; x++) {
+            if (typeof pixels[x][y] == 'string') {
+              buffer[y * w + x] = pskl.utils.colorToInt(pixels[x][y]);
+            } else {
+              buffer[y * w + x] = pixels[x][y];
+            }
+          }
+        }
+      } else if (width && height) {
+        w = width;
+        h = height;
+        buffer = pixels;
+      } else {
+        throw 'Bad arguments in pskl.model.frame.fromPixelGrid, missing width and height';
+      }
+
       var frame = new pskl.model.Frame(w, h);
-      frame.setPixels(pixels);
+      frame.setPixels(buffer);
       return frame;
     } else {
-      throw 'Bad arguments in pskl.model.Frame.fromPixelGrid : ' + pixels;
+      throw 'Bad arguments in pskl.model.Frame.fromPixelGrid';
     }
   };
 
+  var _emptyPixelGridCache = {};
   ns.Frame.createEmptyPixelGrid_ = function (width, height) {
-    var pixels = [];
-    for (var columnIndex = 0 ; columnIndex < width ; columnIndex++) {
-      var columnArray = [];
-      for (var heightIndex = 0 ; heightIndex < height ; heightIndex++) {
-        columnArray.push(Constants.TRANSPARENT_COLOR);
-      }
-      pixels[columnIndex] = columnArray;
+    var pixels;
+    var key = width + '-' + height;
+    if (_emptyPixelGridCache[key]) {
+      pixels = _emptyPixelGridCache[key];
+    } else {
+      pixels = _emptyPixelGridCache[key] = new Uint32Array(width * height);
+      var transparentColorInt = pskl.utils.colorToInt(Constants.TRANSPARENT_COLOR);
+      pixels.fill(transparentColorInt);
     }
-    return pixels;
+
+    return new Uint32Array(pixels);
   };
 
   ns.Frame.createEmptyFromFrame = function (frame) {
@@ -44,7 +70,7 @@
 
   ns.Frame.prototype.clone = function () {
     var clone = new ns.Frame(this.width, this.height);
-    clone.setPixels(this.getPixels());
+    clone.setPixels(this.pixels);
     return clone;
   };
 
@@ -64,8 +90,8 @@
   };
 
   ns.Frame.prototype.clear = function () {
-    var pixels = ns.Frame.createEmptyPixelGrid_(this.getWidth(), this.getHeight());
-    this.setPixels(pixels);
+    this.pixels = ns.Frame.createEmptyPixelGrid_(this.getWidth(), this.getHeight());
+    this.version++;
   };
 
   /**
@@ -73,11 +99,7 @@
    * @private
    */
   ns.Frame.prototype.clonePixels_ = function (pixels) {
-    var clonedPixels = [];
-    for (var col = 0 ; col < pixels.length ; col++) {
-      clonedPixels[col] = pixels[col].slice(0 , pixels[col].length);
-    }
-    return clonedPixels;
+    return new Uint32Array(pixels);
   };
 
   ns.Frame.prototype.getHash = function () {
@@ -86,9 +108,12 @@
 
   ns.Frame.prototype.setPixel = function (x, y, color) {
     if (this.containsPixel(x, y)) {
-      var p = this.pixels[x][y];
+      var index = y * this.width + x;
+      var p = this.pixels[index];
+      color = pskl.utils.colorToInt(color);
+
       if (p !== color) {
-        this.pixels[x][y] = color || Constants.TRANSPARENT_COLOR;
+        this.pixels[index] = color || pskl.utils.colorToInt(Constants.TRANSPARENT_COLOR);
         this.version++;
       }
     }
@@ -96,7 +121,7 @@
 
   ns.Frame.prototype.getPixel = function (x, y) {
     if (this.containsPixel(x, y)) {
-      return this.pixels[x][y];
+      return this.pixels[y * this.width + x];
     } else {
       return null;
     }
@@ -105,10 +130,9 @@
   ns.Frame.prototype.forEachPixel = function (callback) {
     var width = this.getWidth();
     var height = this.getHeight();
-    for (var x = 0 ; x < width ; x++) {
-      for (var y = 0 ; y < height ; y++) {
-        callback(this.pixels[x][y], x, y, this);
-      }
+    var length = width * height;
+    for (var i = 0; i < length ; i++) {
+      callback(this.pixels[i], i % width, Math.floor(i / width), this);
     }
   };
 

src/js/model/Layer.js

@@ -37,10 +37,13 @@
   };
 
   ns.Layer.prototype.setOpacity = function (opacity) {
+    if (typeof opacity == 'string') {
+      opacity = parseFloat(opacity);
+    }
     if (opacity === null || isNaN(opacity) || opacity < 0 || opacity > 1) {
       return;
     }
-    this.opacity = opacity;
+    this.opacity = +opacity.toFixed(3);
   };
 
   ns.Layer.prototype.isTransparent = function () {

src/js/model/Piskel.js

@@ -8,21 +8,14 @@
    * @param {String} name
    * @param {String} description
    */
-  ns.Piskel = function (width, height, descriptor) {
+  ns.Piskel = function (width, height, fps, descriptor) {
     if (width && height && descriptor) {
-      /** @type {Array} */
       this.layers = [];
-
-      /** @type {Number} */
       this.width = width;
-
-      /** @type {Number} */
       this.height = height;
-
       this.descriptor = descriptor;
-
-      /** @type {String} */
       this.savePath = null;
+      this.fps = fps;
 
     } else {
       throw 'Missing arguments in Piskel constructor : ' + Array.prototype.join.call(arguments, ',');
@@ -35,11 +28,11 @@
    * @param  {Array<pskl.model.Layer>} layers
    * @return {pskl.model.Piskel}
    */
-  ns.Piskel.fromLayers = function (layers, descriptor) {
+  ns.Piskel.fromLayers = function (layers, fps, descriptor) {
     var piskel = null;
     if (layers.length > 0 && layers[0].size() > 0) {
       var sampleFrame = layers[0].getFrameAt(0);
-      piskel = new pskl.model.Piskel(sampleFrame.getWidth(), sampleFrame.getHeight(), descriptor);
+      piskel = new pskl.model.Piskel(sampleFrame.getWidth(), sampleFrame.getHeight(), fps, descriptor);
       layers.forEach(piskel.addLayer.bind(piskel));
     } else {
       throw 'Piskel.fromLayers expects array of non empty pskl.model.Layer as first argument';
@@ -59,6 +52,10 @@
     return this.width;
   };
 
+  ns.Piskel.prototype.getFPS = function () {
+    return this.fps;
+  };
+
   ns.Piskel.prototype.getLayers = function () {
     return this.layers;
   };
@@ -73,6 +70,10 @@
     });
   };
 
+  ns.Piskel.prototype.getFrameCount = function () {
+    return this.getLayerAt(0).size();
+  };
+
   ns.Piskel.prototype.addLayer = function (layer) {
     this.layers.push(layer);
   };

src/js/model/frame/AsyncCachedFrameProcessor.js

@@ -30,20 +30,9 @@
     var key1 = frame.getHash();
     if (cache[key1]) {
       processedFrame = cache[key1];
-    } else if (frame instanceof pskl.model.frame.RenderedFrame) {
-      // Cannot use 2nd level cache with rendered frames
-      var callbackFirstLvlCacheOnly = this.onProcessorComplete_.bind(this, deferred, cache, key1, key1);
-      this.frameProcessor(frame, callbackFirstLvlCacheOnly);
     } else {
-      var framePixels = JSON.stringify(frame.getPixels());
-      var key2 = pskl.utils.hashCode(framePixels);
-      if (cache[key2]) {
-        processedFrame = this.outputCloner(cache[key2], frame);
-        cache[key1] = processedFrame;
-      } else {
-        var callback = this.onProcessorComplete_.bind(this, deferred, cache, key1, key2);
-        this.frameProcessor(frame, callback);
-      }
+      var callback = this.onProcessorComplete_.bind(this, deferred, cache, key1);
+      this.frameProcessor(frame, callback);
     }
 
     if (processedFrame) {
@@ -53,9 +42,8 @@
     return deferred.promise;
   };
 
-  ns.AsyncCachedFrameProcessor.prototype.onProcessorComplete_ = function (deferred, cache, key1, key2, result) {
+  ns.AsyncCachedFrameProcessor.prototype.onProcessorComplete_ = function (deferred, cache, key1, result) {
     cache[key1] = result;
-    cache[key2] = result;
     deferred.resolve(result);
   };
 })();

src/js/model/frame/CachedFrameProcessor.js

@@ -1,8 +1,8 @@
 (function () {
   var ns = $.namespace('pskl.model.frame');
 
-  // 10 * 60 * 1000 = 10 minutes
-  var DEFAULT_CLEAR_INTERVAL = 10 * 60 * 1000;
+  // Maximum number of cache entries
+  var MAX_CACHE_ENTRIES = 100;
 
   var DEFAULT_FRAME_PROCESSOR = function (frame) {
     return pskl.utils.FrameUtils.toImage(frame);
@@ -12,14 +12,16 @@
 
   var DEFAULT_NAMESPACE = '__cache_default__';
 
-  ns.CachedFrameProcessor = function (cacheResetInterval) {
+  ns.CachedFrameProcessor = function () {
+    // Cache object.
     this.cache_ = {};
-    this.cacheResetInterval = cacheResetInterval || DEFAULT_CLEAR_INTERVAL;
+
+    // Array of [namespace, key] for each cached frame.
+    this.cacheQueue_ = [];
+
     this.frameProcessor = DEFAULT_FRAME_PROCESSOR;
     this.outputCloner = DEFAULT_OUTPUT_CLONER;
     this.defaultNamespace = DEFAULT_NAMESPACE;
-
-    window.setInterval(this.clear.bind(this), this.cacheResetInterval);
   };
 
   ns.CachedFrameProcessor.prototype.clear = function () {
@@ -66,21 +68,16 @@
     var cacheKey = frame.getHash();
     if (cache[cacheKey]) {
       processedFrame = cache[cacheKey];
-    } else if (frame instanceof pskl.model.frame.RenderedFrame) {
-      // Cannot use 2nd level cache with rendered frames
+    } else {
       processedFrame = this.frameProcessor(frame);
       cache[cacheKey] = processedFrame;
-    } else {
-      var framePixels = JSON.stringify(frame.getPixels());
-      var frameAsString = pskl.utils.hashCode(framePixels);
-      if (cache[frameAsString]) {
-        processedFrame = this.outputCloner(cache[frameAsString], frame);
-      } else {
-        processedFrame = this.frameProcessor(frame);
-        cache[frameAsString] = processedFrame;
+      this.cacheQueue_.unshift([namespace, cacheKey]);
+      if (this.cacheQueue_.length > MAX_CACHE_ENTRIES) {
+        var oldestItem = this.cacheQueue_.pop();
+        this.cache_[oldestItem[0]][oldestItem[1]] = null;
       }
-      cache[cacheKey] = processedFrame;
     }
+
     return processedFrame;
   };
 })();

src/js/rendering/DrawingLoop.js

@@ -15,6 +15,7 @@
       scope : scope,
       args : args
     };
+
     this.callbacks.push(callbackObj);
     return callbackObj;
   };

src/js/rendering/FramesheetRenderer.js

@@ -30,12 +30,11 @@
 
   ns.FramesheetRenderer.prototype.drawFrameInCanvas_ = function (frame, canvas, offsetWidth, offsetHeight) {
     var context = canvas.getContext('2d');
-    frame.forEachPixel(function (color, x, y) {
-      if (color != Constants.TRANSPARENT_COLOR) {
-        context.fillStyle = color;
-        context.fillRect(x + offsetWidth, y + offsetHeight, 1, 1);
-      }
-    });
+    var imageData = context.createImageData(frame.getWidth(), frame.getHeight());
+    var pixels = frame.getPixels();
+    var data = new Uint8ClampedArray(pixels.buffer);
+    imageData.data.set(data);
+    context.putImageData(imageData, offsetWidth, offsetHeight);
   };
 
   ns.FramesheetRenderer.prototype.createCanvas_ = function (columns, rows) {

src/js/rendering/frame/CachedFrameRenderer.js

@@ -35,6 +35,7 @@
       this.getZoom(),
       this.getGridWidth(),
       pskl.UserSettings.get('SEAMLESS_MODE'),
+      pskl.UserSettings.get('SEAMLESS_OPACITY'),
       offset.x, offset.y,
       size.width, size.height,
       frame.getHash()