Prepare release 0.5.2

Current colors webworker

.gitignore

@@ -5,6 +5,9 @@
 node_modules
 npm-debug.log
 
+# node webkit cache
+cache
+
 # sublime text stuff (the -project should actually be shared, but then we'd have to share the same disk location)
 *.sublime-project
 *.sublime-workspace
@@ -20,5 +23,8 @@ diff.txt
 dest
 build/closure/closure_compiled_binary.js
 
+# plato report directory
+report
+
 # marked as private
 *.private.*

Gruntfile.js

@@ -1,16 +1,3 @@
-/**
- * How to run grunt tasks:
- *   - At project root, run 'npm install' - It will install nodedependencies declared in package,json in <root>/.node_modules
- *   - install grunt CLI tools globally, run 'npm install -g grunt-cli'
- *   - run a grunt target defined in Gruntfiles.js, ex: 'grunt lint'
- *
- * Note: The 'ghost' grunt task have special deps on CasperJS and phantomjs.
- *       For now, It's configured to run only on TravisCI where these deps are
- *       correctly defined.
- *       If you run this task locally, it may require some env set up first.
- */
-
-
 module.exports = function(grunt) {
   var dateFormat = require('dateformat');
   var now = new Date();
@@ -36,7 +23,7 @@ module.exports = function(grunt) {
     },
     'travis' : {
       suite : './test/casperjs/TravisTestSuite.js',
-      delay : 5000
+      delay : 10000
     }
   };
 
@@ -77,27 +64,44 @@ module.exports = function(grunt) {
     };
   };
 
+  // load all grunt tasks
+  require('load-grunt-tasks')(grunt);
+
   grunt.initConfig({
     clean: {
-      before: ['dest'],
-      after: ['build/closure/closure_compiled_binary.js']
+      before: ['dest']
+    },
+    leadingIndent : {
+      options: {
+        indentation : "spaces"
+      },
+      css : ['src/css/**/*.css']
+    },
+    jscs : {
+      options : {
+        "preset": "google",
+        "maximumLineLength": 120,
+        "requireCamelCaseOrUpperCaseIdentifiers": "ignoreProperties",
+        "validateQuoteMarks": { "mark": "'", "escape": true },
+        "disallowMultipleVarDecl": "exceptUndefined",
+        "disallowSpacesInAnonymousFunctionExpression": null
+      },
+      js : [ 'src/js/**/*.js' , '!src/js/**/lib/**/*.js' ]
     },
     jshint: {
       options: {
-        indent:2,
         undef : true,
         latedef : true,
         browser : true,
         trailing : true,
         curly : true,
-        es3 : true,
-        globals : {'$':true, 'jQuery' : true, 'pskl':true, 'Events':true, 'Constants':true, 'console' : true, 'module':true, 'require':true}
+        globals : {'$':true, 'jQuery' : true, 'pskl':true, 'Events':true, 'Constants':true, 'console' : true, 'module':true, 'require':true, 'Q':true}
       },
       files: [
         'Gruntfile.js',
         'package.json',
         'src/js/**/*.js',
-        '!src/js/lib/**/*.js' // Exclude lib folder (note the leading !)
+        '!src/js/**/lib/**/*.js' // Exclude lib folder (note the leading !)
       ]
     },
     express: {
@@ -144,7 +148,7 @@ module.exports = function(grunt) {
       options : {
         mangle : true
       },
-      my_target : {
+      js : {
         files : {
           'dest/js/piskel-packaged-min.js' : ['dest/js/piskel-packaged' + version + '.js']
         }
@@ -161,7 +165,7 @@ module.exports = function(grunt) {
           ]
         },
         files: [
-          {expand: true, flatten: true, src: ['src/piskel-boot-0.1.0.js'], dest: 'dest/'}
+          {src: ['src/piskel-boot.js'], dest: 'dest/piskel-boot.js'}
         ]
       },
       editor: {
@@ -170,6 +174,9 @@ module.exports = function(grunt) {
             {
               match: /templates\//g,
               replacement: "../templates"+version+"/"
+            },{
+              match: /piskel-boot.js/g,
+              replacement: "../piskel-boot"+version+".js"
             },{
               match: /^(.|[\r\n])*<!--body-main-start-->/,
               replacement: "",
@@ -194,6 +201,7 @@ module.exports = function(grunt) {
       main: {
         files: [
           {src: ['dest/js/piskel-packaged-min.js'], dest: 'dest/js/piskel-packaged-min' + version + '.js'},
+          {src: ['dest/piskel-boot.js'], dest: 'dest/piskel-boot' + version + '.js'},
           {src: ['src/logo.png'], dest: 'dest/logo.png'},
           {src: ['src/js/lib/iframeLoader-0.1.0.js'], dest: 'dest/js/lib/iframeLoader-0.1.0.js'},
           {src: ['src/js/lib/gif/gif.ie.worker.js'], dest: 'dest/js/lib/gif/gif.ie.worker.js'},
@@ -203,58 +211,6 @@ module.exports = function(grunt) {
         ]
       }
     },
-    closureCompiler:  {
-      options: {
-        // [REQUIRED] Path to closure compiler
-        compilerFile: 'build/closure/closure_compiler_20130823.jar',
-
-        // [OPTIONAL] set to true if you want to check if files were modified
-        // before starting compilation (can save some time in large sourcebases)
-        //checkModified: true,
-
-        // [OPTIONAL] Set Closure Compiler Directives here
-        compilerOpts: {
-          /**
-           * Keys will be used as directives for the compiler
-           * values can be strings or arrays.
-           * If no value is required use null
-           */
-          //compilation_level: 'ADVANCED_OPTIMIZATIONS',
-          compilation_level: 'SIMPLE_OPTIMIZATIONS',
-          externs: ['build/closure/piskel-closure-externs.js'],
-          // Inject some constants in JS code, could we use that for appengine wiring ?
-          //define: ["'goog.DEBUG=false'"],
-          warning_level: 'verbose',
-          jscomp_off: ['checkTypes', 'fileoverviewTags'],
-          summary_detail_level: 1,
-          language_in: 'ECMASCRIPT3'
-          //output_wrapper: '"(function(){%output%}).call(this);"'
-        },
-        execOpts: { // [OPTIONAL] Set exec method options
-          maxBuffer: 999999 * 1024
-        }
-
-      },
-      compile: {
-
-        /**
-         *[OPTIONAL] Here you can add new or override previous option of the Closure Compiler Directives.
-         * IMPORTANT! The feature is enabled as a temporary solution to [#738](https://github.com/gruntjs/grunt/issues/738).
-         * As soon as issue will be fixed this feature will be removed.
-         */
-        TEMPcompilerOpts: {
-        },
-        src: [
-          'src/js/**/*.js',
-          'src/piskel-boot-0.1.0.js',
-          'src/piskel-script-list.js',
-          '!src/js/lib/**/*.js'
-        ],
-
-        // This generated JS binary is currently not used and even excluded from source control using .gitignore.
-        dest: 'build/closure/closure_compiled_binary.js'
-      }
-    },
     karma: {
       unit: {
         configFile: 'karma.conf.js'
@@ -262,6 +218,7 @@ module.exports = function(grunt) {
     },
     nodewebkit: {
       options: {
+        version : "0.11.5",
         build_dir: './dest/desktop/', // destination folder of releases.
         mac: true,
         win: true,
@@ -272,66 +229,33 @@ module.exports = function(grunt) {
     }
   });
 
-  grunt.config.set('leadingIndent.indentation', 'spaces');
-  grunt.config.set('leadingIndent.jsFiles', {
-    src: [
-      'src/js/**/*.js',
-      '!src/js/lib/**/*.js'
-    ]
-  });
-  grunt.config.set('leadingIndent.cssFiles', {
-    src: ['src/css/**/*.css']
-  });
-
-  grunt.loadNpmTasks('grunt-closure-tools');
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-express');
-  grunt.loadNpmTasks('grunt-replace');
-  grunt.loadNpmTasks('grunt-ghost');
-  grunt.loadNpmTasks('grunt-open');
-  grunt.loadNpmTasks('grunt-karma');
-  grunt.loadNpmTasks('grunt-leading-indent');
-  grunt.loadNpmTasks('grunt-node-webkit-builder');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-
   // Validate
-  grunt.registerTask('lint', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint']);
+  grunt.registerTask('lint', ['jscs:js', 'leadingIndent:css', 'jshint']);
 
   // karma/unit-tests task
   grunt.registerTask('unit-test', ['karma']);
 
   // Validate & Test
-  grunt.registerTask('test-travis', ['lint', 'compile', 'unit-test', 'express:test', 'ghost:travis']);
+  grunt.registerTask('test-travis', ['lint', 'unit-test', 'express:test', 'ghost:travis']);
   // Validate & Test (faster version) will NOT work on travis !!
-  grunt.registerTask('test-local', ['lint', 'compile', 'unit-test', 'express:test', 'ghost:local']);
+  grunt.registerTask('test-local', ['lint', 'unit-test', 'express:test', 'ghost:local']);
+  grunt.registerTask('test-local-nolint', ['unit-test', 'express:test', 'ghost:local']);
 
   grunt.registerTask('test', ['test-travis']);
   grunt.registerTask('precommit', ['test-local']);
 
-
-  // Compile JS code (eg verify JSDoc annotation and types, no actual minified code generated).
-  grunt.registerTask('compile', ['closureCompiler:compile', 'clean:after']);
-
-  grunt.registerTask('rep', ['replace:main', 'replace:editor']);
-
-  grunt.registerTask('merge',  ['concat:js', 'concat:css', 'uglify', 'rep', 'copy']);
+  grunt.registerTask('build',  ['concat:js', 'concat:css', 'uglify', 'replace:main', 'replace:editor', 'copy']);
 
   // Validate & Build
-  grunt.registerTask('default', ['clean:before', 'lint', 'compile', 'merge']);
+  grunt.registerTask('default', ['clean:before', 'lint', 'build']);
 
   // Build stand alone app with nodewebkit
   grunt.registerTask('desktop', ['default', 'nodewebkit']);
 
-  grunt.registerTask('server', ['merge', 'express:regular', 'open:regular', 'express-keepalive']);
-
   // Start webserver and watch for changes
-  grunt.registerTask('server:watch', ['server', 'watch']);
+  grunt.registerTask('serve', ['build', 'express:regular', 'open:regular', 'express-keepalive', 'watch']);
 
   // Start webserver on src folder, in debug mode
-  grunt.registerTask('server:debug', ['express:debug', 'open:debug', 'express-keepalive']);
+  grunt.registerTask('serve-debug', ['express:debug', 'open:debug', 'express-keepalive']);
+  grunt.registerTask('play', ['serve-debug']);
 };

LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.

README.md

@@ -32,13 +32,13 @@ Integrated in **[piskelapp.com](http://piskelapp.com)**, you can share everythin
 Piskel supports the following browsers :
 * **Chrome** (latest)
 * **Firefox** (latest)
-* **Internet Explorer** 10+
+* **Internet Explorer** 11+
 
 ... and a fairly recent computer.
 
 We don't plan/want/could be forced into supporting older IEs. For Opera and Safari, we've never tested them but the gap shouldn't be huge.
 
-## Offline version (Windows and MacOS)
+## Offline version
 
 Offline builds are available. More details in the [dedicated wiki page](https://github.com/juliandescottes/piskel/wiki/Desktop-applications).
 
@@ -49,6 +49,7 @@ The Piskel editor is purely built in **JavaScript, HTML and CSS**. It uses Canva
 We also use the following **libraries** :
 * [spectrum](https://github.com/bgrins/spectrum) : awesome standalone colorpicker
 * [gifjs](http://jnordberg.github.io/gif.js/) : generate animated GIFs in javascript, using webworkers
+* [supergif](https://github.com/buzzfeed/libgif-js) : modified version of SuperGif to parse and import GIFs
 * [jszip](https://github.com/Stuk/jszip) : create, read and edit .zip files with Javascript
 * [canvas-toBlob](https://github.com/eligrey/canvas-toBlob.js/) : shim for canvas toBlob
 * [jquery](http://jquery.com/) : used sporadically in the application
@@ -66,9 +67,20 @@ Help is always welcome !
 * **Issues** : Found a problem when using the application, want to request a feature, [open an issue](https://github.com/juliandescottes/piskel/issues).
 * **Participate** : Have a look at the [wiki](https://github.com/juliandescottes/piskel/wiki) to set up the development environment
 
-## Licensing
+## License
 
-Probably need to pick one at some point ... Until then it's a "do whatever you want with it" license.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ## Mobile/Tablets
 

build/closure/piskel-closure-externs.js

@@ -1,18 +0,0 @@
-/**
- * @fileoverview Externs for Piskel
- *
- * @externs
- */
-
-// Piskel externs.
-var exports;
-var pskl_exports;
-var $;
-var console;
-var pskl;
-
-// Piskel libs externs.
-var define;
-var jQuery;
-var getComputedStyle;
-var URL;

misc/icons/SVG/flip.svg

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="770.71875"
+   height="581.4375"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="mirror.svg"
+   inkscape:export-filename="C:\Development\git\piskel\src\img\tools\flip.png"
+   inkscape:export-xdpi="35.446629"
+   inkscape:export-ydpi="35.446629">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="612.40785"
+     inkscape:cy="222.08964"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1148"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-63.5625,-233.7818)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 359.2768,233.7907 -295.7143,581.4286 295.7143,0 z"
+       id="rect2987"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\flip.png"
+       inkscape:export-xdpi="35.446629"
+       inkscape:export-ydpi="35.446629" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 538.5625,233.7818 295.71875,581.4375 -295.71875,0 0,-581.4375 z m 29.125,117.4375 0,434.28125 218.59375,0 L 567.6875,351.2193 z"
+       id="rect2987-1"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\flip.png"
+       inkscape:export-xdpi="35.446629"
+       inkscape:export-ydpi="35.446629" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 435.5625,233.93805 0,41.28125 25.71875,0 0,-41.28125 -25.71875,0 z m 0,91.28125 0,40 25.71875,0 0,-40 -25.71875,0 z m 0,90 0,40 25.71875,0 0,-40 -25.71875,0 z m 0,90 0,40 25.71875,0 0,-40 -25.71875,0 z m 0,90 0,40 25.71875,0 0,-40 -25.71875,0 z m 0,90 0,40 25.71875,0 0,-40 -25.71875,0 z m 0,90 0,40 25.71875,0 0,-40 -25.71875,0 z"
+       id="rect3796"
+       inkscape:export-filename="C:\Development\git\piskel\src\img\tools\flip.png"
+       inkscape:export-xdpi="35.446629"
+       inkscape:export-ydpi="35.446629"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

misc/icons/noun-project/sheep/icon_8389.svg

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="99.997px" height="69.373px" viewBox="0 0 99.997 69.373" enable-background="new 0 0 99.997 69.373" xml:space="preserve">
+<path fill="#010101" d="M81.635,0.222c0.553-0.327,1.242-0.219,1.85-0.133c1.502,0.296,2.658,1.426,3.533,2.62
+	c0.608-0.379,1.252-0.777,1.983-0.842c0.595-0.015,1.09,0.416,1.394,0.889c0.568,0.909,0.76,2.02,1.442,2.864
+	C92,5.829,92.246,5.941,92.482,6.044c0.968,0.409,1.846,0.996,2.688,1.615c0.361,0.223,0.396,0.691,0.529,1.056
+	c0.478,1.579,0.306,3.241,0.149,4.853c-0.035,0.812-0.104,1.659,0.172,2.438c0.42,0.954,1.229,1.655,1.746,2.547
+	c1.191,2.13,2.146,4.467,2.229,6.937v0.088c-0.071,1.268-0.203,2.647-1.062,3.653c-0.707,0.846-1.85,1.101-2.896,1.223
+	c-0.747,0.104-1.508,0.127-2.258,0.077c-1.912-0.275-3.812-0.628-5.724-0.911c-0.34-0.052-0.719-0.055-1,0.167
+	c-0.391,0.281-0.494,0.786-0.537,1.235c-0.068,1.177,0.133,2.405-0.312,3.532c-0.227,0.604-0.768,0.999-1.266,1.371
+	c-1.092,0.753-2.313,1.291-3.441,1.981c-0.164,0.115-0.125,0.348-0.125,0.521c0.075,0.916,0.332,1.821,0.253,2.747
+	c-0.021,0.597-0.271,1.188-0.72,1.587c-0.768,0.709-1.434,1.519-2.068,2.346c-0.104,0.142-0.222,0.283-0.256,0.461
+	c-0.264,1.272-0.385,2.576-0.74,3.83c-0.201,0.641-0.416,1.34-0.943,1.793c-0.633,0.492-1.456-0.342-2.098,0.164
+	c-1.191,0.882-1.558,2.412-2.379,3.582c-0.469,0.595-1.104,1.039-1.805,1.319c-0.331,4.37-0.625,8.741-0.896,13.115h-5.166
+	c0.16-2.783,0.32-5.567,0.486-8.351c0.203-1.728-0.097-3.444-0.312-5.152c-0.017-0.364-0.43-0.709-0.785-0.543
+	c-1.037,0.3-2.131,0.459-3.204,0.289c-0.87-0.227-1.536-0.877-2.11-1.533c-1.765,1.695-4.326,2.275-6.712,2.025
+	c-0.471-0.726-0.792-1.629-1.603-2.049c-0.539-0.324-1.198-0.155-1.729,0.098c-1.214,0.558-1.945,1.805-3.197,2.305
+	c-1.1,0.51-2.359,0.188-3.41-0.291c-1.127-0.54-2.176-1.242-3.186-1.975c-0.52,0.236-0.837,0.728-1.123,1.195
+	c-0.968,0.117-1.964,0.449-2.923,0.103c-1.548-0.399-2.625-1.652-3.94-2.472c-0.886,0.66-1.608,1.58-2.68,1.957
+	c-0.698,0.24-1.468,0.399-2.196,0.207c-0.825-0.181-1.609-0.5-2.425-0.705c-0.27-0.078-0.558-0.037-0.807,0.082
+	c-1.433,0.646-2.197,2.23-3.688,2.779c-0.307,0.148-0.632,0.043-0.936-0.047c-0.346,3.812-0.79,7.618-1.159,11.43
+	c-1.811,0.006-3.623-0.002-5.434,0.004c-0.078-0.656-0.297-1.312-0.188-1.978c0.27-2.282,0.637-4.551,0.9-6.833
+	c0.181-1.895-0.835-3.648-2.096-4.977c0.154-0.737-0.056-1.502-0.528-2.078c-1.24-1.65-3.362-2.342-4.546-4.043
+	c-0.357-0.53-0.698-1.256-0.328-1.864c0.285-0.724,0.94-1.381,0.769-2.21c-0.04-0.262-0.165-0.502-0.347-0.691
+	c-1.07-1.188-1.971-2.514-2.849-3.844c-0.403-0.59-0.372-1.338-0.438-2.02c-0.141-1.194,0.732-2.201,0.798-3.364
+	c-0.196-0.665-0.84-1.073-1.192-1.654C0.638,31.785,0.077,30.231,0,28.62v-0.446c0.086-0.751,0.078-1.537,0.396-2.239
+	c0.522-1.006,1.566-1.623,2.075-2.636c-0.222-0.968-0.747-1.833-0.966-2.799c-0.097-1.466,0.425-2.955,1.404-4.049
+	c0.664-0.035,1.319-0.157,1.968-0.296c0.633-0.125,1.1-0.631,1.448-1.145c0.703-1.045,0.832-2.351,1.479-3.422
+	c0.255-0.444,0.607-0.855,1.08-1.074c0.692-0.327,1.395-0.631,2.119-0.88c0.38-0.117,0.779-0.237,1.18-0.167
+	c0.894,0.134,1.771,0.361,2.665,0.5c0.624,0.088,1.321-0.085,1.74-0.58c0.379-0.424,0.483-1.003,0.574-1.544
+	c0.926-0.306,1.929-0.646,2.907-0.389c1.367,0.311,2.72,0.672,4.091,0.96c0.748-0.367,1.104-1.208,1.849-1.582
+	c0.884-0.481,1.947-0.333,2.873-0.064c1.13,0.322,1.991,1.168,3.041,1.655c0.735-0.438,1.304-1.316,2.246-1.275
+	c1.698,0.444,3.091,1.803,4.899,1.868c1.229,0.001,1.779-1.354,2.912-1.594c0.744-0.228,1.496,0.125,2.104,0.54
+	c0.745,0.517,1.432,1.11,2.132,1.684c1.052-0.622,2.251-1.085,3.492-1.026c1.448,0.261,2.847,0.754,4.294,1.011
+	c0.615-0.026,0.967-0.649,1.489-0.902c1.062-0.497,2.237-0.755,3.409-0.756c1.316,0.169,2.543,0.712,3.82,1.042
+	c0.623-0.171,1.135-0.659,1.803-0.686c1.026-0.025,2.055-0.006,3.08-0.008c0.401-0.321,0.769-0.709,1.26-0.9
+	c0.869-0.37,1.744-0.836,2.703-0.898c0.994,0.08,1.975,0.287,2.964,0.402c0.235-1.401,0.842-2.703,1.481-3.958
+	c1.241-0.227,2.463-0.58,3.66-0.973C80.409,1.51,80.956,0.784,81.635,0.222z"/>
+</svg>

misc/icons/noun-project/sheep/license.txt

@@ -0,0 +1,8 @@
+Thank you for using The Noun Project. This icon is licensed under Creative
+Commons Attribution and must be attributed as:
+
+    Sheep by Unrecognized MJ from The Noun Project
+
+If you have a Premium Account or have purchased a license for this icon, you
+don't need to worry about attribution! We will share the profits from your
+purchase with this icon's designer.

misc/icons/noun-project/undo-kyle_levi_fox/icon_10033.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="89.231px" height="100px" viewBox="0 0 89.231 100" enable-background="new 0 0 89.231 100" xml:space="preserve">
+<path d="M14.652,64.026c-0.603-2.09-1-4.267-1.15-6.511H0c0.18,3.858,0.86,7.586,1.962,11.13L14.652,64.026z"/>
+<path d="M14.332,88.192l8.684-10.35c-2.899-2.792-5.273-6.127-6.926-9.857L3.402,72.604C5.9,78.563,9.655,83.87,14.332,88.192z"/>
+<path d="M42.483,86.499c-6.051-0.409-11.626-2.559-16.245-5.943l-8.681,10.346c6.985,5.336,15.582,8.661,24.926,9.099V86.499z"/>
+<path d="M44.589,10.768V0L14.266,17.506l30.323,17.506V24.245c17.186,0,31.166,13.98,31.166,31.165  c0,16.477-12.854,29.999-29.061,31.087v13.502C70.337,98.896,89.231,79.32,89.231,55.41C89.231,30.794,69.205,10.768,44.589,10.768z  "/>
+</svg>

misc/icons/noun-project/undo-kyle_levi_fox/license.txt

@@ -0,0 +1,8 @@
+Thank you for using The Noun Project. This icon is licensed under Creative
+Commons Attribution and must be attributed as:
+
+    Undo by Kyle Levi Fox from The Noun Project
+
+If you have a Premium Account or have purchased a license for this icon, you
+don't need to worry about attribution! We will share the profits from your
+purchase with this icon's designer.

misc/scripts/build-mac-application.txt

@@ -0,0 +1,12 @@
+01 - Run grunt desktop on mac os x
+02 - Retrieve piskel.new.dmg.zip on Dropbox. Unzip it.
+03 - Retrieve nw.icns on Dropbox
+04 - Go to piskel/dest/desktop/releases/mac ; copy piskel.app to your working directory
+05 - Expand piskel.app
+06 - Replace nw.icns by the one from dropbox in Contents/Resources
+07 - Open piskel.new.dmg
+08 - Drag and drop piskel.app in it
+09 - Update readme.txt
+10 - Open disk utility, and open piskel.new.dmg in it
+11 - Convert image, piskel-x.y.z.dmg
+12 - Upload to Dropbox

misc/scripts/change-windows-icon.cmd

@@ -1,16 +0,0 @@
-setlocal
-@echo off
-
-pushd ..\..
-set PISKEL_HOME=%cd%
-popd
-
-echo "Updating Piskel icon"
-
-ResHacker -addoverwrite "%PISKEL_HOME%\dest\desktop\releases\windows\piskel.exe", "%PISKEL_HOME%\dest\desktop\releases\windows\piskel-release.exe", "%PISKEL_HOME%\src\logo.ico", ICONGROUP, IDR_MAINFRAME, 1033
-
-pause
-
-explorer "%PISKEL_HOME%\dest\desktop\releases\windows"
-
-endlocal

misc/scripts/package-windows-executable.cmd

@@ -6,14 +6,11 @@ SETLOCAL
   set PISKEL_HOME=%cd%
   POPD
 
-  set VBOX_PATH="C:\Program Files (x86)\Enigma Virtual Box"
   set RESOURCE_HACKER_PATH="C:\Program Files (x86)\Resource Hacker"
 
-  set APP_BIN="%PISKEL_HOME%\dest\desktop\cache\win\0.9.2"
   set MISC_FOLDER=%PISKEL_HOME%\misc
-  set RELEASES_FOLDER=%PISKEL_HOME%\dest\desktop\releases
-  set DEST_FOLDER=%RELEASES_FOLDER%\piskel\win\piskel
-
+  set RELEASES_FOLDER=%PISKEL_HOME%\dest\desktop
+  set DEST_FOLDER=%RELEASES_FOLDER%\piskel\win32
 
   ECHO "Updating Piskel icon -- Using Resource Hacker"
     %RESOURCE_HACKER_PATH%\ResHacker -addoverwrite "%DEST_FOLDER%\piskel.exe", "%DEST_FOLDER%\piskel-logo.exe", "%MISC_FOLDER%\desktop\logo.ico", ICONGROUP, IDR_MAINFRAME, 1033

package.json

@@ -3,7 +3,7 @@
   "name": "piskel",
   "main": "./dest/index.html",
   "description": "Web based 2d animations editor",
-  "version": "0.2.0",
+  "version": "0.5.2",
   "homepage": "http://github.com/juliandescottes/piskel",
   "repository": {
     "type": "git",
@@ -14,27 +14,27 @@
     "start": "nodewebkit"
   },
   "devDependencies": {
-    "dateformat": "1.0.8-1.2.3",
+    "dateformat": "^1.0.11",
     "grunt": "~0.4.5",
-    "grunt-closure-tools": "~0.9.7",
-    "grunt-contrib-clean": "0.5.0",
-    "grunt-contrib-concat": "0.5.0",
-    "grunt-contrib-copy": "0.5.0",
-    "grunt-contrib-jshint": "0.10.0",
-    "grunt-contrib-uglify": "0.5.0",
+    "grunt-contrib-clean": "^0.6.0",
+    "grunt-contrib-concat": "^0.5.1",
+    "grunt-contrib-copy": "^0.8.0",
+    "grunt-contrib-jshint": "^0.11.1",
+    "grunt-contrib-uglify": "^0.9.1",
     "grunt-contrib-watch": "0.6.1",
     "grunt-express": "1.4.1",
     "grunt-ghost": "1.1.0",
-    "grunt-leading-indent": "0.1.0",
-    "grunt-node-webkit-builder": "0.1.21",
+    "grunt-jscs": "^1.6.0",
+    "grunt-karma": "^0.10.1",
+    "grunt-leading-indent": "^0.2.0",
+    "grunt-node-webkit-builder": "^1.0.2",
     "grunt-open": "0.2.3",
-    "grunt-replace": "0.7.8",
-    "grunt-karma": "~0.8.2",
-    "karma": "0.12.17",
+    "grunt-replace": "^0.8.0",
+    "karma": "0.12.31",
     "karma-chrome-launcher": "^0.1.4",
+    "karma-jasmine": "^0.3.5",
     "karma-phantomjs-launcher": "^0.1.4",
-    "karma-jasmine": "^0.1.5",
-    "nodewebkit": "~0.10.1"
+    "load-grunt-tasks": "^3.1.0"
   },
   "window": {
     "title": "Piskel",

src/css/bootstrap/bootstrap.css

@@ -36,7 +36,7 @@
 }
 .tooltip {
   position: absolute;
-  z-index: 1030;
+  z-index: 30000;
   display: block;
   visibility: visible;
   padding: 5px;

src/css/cheatsheet.css

@@ -27,12 +27,10 @@
   position: absolute;
   z-index: 10000;
 
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-
-  padding: 50px;
+  top: 50px;
+  right: 50px;
+  bottom: 50px;
+  left: 50px;
 
   box-sizing: border-box;
   -moz-box-sizing : border-box;

src/css/color-picker-slider.css

@@ -0,0 +1,105 @@
+.color-picker-slider * {
+  box-sizing: border-box;
+}
+
+.color-picker-slider input[type="range"] {
+  -webkit-appearance: none;
+  -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
+  width: 100%;
+  border: none;
+  padding: 1px 2px;
+  border-radius: 3px;
+  background-image: linear-gradient(to right, hsl(0, 30%, 70%) 0, hsl(359, 30%, 70%) 100%);
+  box-shadow: inset 0 1px 0 0 #0d0e0f, inset 0 -1px 0 0 #3a3d42;
+  outline: none; /* no focus outline */
+}
+
+/* thumb */
+
+.color-picker-slider input[type="range"]::-webkit-slider-thumb {
+  -webkit-appearance: none;
+  cursor:pointer;
+  width: 7px;
+  height: 18px;
+  border: none;
+  border-radius: 2px;
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #529de1), color-stop(100%, #245e8f)); /* android <= 2.2 */
+  background-image: -webkit-linear-gradient(top , #529de1 0, #245e8f 100%); /* older mobile safari and android > 2.2 */;
+  background-image: linear-gradient(to bottom, #529de1 0, #245e8f 100%); /* W3C */
+}
+.color-picker-slider input[type="range"]::-moz-range-thumb {
+  width: 7px;
+  height: 18px;
+  border: none;
+  border-radius: 2px;
+  background-image: linear-gradient(to bottom, #529de1 0, #245e8f 100%); /* W3C */
+}
+
+.color-picker-slider input[type="range"]::-ms-thumb {
+  width: 7px;
+  height: 18px;
+  border-radius: 2px;
+  border: 0;
+  background-image: linear-gradient(to bottom, #529de1 0, #245e8f 100%); /* W3C */
+}
+
+/*CROSS BROWSER RESET*/
+
+
+.color-picker-slider input[type="range"]::-moz-range-track {
+  border: inherit;
+  background: transparent;
+}
+
+.color-picker-slider input[type="range"]::-ms-track {
+  border: inherit;
+  color: transparent; /* don't drawn vertical reference line */
+  background: transparent;
+}
+
+.color-picker-slider input[type="range"]::-ms-fill-lower,
+.color-picker-slider input[type="range"]::-ms-fill-upper {
+  background: transparent;
+}
+
+.color-picker-slider input[type="range"]::-ms-tooltip {
+  display: none;
+}
+
+.color-picker-slider,
+.color-picker-input {
+  padding: 0 10px;
+  height : 25px;
+  overflow: hidden;
+}
+
+.color-picker-slider span{
+  line-height : 25px;
+  width : 10px;
+  float:left;
+}
+
+.color-picker-slider input[type="range"]{
+  float:left;
+  height : 10px;
+  width : 100px;
+  margin: 7px 1px 7px 8px;
+}
+
+.color-picker-slider input[type="text"]{
+  float:left;
+  width : 47px;
+  margin-left: 5px;
+}
+
+.color-picker-input {
+  margin-bottom: 10px;
+}
+
+.color-picker-input .textfield{
+  width:100%;
+}
+
+.color-picker-slider input[type="range"][data-dimension="h"] {
+  background-image:linear-gradient(to right, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%);
+}

src/css/dialogs-create-palette.css

@@ -0,0 +1,169 @@
+#dialog-container.create-palette {
+  width: 500px;
+  height: 600px;
+  top : 50%;
+  left : 50%;
+  position : absolute;
+  margin-left: -250px;
+}
+
+.show #dialog-container.create-palette {
+  margin-top: -300px;
+}
+
+.create-palette-section {
+  position: absolute;
+  left: 10px;
+  top: 50px;
+}
+
+.create-palette-import-section {
+  display : inline-block;
+}
+
+.colors-container {
+  position: absolute;
+
+  left: 10px;
+  right: 10px;
+  top: 85px;
+
+  height: 460px;
+
+  border: 1px solid black;
+  background: #333;
+}
+
+.color-picker-container {
+  position:absolute;
+  left : 280px;
+  top:0;
+  bottom:0;
+  right:0;
+  background: #222;
+}
+
+.create-palette-actions {
+  position: absolute;
+  box-sizing: border-box;
+
+  width:100%;
+  height: 45px;
+
+  left: 0;
+  right: 0;
+  bottom: 0;
+
+  padding:10px;
+  text-align:right;
+}
+
+.color-preview {
+  width: 170px;
+  height: 70px;
+  margin: 11px;
+}
+
+.colors-list {
+  overflow: auto;
+  width: 280px;
+  box-sizing: border-box;
+  height: 100%;
+  padding-bottom: 10px;
+}
+
+.create-palette-color, .create-palette-new-color, .colors-list-drop-proxy{
+  position:relative;
+  float : left;
+
+  width : 44px;
+  height : 44px;
+  margin : 10px 0 0 10px;
+
+  box-sizing : border-box;
+
+  cursor : pointer;
+}
+
+@-moz-document url-prefix() {
+  .create-palette-color, .create-palette-new-color, .colors-list-drop-proxy{
+    margin : 7px 0 0 7px;
+  }
+}
+
+@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+  .create-palette-color, .create-palette-new-color, .colors-list-drop-proxy{
+    margin : 7px 0 0 7px;
+  }
+}
+
+
+.create-palette-color {
+  border:1px solid #2c2c2c;
+  transition : border-color 0.2s;
+}
+.create-palette-color:hover {
+  border:1px solid gold;
+}
+
+.colors-list-drop-proxy {
+  border:2px dotted #eee;
+}
+
+.create-palette-new-color {
+  border:2px dotted gold;
+
+  border-radius: 2px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 20px;
+  color: gold;
+}
+
+.create-palette-color.selected {
+  border:2px solid gold;
+}
+
+.create-palette-remove-color {
+  position: absolute;
+  top: 0;
+  right: 0;
+  padding: 2px 4px 0 0;
+  opacity : 0.2;
+
+  font-weight: bold;
+  color: rgb(255,255,255);
+  text-shadow : 0 0 1px rgb(0,0,0);
+
+  transition : opacity 0.3s, color 0.1s;
+}
+
+.light-color .create-palette-remove-color {
+  color: rgb(0,0,0);
+  text-shadow : 0 0 1px rgb(255,255,255);
+}
+
+.selected .create-palette-remove-color {
+  top: -1px;
+  right: -1px;
+}
+
+.create-palette-color:hover .create-palette-remove-color {
+  opacity: 0.6;
+}
+
+.create-palette-color .create-palette-remove-color:hover {
+  opacity: 1;
+  color: rgb(240,80,80);
+  text-shadow : 0 0 1px rgb(0,0,0);
+}
+
+/*SPECTRUM OVERRIDES*/
+
+.create-palette .sp-container{
+  background-color: transparent;
+  border: none;
+  box-shadow : none;
+  border-radius:0;
+  padding:5px;
+}

src/css/dialogs-import-image.css

@@ -6,7 +6,7 @@
   display : inline-block;
   height : 60px;
   width: 60px;
-  border : 1px dashed #999;
+  border: 1px dashed #999;
   border-radius: 3px;
 }
 
@@ -15,15 +15,7 @@
   width: 55px;
 }
 
-.import-size-field,
-.resize-size-field {
-  width: 50px;
-  margin-right: 8px;
-  text-align: right;
-}
-
-.import-size-field:nth-of-type(2),
-.resize-size-field:nth-of-type(2) {
+.import-size-field:nth-of-type(2) {
   margin-left: 5px;
 }
 

src/css/dialogs-manage-palettes.css

@@ -1,222 +0,0 @@
-.palette-manager-wrapper {
-  height: 100%;
-  position: relative;
-}
-
-.palette-manager-body {
-  position: absolute;
-  top: 45px;
-  bottom: 0;
-  right: 0;
-  left: 0;
-}
-
-.palette-manager-head {
-  position: absolute;
-  width: 100%;
-  background: gold;
-  margin: 0;
-  padding: 10px;
-  color: black;
-  font-size: 1.8em;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-}
-
-.palette-manager-close {
-  position: absolute;
-  top: 0;
-  right: 0;
-  line-height: 45px;
-  margin-right: 10px;
-  font-size: 1.3em;
-  cursor: pointer;
-}
-
-.palette-manager-drawer {
-  width: 200px;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-}
-
-.palette-manager-list {
-  position: absolute;
-  top:40px;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  overflow: auto;
-}
-
-.palette-manager-actions {
-  position: absolute;
-  height:40px;
-  line-height:40px;
-  width: 100%;
-  text-align: center;
-}
-
-.palette-manager-actions-button {
-  width: 80px;
-  margin: 5px;
-}
-
-.palette-manager-palette-button,
-.palette-manager-actions-button {
-  line-height: 20px;
-}
-
-.palette-manager-list li {
-  height: 48px;
-  line-height: 48px;
-  padding-left:10px;
-
-  font-size: 1.4em;
-
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-
-  border-bottom: 1px solid #666;
-  cursor:pointer;
-}
-
-.palette-manager-list li:hover {
-  background : #222;
-}
-
-.palette-manager-list li.selected {
-  color : gold;
-  font-weight: bold;
-}
-
-.palette-manager-list li:nth-child(1) {
-  border-top: 1px solid #666;
-}
-
-.palette-manager-details {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 200px;
-
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-
-  border-left:1px solid #666;
-}
-
-.palette-manager-details-head {
-  position: absolute;
-  height:40px;
-  line-height:40px;
-  width: 100%;
-
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-}
-
-.palette-manager-details-head-name {
-  padding: 0 10px 0 20px;
-  font-size: 1.5em;
-  font-weight: bold;
-}
-
-.palette-manager-details-head .edit-icon {
-  width: 24px;
-  display: inline-block;
-  background-size: 16px;
-}
-
-.palette-manager-details-head-actions {
-  float: right;
-  line-height: 40px;
-  padding-right: 10px;
-}
-
-.palette-manager-details-body {
-  position: absolute;
-  top:40px;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  overflow: auto;
-
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-}
-
-
-
-.palette-manager-color-card {
-  width: 120px;
-  height: 180px;
-  display: inline-block;
-  position: relative;
-  margin: 20px 0 20px 20px;
-  box-shadow: 0 0 0px 0px gold;
-  transition: box-shadow 0.3s;
-}
-
-.palette-manager-color-card:hover {
-  box-shadow: 0 0 4px 1px gold;
-}
-
-.palette-manager-delete-card {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 20px;
-
-  text-align: center;
-  font-size: 1.6em;
-  font-weight: bold;
-  color: rgb(255,255,255);
-  text-shadow : 0 0 2px rgb(0,0,0);
-  cursor: pointer;
-
-  opacity : 0.2;
-  transition : opacity 0.3s, color 0.1s;
-}
-
-.palette-manager-color-card:hover .palette-manager-delete-card {
-  opacity : 0.6;
-}
-
-.palette-manager-color-card .palette-manager-delete-card:hover {
-  opacity : 1;
-  color: rgb(240,80,80);
-}
-
-.palette-manager-new-color .palette-manager-color-square {
-  border: 3px dotted #888;
-  border-bottom-width: 0;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  border-radius: 3px 3px 0 0;
-  cursor: pointer;
-  text-align: center;
-  font-size: 24px;
-  color: #888;
-  line-height: 120px;
-}
-
-.palette-manager-color-square {
-  width: 120px;
-  height: 120px;
-  cursor: pointer;
-  /*background-image:url(../img/tools/eyedropper.png);*/
-}
-
-.palette-manager-color-details {
-  color : #666;
-  background: #eee;
-  height: 60px;
-  padding-left: 5px;
-}
-
-.palette-manager-color-details li{
-  line-height: 20px;
-  font-weight: bold;
-}

src/css/dialogs.css

@@ -79,6 +79,7 @@
 }
 
 .dialog-wrapper {
+  height: 100%;
   position : relative;
 }
 
@@ -101,4 +102,4 @@
   margin-right: 10px;
   font-size: 1.3em;
   cursor: pointer;
-}
+}

src/css/font-icon.css

@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'piskel';
-  src:url('fonts/piskel.eot?-3olv93');
-  src:url('fonts/piskel.eot?#iefix-3olv93') format('embedded-opentype'),
-    url('fonts/piskel.woff?-3olv93') format('woff'),
-    url('fonts/piskel.ttf?-3olv93') format('truetype'),
-    url('fonts/piskel.svg?-3olv93#icomoon') format('svg');
+  src:url('fonts/icomoon.eot?-3olv93');
+  src:url('fonts/icomoon.eot?#iefix-3olv93') format('embedded-opentype'),
+    url('fonts/icomoon.woff?-3olv93') format('woff'),
+    url('fonts/icomoon.ttf?-3olv93') format('truetype'),
+    url('fonts/icomoon.svg?-3olv93#icomoon') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -31,3 +31,66 @@
   content: "\e601";
 }
 
+.piskel-icon-download:before {
+  content: "\e600";
+}
+
+.piskel-icon-rotateleft:before {
+  content: "\e603";
+}
+
+.piskel-icon-rotateright:before {
+  content: "\e604";
+}
+
+.piskel-icon-fliph:before {
+  content: "\e605";
+}
+
+.piskel-icon-flipv:before {
+  content: "\e606";
+}
+
+.piskel-icon-trashplain:before {
+  content: "\e607";
+}
+
+.piskel-icon-trash:before {
+  content: "\e608";
+}
+
+.piskel-icon-merge:before {
+  content: "\e609";
+}
+
+.piskel-icon-pencil:before {
+  content: "\e610";
+}
+
+.piskel-icon-close:before {
+  content: "\e611";
+}
+
+.piskel-icon-minus:before {
+  content: "\e60a";
+}
+
+.piskel-icon-plus:before {
+  content: "\e60b";
+}
+
+.piskel-icon-arrow-up-fat:before {
+  content: "\e60c";
+}
+
+.piskel-icon-arrow-down-fat:before {
+  content: "\e60d";
+}
+
+.piskel-icon-arrow-up-thin:before {
+  content: "\e60e";
+}
+
+.piskel-icon-arrow-down-thin:before {
+  content: "\e60f";
+}

src/css/fonts/icomoon.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="512">
+<font-face units-per-em="512" ascent="480" descent="-32" />
+<missing-glyph horiz-adv-x="512" />
+<glyph unicode="&#x20;" d="" horiz-adv-x="256" />
+<glyph unicode="&#xe600;" d="M256 192l128 128h-96v128h-64v-128h-96zM372.363 244.364l-35.87-35.871 130.040-48.493-210.533-78.509-210.533 78.509 130.040 48.493-35.871 35.871-139.636-52.364v-128l256-96 256 96v128z" />
+<glyph unicode="&#xe601;" d="M327.755 416.174l-24.759-21.971-1.481 8.030-14.159-4.099v-27.379l0.914-19.404 26.988 23.949c-0.347-4.934-0.51-10.141-0.166-15.921 0.543-9.151 3.055-17.374 8.057-23.811s11.74-10.557 19.211-13.967c14.942-6.822 33.56-18.012 56.377-36.978 43.203-35.907 48.548-53.828 56.334-85.404 7.412-41.045-4.368-70.606-21.368-95.68-12.144-17.918-27.179-33.815-60.225-40.518s-63.992-8.866-86.123-8.866v-22.304c23.555 0 55.469 2.195 90.553 9.313s69.693 18.531 90.832 40.649c22.885 23.941 44.76 67.328 31.672 135.162l-0.055 0.223c-5.829 27.055-23.529 67.689-92.729 97.775-28.624 12.445-44.153 20.477-55.829 25.809-5.837 2.666-9.197 6.119-11.030 8.475s-3.034 5.246-3.401 11.43c-0.827 13.918 1.198 24.507 3.318 31.505s3.904 9.702 3.904 9.702l-16.84 14.276zM303.444 372.291c0 0-16.082 4.204-16.082-1.173 0-29.786-0.407-35.048 9.808-56.095s23.399-42.701 43.302-61.078c37.637-34.753 34.591-40.033 40.837-57.911 2.3-6.582 3.27-21.87 1.673-33.875s-6.074-27.851-11.959-36.856c-9.25-14.152-16.702-28.62-34.395-38.447-18.488-10.269-34.432-12.486-49.265-12.486v-22.304c18.579 0 39.728 4.476 62.060 13.494s43.831 22.548 56.848 42.462c8.719 13.341 17.897 33.653 19.924 49.887s6.051 30.237-4.534 52.106c-16.294 33.661-37.961 43.77-64.413 66.162-16.375 13.863-31.099 30.183-40.029 48.578s-13.219 37.077-13.772 47.536zM300.488 357.961l-13.128-1.2c0.667-12.589 0-38.494 0-63.093 0-11.679 1.942-25.867 3.768-35.663 3.517-18.873 9.378-31.122 13.056-42.974 2.921-9.421 6.195-22.61 8.376-27.676 5.897-13.728 6.717-30.505 0.674-49.822-6.121-19.563-15.663-38.313-31.608-44.469l5.736-18.915c23.072 8.907 55.35 34.019 64.177 62.238 7.959 25.431 2.932 48.415-4.32 65.295-4.397 10.236-8.579 17.284-13.263 25.818-5.764 10.5-18.011 23.661-21.517 34.382-3.19 9.75-6.983 21.54-7.96 33.601-1.955 24.118-3.242 48.871-3.986 62.479zM248.405 416.148l24.758-21.971 1.481 8.029 14.159-4.099v-27.379l-0.914-19.403-26.988 23.949c0.347-4.933 0.51-10.141 0.166-15.92-0.543-9.152 0.548-18.276-4.452-24.711s-10.838-15.063-18.308-18.475c-14.942-6.823-32.661-18.010-55.476-36.978-43.203-35.907-42.239-45.718-50.025-77.294-2.905-41.947-5.284-41.359 4.244-70.447 5.757-17.579 19.97-34.716 53.016-50.429 30.453-14.481 76.609-26.889 98.737-26.889v-22.304c-23.555 0-55.469 2.195-90.553 9.309s-69.692 18.531-90.832 40.649c-22.885 23.94-44.76 67.329-31.671 135.162l0.055 0.223c5.829 27.055 23.529 67.689 92.731 97.775 28.623 12.445 44.153 20.477 55.826 25.808 5.839 2.665 9.197 6.119 11.034 8.474s3.034 5.246 3.401 11.43c0.827 13.918-1.198 24.507-3.318 31.505s-3.903 9.702-3.903 9.702l16.84 14.274zM281.987 374.814l8.031-11.395c-0.667-12.589 0-38.494 0-63.093 0-11.68 3.154-27.141 1.329-36.938-3.517-18.873-3.009-25.387-6.684-37.239-2.921-9.421-6.195-25.794-8.376-30.864-5.897-13.728-7.354-45.161-1.31-64.478 6.121-19.563 9.928-44.689 19.498-59.125l3.56-36.712c-21.161 28.662-42.512 61.597-51.342 89.814-7.958 25.431-7.393 70.082-0.139 86.961 4.398 10.236 8.578 20.472 13.263 29.004 5.764 10.5 9.043 20.958 11.649 32.578 2.245 10.010 6.192 26.31 7.168 38.372 1.955 24.121 2.604 49.509 3.351 63.117z" horiz-adv-x="576" />
+<glyph unicode="&#xe602;" d="M256 384c-111.659 0-208.441-65.021-256-160 47.559-94.979 144.341-160 256-160 111.657 0 208.439 65.021 256 160-47.558 94.979-144.343 160-256 160zM382.225 299.148c30.081-19.187 55.571-44.887 74.717-75.148-19.146-30.261-44.637-55.961-74.718-75.149-37.797-24.108-81.445-36.851-126.224-36.851-44.78 0-88.428 12.743-126.225 36.852-30.080 19.186-55.57 44.886-74.717 75.148 19.146 30.262 44.637 55.962 74.717 75.148 1.959 1.25 3.938 2.461 5.929 3.65-4.979-13.664-7.704-28.411-7.704-43.798 0-70.692 57.308-128 128-128s128 57.308 128 128c0 15.387-2.725 30.134-7.704 43.799 1.99-1.189 3.969-2.401 5.929-3.651zM256 275c0-26.51-21.49-48-48-48s-48 21.49-48 48 21.49 48 48 48 48-21.49 48-48z" />
+<glyph unicode="&#xe603;" d="M256 448c-70.692 0-134.688-28.66-181.016-74.989l-74.984 74.989v-192h192l-71.766 71.761c34.748 34.746 82.746 56.239 135.766 56.239 106.034 0 192-85.962 192-192 0-57.348-25.146-108.818-65.009-144l42.333-48c53.151 46.908 86.676 115.538 86.676 192 0 141.385-114.615 256-256 256z" />
+<glyph unicode="&#xe604;" d="M0 192c0-76.462 33.524-145.092 86.675-192l42.333 48c-39.863 35.182-65.008 86.652-65.008 144 0 106.038 85.965 192 192 192 53.021 0 101.019-21.493 135.765-56.239l-71.765-71.761h192v192l-74.985-74.989c-46.327 46.329-110.322 74.989-181.015 74.989-141.385 0-256-114.615-256-256z" />
+<glyph unicode="&#xe605;" d="M0 288h512v192zM512 0v192h-512z" />
+<glyph unicode="&#xe606;" d="M288 480v-512h192zM0-32h192v512z" />
+<glyph unicode="&#xe607;" d="M96-32h320l32 352h-384zM320 416v64h-128v-64h-160v-96l32 32h384l32-32v96h-160zM288 416h-64v32h64v-32z" />
+<glyph unicode="&#xe608;" d="M400 416h-288c-26.51 0-48-21.49-48-48v-16h384v16c0 26.51-21.49 48-48 48zM316.16 448l7.058-50.5h-134.436l7.057 50.5h120.321zM320 480h-128c-13.2 0-25.495-10.696-27.321-23.769l-9.357-66.962c-1.827-13.073 7.478-23.769 20.678-23.769h160c13.2 0 22.505 10.696 20.679 23.769l-9.357 66.962c-1.827 13.073-14.122 23.769-27.322 23.769v0zM408 320h-304c-17.6 0-30.696-14.341-29.103-31.869l26.206-288.263c1.593-17.527 17.297-31.868 34.897-31.868h240c17.6 0 33.304 14.341 34.897 31.868l26.205 288.263c1.594 17.528-11.502 31.869-29.102 31.869zM192 32h-48l-16 224h64v-224zM288 32h-64v224h64v-224zM368 32h-48v224h64l-16-224z" />
+<glyph unicode="&#xe609;" d="M448 224h-80l-112-112-112 112h-80l-64-128v-32h512v32l-64 128zM0 32h512v-32h-512v32zM288 320v128h-64v-128h-112l144-144 144 144h-112z" />
+<glyph unicode="&#xe60a;" d="M0 272v-96c0-8.836 7.164-16 16-16h480c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16h-480c-8.836 0-16-7.164-16-16z" />
+<glyph unicode="&#xe60b;" d="M496 288h-176v176c0 8.836-7.164 16-16 16h-96c-8.836 0-16-7.164-16-16v-176h-176c-8.836 0-16-7.164-16-16v-96c0-8.836 7.164-16 16-16h176v-176c0-8.836 7.164-16 16-16h96c8.836 0 16 7.164 16 16v176h176c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16z" />
+<glyph unicode="&#xe60c;" d="M256.001 480l-256.001-256h160v-255.999l192-0.001v256h160z" />
+<glyph unicode="&#xe60d;" d="M256-32l256 256h-160v255.999l-192 0.001v-256h-160z" />
+<glyph unicode="&#xe60e;" d="M438.627 278.627l-160 160c-12.496 12.497-32.757 12.497-45.254 0l-160-160c-12.497-12.497-12.497-32.758 0-45.255 12.497-12.498 32.758-12.498 45.255 0l105.372 105.373v-306.745c0-17.673 14.327-32 32-32s32 14.327 32 32v306.745l105.373-105.373c6.248-6.248 14.438-9.372 22.627-9.372s16.379 3.124 22.627 9.373c12.497 12.497 12.497 32.757 0 45.254z" />
+<glyph unicode="&#xe60f;" d="M73.373 169.373l160-160c12.496-12.497 32.758-12.497 45.255 0l160 160c12.496 12.497 12.496 32.758 0 45.255-12.497 12.497-32.758 12.497-45.255 0l-105.373-105.373v306.745c0 17.673-14.327 32-32 32s-32-14.327-32-32v-306.745l-105.373 105.373c-6.248 6.248-14.438 9.372-22.627 9.372s-16.379-3.124-22.627-9.372c-12.497-12.497-12.497-32.758 0-45.255z" />
+<glyph unicode="&#xe610;" d="M432 480c44.182 0 80-35.817 80-80 0-18.010-5.955-34.629-16-48l-32-32-112 112 32 32c13.371 10.045 29.989 16 48 16zM32 112l-32-144 144 32 296 296-112 112-296-296zM357.789 298.211l-224-224-27.578 27.578 224 224 27.578-27.578z" />
+<glyph unicode="&#xe611;" d="M507.331 68.67c-0.002 0.002-0.004 0.004-0.006 0.005l-155.322 155.325 155.322 155.325c0.002 0.002 0.004 0.003 0.006 0.005 1.672 1.673 2.881 3.627 3.656 5.708 2.123 5.688 0.912 12.341-3.662 16.915l-73.373 73.373c-4.574 4.573-11.225 5.783-16.914 3.66-2.080-0.775-4.035-1.984-5.709-3.655 0-0.002-0.002-0.003-0.004-0.005l-155.324-155.326-155.324 155.325c-0.002 0.002-0.003 0.003-0.005 0.005-1.673 1.671-3.627 2.88-5.707 3.655-5.69 2.124-12.341 0.913-16.915-3.66l-73.374-73.374c-4.574-4.574-5.784-11.226-3.661-16.914 0.776-2.080 1.985-4.036 3.656-5.708 0.002-0.001 0.003-0.003 0.005-0.005l155.325-155.324-155.325-155.326c-0.001-0.002-0.003-0.003-0.004-0.005-1.671-1.673-2.88-3.627-3.657-5.707-2.124-5.688-0.913-12.341 3.661-16.915l73.374-73.373c4.575-4.574 11.226-5.784 16.915-3.661 2.080 0.776 4.035 1.985 5.708 3.656 0.001 0.002 0.003 0.003 0.005 0.005l155.324 155.325 155.324-155.325c0.002-0.001 0.004-0.003 0.006-0.004 1.674-1.672 3.627-2.881 5.707-3.657 5.689-2.123 12.342-0.913 16.914 3.661l73.373 73.374c4.574 4.574 5.785 11.227 3.662 16.915-0.776 2.080-1.985 4.034-3.657 5.707z" />
+</font></defs></svg>

src/css/forms.css

@@ -3,14 +3,13 @@
 }
 
 .textfield {
+  box-sizing:border-box;
+
   background : black;
   border : 1px solid #888;
   border-radius : 2px;
   padding : 3px 10px;
   color : white;
-
-  box-sizing:border-box;
-  -moz-box-sizing:border-box;
 }
 
 .textfield[disabled=disabled] {
@@ -22,8 +21,8 @@
 }
 
 .button {
-  height: 24px;
   box-sizing: border-box;
+  height: 24px;
 
   background-color: #3f3f3f;
   border: 1px solid #333;
@@ -34,7 +33,7 @@
   text-decoration: none;
 
   color: white;
-  text-shadow: 0px -1px 0 black;
+  text-shadow: 0 -1px 0 black;
   font-weight: bold;
   font-size: 1rem;
   text-align: center;
@@ -56,7 +55,7 @@
   border-bottom-color: rgb(151, 133, 0);
 
   color: black;
-  text-shadow: 0px 1px 0 #fff;
+  text-shadow: 0 1px 0 #fff;
 }
 
 .button-primary:hover {
@@ -69,8 +68,16 @@
   cursor:default;
   background-color: #aaa;
   color: #777;
-  text-shadow: 0px 1px 0 #bbb;
+  text-shadow: 0 1px 0 #bbb;
   border-color: #666;
   border-top-color: #999;
   border-bottom-color: #555;
+}
+
+.import-size-field,
+.resize-size-field,
+.export-size-field  {
+  width: 50px;
+  margin-right: 8px;
+  text-align: right;
 }

src/css/frames-list.css

@@ -23,8 +23,8 @@
   -o-transition: all 500ms ease-out;
   transition: all 500ms ease-out;
 
-  background-image: linear-gradient(45deg, rgba(0,0,0, 0.8) 25%, transparent 25%, transparent 75%, rgba(0,0,0, 0.8) 75%, rgba(0,0,0, 0.8)),
-                    linear-gradient(-45deg, rgba(0,0,0, 0.8) 25%, transparent 25%, transparent 75%, rgba(0,0,0, 0.8) 75%, rgba(0,0,0, 0.8));
+  background-image: linear-gradient(45deg, #1D1D1D 20%, transparent 25%, transparent 75%, #1D1D1D 80%, #1D1D1D),
+                    linear-gradient(-45deg, #1D1D1D 20%, transparent 25%, transparent 75%, #1D1D1D 80%, #1D1D1D);
   background-size: 29px 45px;
   background-repeat: repeat-x;
   background-position-x: 3px;

src/css/icons.css

@@ -5,6 +5,20 @@
   background-position: 50%;
 }
 
-.action-icon.edit-icon {
+.edit-icon {
   background-image: url('../img/tools/pen.png');
+  background-repeat: no-repeat;
+}
+
+.merge-icon {
+  background-image: url('../img/merge-icon.png');
+  background-repeat: no-repeat;
+}
+
+.plus-icon {
+  font-size:15px;
+  text-align:center;
+}
+
+.delete-icon {
 }

src/css/layout.css

@@ -0,0 +1,154 @@
+/**
+ * Application layout
+ */
+
+.main-wrapper {
+  position: absolute;
+  top: 5px;
+  right: 0;
+  bottom: 5px;
+  left: 0;
+}
+
+.column-wrapper {
+  text-align: center;
+  font-size: 0;
+  position: absolute;
+  left: 100px; /* Reserve room for tools on the left edge of the screen. */
+  top: 0;
+  right: 50px; /* Reserve room for actions on the right edge of the screen. */
+  bottom: 0;
+}
+
+.column {
+  display: inline-block;
+}
+
+.left-column {
+  vertical-align: top;
+  height: 100%;
+  margin-right: 7px;
+}
+
+.main-column {
+  height: 100%;
+  position: relative;
+}
+
+.right-column {
+  vertical-align: top;
+  margin-left: 10px;
+  height: 100%;
+  position: relative;
+}
+
+.drawing-canvas-container {
+  font-size: 0;
+}
+
+.sticky-section {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  z-index: 1000;
+}
+
+.sticky-section .sticky-section-wrap {
+  display: table;
+  height: 100%;
+}
+
+.sticky-section .vertical-centerer {
+  display: table-cell;
+  vertical-align: middle;
+}
+
+.left-sticky-section.sticky-section {
+  left: 0;
+  max-width: 100px;
+}
+
+.left-sticky-section .tool-icon {
+  float: left;
+}
+
+.cursor-coordinates {
+  color:#888;
+  font-size:12px;
+  font-weight:bold;
+  font-family:Courier;
+}
+
+/**
+ * Canvases layout
+ */
+
+.canvas {
+  position: relative;
+  z-index: 1;
+}
+
+.canvas-container {
+  position: relative;
+  display: block;
+}
+
+.canvas-container .canvas-background {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+
+.light-picker-background,
+.light-canvas-background .canvas-background {
+  background: url(../img/canvas_background/light_canvas_background.png) repeat;
+}
+
+.medium-picker-background,
+.medium-canvas-background .canvas-background {
+  background: url(../img/canvas_background/medium_canvas_background.png) repeat;
+}
+
+.lowcont-medium-picker-background,
+.lowcont-medium-canvas-background .canvas-background {
+  background: url(../img/canvas_background/lowcont_medium_canvas_background.png) repeat;
+}
+
+.lowcont-dark-picker-background,
+.lowcont-dark-canvas-background .canvas-background {
+  background: url(../img/canvas_background/lowcont_dark_canvas_background.png) repeat;
+}
+
+.layers-canvas,
+.canvas.onion-skin-canvas {
+  opacity: 0.2;
+}
+
+.canvas.canvas-overlay,
+.canvas.layers-canvas,
+.canvas.onion-skin-canvas {
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.tools-wrapper,
+.options-wrapper,
+.palette-wrapper {
+  float : left;
+}
+
+/**
+ * Z-indexes should match the drawing area canvas superposition order :
+ * - 1 : draw layers below current layer
+ * - 2 : draw current layer
+ * - 3 : draw layers above current layer
+ * - 4 : draw the tools overlay
+ */
+.canvas.layers-below-canvas  {z-index:  7;}
+.canvas.drawing-canvas       {z-index:  8;}
+.canvas.canvas-overlay       {z-index:  9;}
+.canvas.onion-skin-canvas    {z-index:  10;}
+.canvas.layers-above-canvas  {z-index:  11;}

src/css/notifications.css

@@ -0,0 +1,74 @@
+.user-message {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  padding: 10px 47px;
+  max-width: 300px;
+
+  border-top-left-radius: 7px;
+  border: #F0C36D 1px solid;
+  border-right: 0;
+  border-bottom: 0;
+
+  color: #222;
+  background-color: #F9EDBE;
+
+  font-weight: bold;
+  font-size: 13px;
+
+  z-index: 30000;
+}
+
+.user-message .close {
+  position: absolute;
+  top: 6px;
+  right: 17px;
+
+  color: gray;
+
+  font-size: 18px;
+  font-weight: bold;
+
+  cursor: pointer;
+}
+
+.user-message .close:hover {
+  color: black;
+}
+
+.progress-bar-container {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  padding: 10px;
+  width: 360px;
+  border-top-right-radius: 2px;
+  border: gold 2px solid;
+  border-left: 0;
+  border-bottom: 0;
+  background-color: #444;
+  font-size: 14px;
+  z-index: 30000;
+  color: #eee;
+}
+
+.progress-bar-item {
+  float: left;
+  height:20px;
+}
+
+.progress-bar-status {
+  line-height: 20px;
+  width : 40px;
+  overflow : hidden;
+  margin: 0 0 0 10px;
+}
+
+.progress-bar {
+  border : 1px solid grey;
+  margin-top: 8px;
+  height : 4px;
+  width : 300px;
+  background : linear-gradient(to left, gold, gold) no-repeat -300px 0;
+  background-color : black;
+}

src/css/settings-application.css

@@ -0,0 +1,4 @@
+.tiled-preview-checkbox {
+  vertical-align: -2px;
+  margin-left: 0;
+}

src/css/settings-export.css

@@ -23,6 +23,10 @@
   float: left;
 }
 
+.png-export-preview .light-picker-background {
+  max-width:240px;
+}
+
 .gif-upload-status {
   width: 180px;
   margin-left: 5px;
@@ -51,15 +55,4 @@
   -moz-box-sizing:border-box;
   background: rgba(0,0,0,0.5);
   color: white;
-}
-
-.gif-export-progress-status {
-  margin-left: 5px;
-}
-
-.gif-export-progress-bar {
-  margin-top:5px;
-  height:3px;
-  width: 0;
-  background:gold;
-}
+}

src/css/settings-resize.css

@@ -0,0 +1,114 @@
+.resize-section-title {
+  vertical-align: top;
+  display: inline-block;
+  padding-top: 5px;
+  width: 25%;
+}
+
+.resize-content-checkbox {
+  margin-left: 0;
+}
+
+.resize-ratio-checkbox,
+.resize-smooth-checkbox {
+  vertical-align: -2px;
+  margin-left: 0;
+}
+
+
+/*****************/
+/* ANCHOR WIDGET */
+/*****************/
+
+.resize-origin-container {
+  overflow: hidden;
+  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.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.css

@@ -184,12 +184,15 @@
   border: gold 1px solid;
 }
 
-
-
 /************************************************************************************************/
 /* Save panel                                                                   */
 /************************************************************************************************/
 
+.anonymous .save-public-section,
+.anonymous #save-online-button {
+  display : none;
+}
+
 .save-field {
   width: 100%;
 }
@@ -208,4 +211,11 @@
   font-weight: bold;
   color: white;
   font-style: normal;
-}
+}
+
+.save-desktop-file-name {
+    word-wrap: break-word;
+    font-weight: bold;
+    color: white;
+    font-style: normal;
+}

src/css/style.css

@@ -1,9 +1,5 @@
 body {
-  background: radial-gradient(circle, #000, #373737);
-  /* 16/06/2013 : -webkit still needed for
-  safari, safari mobile and android browser and chrome for android
-  cf http://caniuse.com/css-gradients */
-  background: -webkit-radial-gradient(circle, #000, #373737);
+  background: #1D1D1D;
 }
 
 /* Browser fixes */
@@ -20,182 +16,8 @@ body {
   user-select: initial;
 }
 
-/**
- * Application layout
- */
-
-.main-wrapper {
-  position: absolute;
-  top: 5px;
-  right: 0;
-  bottom: 5px;
-  left: 0;
-}
-
-.column-wrapper {
-  text-align: center;
-  font-size: 0;
-  position: absolute;
-  left: 100px; /* Reserve room for tools on the left edge of the screen. */
-  top: 0;
-  right: 50px; /* Reserve room for actions on the right edge of the screen. */
-  bottom: 0;
-}
-
-.column {
-  display: inline-block;
-}
-
-.left-column {
-  vertical-align: top;
-  height: 100%;
-  margin-right: 7px;
-}
-
-.main-column {
-  height: 100%;
-  position: relative;
-}
-
-.right-column {
-  vertical-align: top;
-  margin-left: 10px;
-  height: 100%;
-  position: relative;
-}
-
-.drawing-canvas-container {
-  font-size: 0;
-}
-
-.sticky-section {
-  position: fixed;
-  top: 0;
-  bottom: 0;
-  z-index: 1000;
-}
-
-.sticky-section .sticky-section-wrap {
-  display: table;
-  height: 100%;
-}
-
-.sticky-section .vertical-centerer {
-  display: table-cell;
-  vertical-align: middle;
-}
-
-.left-sticky-section.sticky-section {
-  left: 0;
-  max-width: 100px;
-}
-
-.left-sticky-section .tool-icon {
-  float: left;
-}
-
-/**
- * Canvases layout
- */
-
-.canvas {
-  position: relative;
-  z-index: 1;
-}
-
-.canvas-container {
-  position: relative;
-  display: block;
-}
-
-.canvas-container .canvas-background {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-}
-
-.light-picker-background,
-.light-canvas-background .canvas-background {
-  background: url(../img/canvas_background/light_canvas_background.png) repeat;
-}
-
-.medium-picker-background,
-.medium-canvas-background .canvas-background {
-  background: url(../img/canvas_background/medium_canvas_background.png) repeat;
-}
-
-.lowcont-medium-picker-background,
-.lowcont-medium-canvas-background .canvas-background {
-  background: url(../img/canvas_background/lowcont_medium_canvas_background.png) repeat;
-}
-
-.lowcont-dark-picker-background,
-.lowcont-dark-canvas-background .canvas-background {
-  background: url(../img/canvas_background/lowcont_dark_canvas_background.png) repeat;
-}
-
-.layers-canvas,
-.canvas.onion-skin-canvas {
-  opacity: 0.2;
-}
-
-.canvas.canvas-overlay,
-.canvas.layers-canvas,
-.canvas.onion-skin-canvas {
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-/**
- * Z-indexes should match the drawing area canvas superposition order :
- * - 1 : draw layers below current layer
- * - 2 : draw current layer
- * - 3 : draw layers above current layer
- * - 4 : draw the tools overlay
- */
-.canvas.layers-below-canvas  {z-index:  7;}
-.canvas.drawing-canvas       {z-index:  8;}
-.canvas.canvas-overlay       {z-index:  9;}
-.canvas.onion-skin-canvas    {z-index:  10;}
-.canvas.layers-above-canvas  {z-index:  11;}
-
-
-
-/**
- * User messages
- */
-.user-message {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  background-color: #F9EDBE;
-  padding: 10px 47px;
-  border-top-left-radius: 7px;
-  color: #222;
-  border: #F0C36D 1px solid;
-  border-right: 0;
-  border-bottom: 0;
-  font-weight: bold;
-  font-size: 13px;
-  z-index: 30000;
-  max-width: 300px;
-}
-
-.user-message .close {
-  position: absolute;
-  top: 6px;
-  right: 17px;
-  color: gray;
-  font-weight: bold;
-  cursor: pointer;
-  font-size: 18px;
-}
-
-.user-message .close:hover {
-  color: black;
+.no-overflow {
+  overflow : hidden;
 }
 
 .image-link {
@@ -225,9 +47,6 @@ body {
   left:0;
 }
 
-.cursor-coordinates {
-  color:#888;
-  font-size:12px;
-  font-weight:bold;
-  font-family:Courier;
-}
+.uppercase {
+  text-transform: uppercase;
+}

src/css/toolbox-animated-preview.css

@@ -3,9 +3,9 @@
  */
 
 .preview-container {
-  border : 0px Solid black;
-  border-radius:5px 0px 0px 5px;
-  box-shadow : 0px 0px 2px rgba(0,0,0,0.2);
+  border : 0 Solid black;
+  border-radius:5px 0 0 5px;
+  box-shadow : 0 0 2px rgba(0,0,0,0.2);
   font-size: 0;
 }
 
@@ -14,7 +14,12 @@
 }
 
 .preview-container canvas {
-  border : 0px Solid transparent;
+  border : 0 Solid transparent;
+}
+
+.canvas-container .animated-preview-canvas-background {
+  position : relative;
+  height: 100%;
 }
 
 #animated-preview-container {
@@ -23,9 +28,10 @@
   overflow : hidden;
 }
 
-#animated-preview-canvas-container {
+.canvas-container-wrapper {
   height :200px;
   width : 200px;
+  overflow:hidden;
 }
 
 .tiled-frame-container {
@@ -73,4 +79,28 @@
 .preview-toggle-onion-skin-enabled,
 .preview-toggle-onion-skin-enabled:hover {
   color : gold;
-}
+}
+
+.open-popup-preview-button {
+  position : absolute;
+  z-index: 500;
+  right : 10px;
+  top : 10px;
+  width : 24px;
+  height: 18px;
+
+  border : 2px solid white;
+  background : rgba(0,0,0,0.3);
+  cursor : pointer;
+
+  opacity: 0;
+  transition: 0.3s opacity, 0.3s border-color;
+}
+
+.minimap-container:hover .open-popup-preview-button {
+  opacity: 1;
+}
+
+.open-popup-preview-button:hover {
+  border-color: gold;
+}

src/css/toolbox-layers-list.css

@@ -5,18 +5,21 @@
 .layers-list-container {
 }
 
-.layers-title {
+/*.layers-title {
   background-image: url('../img/layers.svg');
   background-size: 22px;
   background-repeat: no-repeat;
   background-position: 97%;
+}*/
+
+.layers-title {
   position: relative;
 }
 
 .layers-toggle-preview {
   position: absolute;
   top: 0.3em;
-  right: 2em;
+  right: 0.5em;
 
   color: #999;
   font-size: 1.3em;
@@ -46,22 +49,6 @@
   cursor : pointer;
 }
 
-.layer-item .edit-icon {
-  float: right;
-  width: 30px;
-  background-size: 12px;
-  opacity: 0;
-  transition : opacity 0.2s;
-}
-
-.layer-item:hover .edit-icon {
-  opacity : 0.6;
-}
-
-.layer-item:hover .edit-icon:hover {
-  opacity : 1;
-}
-
 .layer-item:hover {
   background : #222;
 }
@@ -72,7 +59,21 @@
   color: gold;
 }
 
-.layers-button-arrow {
-  font-family : 'Lucida Grande', Calibri;
-  padding : 2px 6px 0 6px;
+.layers-button-container {
+  overflow : hidden;
+}
+
+.layers-button {
+  margin: 0;
+  width: 16.66667%;
+  float : left;
+}
+
+/* @override */
+.layers-button-container .layers-button {
+  border-left-width: 0;
+}
+
+.layers-button:last-child {
+  border-right-width: 0;
 }

src/css/toolbox-palettes-list.css

@@ -1,63 +1,106 @@
-.palettes-list-select {
-  float:right;
-  max-width:90px;
-  margin-top: 3px;
-}
-
 .palettes-title {
-  background-size: 22px;
-  background-repeat: no-repeat;
-  background-position: 97%;
+    background-size: 22px;
+    background-repeat: no-repeat;
+    background-position: 97%;
 }
-
 .palettes-list-colors {
-  overflow: auto;
-  max-height: 160px;
+    overflow: auto;
+    max-height: 160px;
 }
-
 .palettes-list-color {
-  cursor : pointer;
-  float: left;
-  margin : 0 0 5px 5px;
-  width : 32px;
-  height : 32px;
-  position: relative;
+    cursor: pointer;
+    float: left;
+    margin: 0 0 5px 5px;
+    width: 32px;
+    height: 32px;
+    position: relative;
 }
-
 .palettes-list-color:nth-child(-n+5) {
-  margin-top: 5px;
+    margin-top: 5px;
 }
-
-.palettes-list-color div{
-  width : 32px;
-  height : 32px;
+.palettes-list-color div {
+    width: 32px;
+    height: 32px;
 }
-
-.palettes-list-has-scrollbar .palettes-list-color,
-.palettes-list-has-scrollbar .palettes-list-color div{
-  width: 29px
+.palettes-list-has-scrollbar .palettes-list-color, .palettes-list-has-scrollbar .palettes-list-color div {
+    width: 29px
 }
-
-.palettes-list-primary-color:before,
-.palettes-list-secondary-color:before {
-  content: "";
-  position: absolute;
-  bottom: 1px;
-  display: inline-block;
-  border: 7px solid gold;
-  border-top-color: transparent;
-
-  width: 0px;
-  height: 0px;
+.palettes-list-primary-color:before, .palettes-list-secondary-color:before {
+    content: "";
+    position: absolute;
+    bottom: 1px;
+    display: inline-block;
+    border: 7px solid gold;
+    border-top-color: transparent;
+    width: 0px;
+    height: 0px;
 }
-
 .palettes-list-primary-color:before {
-  left: 1px;
-  border-right-color: transparent;
+    left: 1px;
+    border-right-color: transparent;
+}
+.palettes-list-secondary-color:before {
+    right: 1px;
+    border-left-color: transparent;
+}
+.palettes-list-actions {
+    background-color: #3f3f3f;
+    border-bottom-color: #222;
+    height: 24px;
+    padding: 0;
+    overflow: hidden;
 }
 
+.palettes-list-button,
+.palettes-list-select {
+    margin: 0;
+    float: left;
+}
 
-.palettes-list-secondary-color:before {
-  right: 1px;
-  border-left-color: transparent;
-}
+.palettes-list-button {
+    width: 16.66667%;
+}
+.palettes-list-select {
+    width: 66.66667%;
+    height: 100%;
+    padding: 0 5px 0 5px;
+
+    border-style: solid;
+    border-width: 1px 0 1px 0;
+
+    color: #aaa;
+    font-size : 0.75em;
+
+    /*thanks firefox, you suck*/
+    text-align:left;
+    /*text-shadow:none;*/
+    font-weight: normal;
+
+    transition : background-color 0.3s, color 0.3s;
+    cursor:pointer;
+}
+
+.palettes-list-select:hover {
+    color: white;
+    background-color: #484848;
+}
+
+.palettes-list-select:focus {
+    background-color: #484848;
+    color: white;
+    outline: none;
+}
+
+.palettes-list-actions .edit-icon {
+    background-size: 15px;
+    background-position: 50%;
+}
+.palettes-list-no-colors {
+    height: 42px;
+    width: 100%;
+    color: grey;
+    font-size: 0.7em;
+    font-style: italic;
+    line-height: 42px;
+    text-align: center
+}

src/css/toolbox.css

@@ -14,23 +14,4 @@
   margin: 0;
   font-size: 15px;
   background: #222;
-}
-
-.toolbox-button-container {
-  overflow : hidden;
-}
-
-.toolbox-button {
-  margin: 0;
-  width: 25%;
-  float : left;
-}
-
-/* @override */
-.button.toolbox-button {
-  border-left-width: 0;
-}
-
-.toolbox-button:last-child {
-  border-right-width: 0;
 }

src/css/tools.css

@@ -1,10 +1,3 @@
-
-.tools-wrapper,
-.options-wrapper,
-.palette-wrapper {
-  float: left;
-}
-
 .tool-icon {
   position : relative;
   cursor : pointer;
@@ -88,8 +81,8 @@
 
 .tool-icon.tool-lighten {
   background-image: url(../img/tools/lighten.png);
-  background-size: 30px 30px;
   background-position: 8px 8px;
+  background-size: 30px 30px;
 }
 
 .tool-icon.tool-colorpicker {
@@ -103,6 +96,24 @@
   background-size: 36px 36px;
 }
 
+.tool-icon.tool-flip {
+  background-image: url(../img/tools/flip.png);
+  background-position: 7px 11px;
+  background-size: 32px;
+}
+
+.tool-icon.tool-rotate {
+  background-image: url(../img/tools/rotate.png);
+  background-position: 10px 9px;
+  background-size: 26px;
+}
+
+.tool-icon.tool-clone {
+  background-image: url(../img/tools/clone.png);
+  background-position: 9px 15px;
+  background-size: 30px;
+}
+
 /*
  * Tool cursors:
  */

src/css/transformations.css

@@ -0,0 +1,4 @@
+
+.transformations-container .tool-icon {
+  float:left;
+}

src/index.html

@@ -44,6 +44,7 @@
       <div class="column right-column">
         <iframe src="templates/preview.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
         <iframe src="templates/layers-list.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
+        <iframe src="templates/transformations.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
         <iframe src="templates/palettes-list.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
         <div class="pull-bottom cursor-coordinates"></div>
       </div>
@@ -67,17 +68,20 @@
 
   <div id="dialog-container-wrapper">
     <div id="dialog-container">
-      <iframe src="templates/dialogs/manage-palettes.html" onload="iframeloader.onLoad(event)"  data-iframe-loader="store"></iframe>
+      <iframe src="templates/dialogs/create-palette.html" onload="iframeloader.onLoad(event)"  data-iframe-loader="store"></iframe>
       <iframe src="templates/dialogs/import-image.html" onload="iframeloader.onLoad(event)"  data-iframe-loader="store"></iframe>
       <iframe src="templates/dialogs/browse-local.html" onload="iframeloader.onLoad(event)"  data-iframe-loader="store"></iframe>
     </div>
   </div>
 
   <iframe src="templates/cheatsheet.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
+  <iframe src="templates/misc-templates.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
+  <iframe src="templates/popup-preview.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
+
+  <script type="text/javascript" src="piskel-boot.js"></script>
   <!--body-main-end-->
   <!-- the comment above indicates the end of the markup reused by the editor integrated in piskelapp.com -->
   <!-- do not delete, do not move :) -->
 
-  <script type="text/javascript" src="piskel-boot-0.1.0.js"></script>
 </body>
 </html>

src/js/Constants.js

@@ -11,7 +11,7 @@ var Constants = {
   MAX_HEIGHT : 1024,
   MAX_WIDTH : 1024,
 
-  MAX_CURRENT_COLORS_DISPLAYED : 100,
+  MAX_PALETTE_COLORS : 100,
 
   MINIMUM_ZOOM : 1,
 
@@ -21,16 +21,7 @@ var Constants = {
   DEFAULT_PEN_COLOR : '#000000',
   TRANSPARENT_COLOR : 'rgba(0, 0, 0, 0)',
 
-  OVERLAY_ONION_SKIN : 'onion-skin',
-  OVERLAY_LAYER_PREVIEW : 'layer-preview',
-  OVERLAY_DISABLED : 'no-overlay',
-
-  NO_PALETTE_ID : '__no-palette',
   CURRENT_COLORS_PALETTE_ID : '__current-colors',
-  MANAGE_PALETTE_ID : '__manage-palettes',
-
-  // Used for Spectrum input
-  PREFERRED_COLOR_FORMAT : 'rgb',
 
   /*
    * Fake semi-transparent color used to highlight transparent
@@ -44,23 +35,6 @@ var Constants = {
    */
   TOOL_TARGET_HIGHLIGHT_COLOR: 'rgba(255, 255, 255, 0.2)',
 
-  /*
-   * Default entry point for piskel web service:
-   */
-  STATIC : {
-    URL : {
-      SAVE : 'http://3.piskel-app.appspot.com/store',
-      GET : 'http://3.piskel-app.appspot.com/get'
-    }
-  },
-  APPENGINE : {
-    URL : {
-      SAVE : 'save'
-    }
-  },
-  IMAGE_SERVICE_UPLOAD_URL : 'http://piskel-imgstore-a.appspot.com/__/upload',
-  IMAGE_SERVICE_GET_URL : 'http://piskel-imgstore-a.appspot.com/img/',
-
   ZOOMED_OUT_BACKGROUND_COLOR : '#A0A0A0',
 
   LEFT_BUTTON : 0,
@@ -72,5 +46,10 @@ var Constants = {
   EMPTY_FUNCTION : function () {},
 
   // TESTS
-  DRAWING_TEST_FOLDER : 'drawing'
-};
+  DRAWING_TEST_FOLDER : 'drawing',
+
+  // SERVICE URLS
+  APPENGINE_SAVE_URL : 'save',
+  IMAGE_SERVICE_UPLOAD_URL : 'http://piskel-imgstore-b.appspot.com/__/upload',
+  IMAGE_SERVICE_GET_URL : 'http://piskel-imgstore-b.appspot.com/img/'
+};

src/js/Events.js

@@ -1,12 +1,13 @@
 // TODO(grosbouddha): put under pskl namespace.
 var Events = {
 
-  TOOL_SELECTED : "TOOL_SELECTED",
-  SELECT_TOOL : "SELECT_TOOL",
+  TOOL_SELECTED : 'TOOL_SELECTED',
+  SELECT_TOOL : 'SELECT_TOOL',
 
-  TOOL_RELEASED : "TOOL_RELEASED",
-  SELECT_PRIMARY_COLOR: "SELECT_PRIMARY_COLOR",
-  SELECT_SECONDARY_COLOR: "SELECT_SECONDARY_COLOR",
+  TOOL_RELEASED : 'TOOL_RELEASED',
+  TOOL_PRESSED : 'TOOL_PRESSED',
+  SELECT_PRIMARY_COLOR: 'SELECT_PRIMARY_COLOR',
+  SELECT_SECONDARY_COLOR: 'SELECT_SECONDARY_COLOR',
   PRIMARY_COLOR_SELECTED : 'PRIMARY_COLOR_SELECTED',
   SECONDARY_COLOR_SELECTED : 'SECONDARY_COLOR_SELECTED',
 
@@ -25,36 +26,43 @@ var Events = {
    *   1st argument: Name of the settings
    *   2nd argument: New value
    */
-  USER_SETTINGS_CHANGED: "USER_SETTINGS_CHANGED",
+  USER_SETTINGS_CHANGED: 'USER_SETTINGS_CHANGED',
 
-  CLOSE_SETTINGS_DRAWER : "CLOSE_SETTINGS_DRAWER",
+  CLOSE_SETTINGS_DRAWER : 'CLOSE_SETTINGS_DRAWER',
 
   /**
    * The framesheet was reseted and is now probably drastically different.
    * Number of frames, content of frames, color used for the palette may have changed.
    */
-  PISKEL_RESET: "PISKEL_RESET",
-  PISKEL_SAVE_STATE: "PISKEL_SAVE_STATE",
+  PISKEL_RESET: 'PISKEL_RESET',
+  PISKEL_SAVE_STATE: 'PISKEL_SAVE_STATE',
 
-  PISKEL_SAVED: "PISKEL_SAVED",
+  HISTORY_STATE_SAVED: 'HISTORY_STATE_SAVED',
+  HISTORY_STATE_LOADED: 'HISTORY_STATE_LOADED',
 
-  FRAME_SIZE_CHANGED : "FRAME_SIZE_CHANGED",
+  PISKEL_SAVED: 'PISKEL_SAVED',
 
-  SELECTION_CREATED: "SELECTION_CREATED",
-  SELECTION_MOVE_REQUEST: "SELECTION_MOVE_REQUEST",
-  SELECTION_DISMISSED: "SELECTION_DISMISSED",
+  FRAME_SIZE_CHANGED : 'FRAME_SIZE_CHANGED',
 
-  SHOW_NOTIFICATION: "SHOW_NOTIFICATION",
-  HIDE_NOTIFICATION: "HIDE_NOTIFICATION",
+  SELECTION_CREATED: 'SELECTION_CREATED',
+  SELECTION_MOVE_REQUEST: 'SELECTION_MOVE_REQUEST',
+  SELECTION_DISMISSED: 'SELECTION_DISMISSED',
 
-  ZOOM_CHANGED : "ZOOM_CHANGED",
+  SHOW_NOTIFICATION: 'SHOW_NOTIFICATION',
+  HIDE_NOTIFICATION: 'HIDE_NOTIFICATION',
 
-  CURRENT_COLORS_UPDATED : "CURRENT_COLORS_UPDATED",
+  SHOW_PROGRESS: 'SHOW_PROGRESS',
+  UPDATE_PROGRESS: 'UPDATE_PROGRESS',
+  HIDE_PROGRESS: 'HIDE_PROGRESS',
 
-  MOUSE_EVENT : "MOUSE_EVENT",
+  ZOOM_CHANGED : 'ZOOM_CHANGED',
+
+  CURRENT_COLORS_UPDATED : 'CURRENT_COLORS_UPDATED',
+
+  MOUSE_EVENT : 'MOUSE_EVENT',
 
   // Tests
-  TEST_RECORD_END : "TEST_RECORD_END",
-  TEST_CASE_END : "TEST_CASE_END",
-  TEST_SUITE_END : "TEST_SUITE_END"
-};
+  TEST_RECORD_END : 'TEST_RECORD_END',
+  TEST_CASE_END : 'TEST_CASE_END',
+  TEST_SUITE_END : 'TEST_SUITE_END'
+};

src/js/app.js

@@ -3,7 +3,7 @@
  * @require Events
  */
 (function () {
-  var ns = $.namespace("pskl");
+  var ns = $.namespace('pskl');
   /**
    * Main application controller
    */
@@ -11,7 +11,6 @@
 
     init : function () {
       /**
-       * True when piskel is running in static mode (no back end needed).
        * When started from APP Engine, appEngineToken_ (Boolean) should be set on window.pskl
        */
       this.isAppEngineVersion = !!pskl.appEngineToken_;
@@ -19,15 +18,11 @@
       this.shortcutService = new pskl.service.keyboard.ShortcutService();
       this.shortcutService.init();
 
-      var size = {
-        height : Constants.DEFAULT.HEIGHT,
-        width : Constants.DEFAULT.WIDTH
-      };
-
+      var size = pskl.UserSettings.get(pskl.UserSettings.DEFAULT_SIZE);
       var descriptor = new pskl.model.piskel.Descriptor('New Piskel', '');
       var piskel = new pskl.model.Piskel(size.width, size.height, descriptor);
 
-      var layer = new pskl.model.Layer("Layer 1");
+      var layer = new pskl.model.Layer('Layer 1');
       var frame = new pskl.model.Frame(size.width, size.height);
 
       layer.addFrame(frame);
@@ -39,29 +34,46 @@
       this.piskelController = new pskl.controller.piskel.PublicPiskelController(this.corePiskelController);
       this.piskelController.init();
 
+      this.paletteImportService = new pskl.service.palette.PaletteImportService();
+      this.paletteService = new pskl.service.palette.PaletteService();
+      this.paletteService.addDynamicPalette(new pskl.service.palette.CurrentColorsPalette());
+
       this.paletteController = new pskl.controller.PaletteController();
       this.paletteController.init();
 
       this.currentColorsService = new pskl.service.CurrentColorsService(this.piskelController);
       this.currentColorsService.init();
 
-      this.palettesListController = new pskl.controller.PalettesListController(this.paletteController, this.currentColorsService);
+      this.palettesListController = new pskl.controller.PalettesListController(
+        this.paletteController,
+        this.currentColorsService);
       this.palettesListController.init();
 
       this.cursorCoordinatesController = new pskl.controller.CursorCoordinatesController(this.piskelController);
       this.cursorCoordinatesController.init();
 
-      this.drawingController = new pskl.controller.DrawingController(this.piskelController, this.paletteController, $('#drawing-canvas-container'));
+      this.drawingController = new pskl.controller.DrawingController(
+        this.piskelController,
+        this.paletteController,
+        $('#drawing-canvas-container'));
       this.drawingController.init();
 
-      this.animationController = new pskl.controller.AnimatedPreviewController(this.piskelController, $('#animated-preview-canvas-container'));
-      this.animationController.init();
+      this.previewController = new pskl.controller.preview.PreviewController(
+        this.piskelController,
+        $('#animated-preview-canvas-container'));
+      this.previewController.init();
 
-      this.minimapController = new pskl.controller.MinimapController(this.piskelController, this.animationController, this.drawingController, $('#animated-preview-canvas-container'));
+      this.minimapController = new pskl.controller.MinimapController(
+        this.piskelController,
+        this.previewController,
+        this.drawingController,
+        $('.minimap-container'));
       this.minimapController.init();
 
-      this.previewFilmController = new pskl.controller.PreviewFilmController(this.piskelController, $('#preview-list'));
-      this.previewFilmController.init();
+      this.framesListController = new pskl.controller.FramesListController(
+        this.piskelController,
+        $('#preview-list'));
+      this.framesListController.init();
 
       this.layersListController = new pskl.controller.LayersListController(this.piskelController);
       this.layersListController.init();
@@ -84,12 +96,21 @@
       this.notificationController = new pskl.controller.NotificationController();
       this.notificationController.init();
 
+      this.transformationsController = new pskl.controller.TransformationsController();
+      this.transformationsController.init();
+
+      this.progressBarController = new pskl.controller.ProgressBarController();
+      this.progressBarController.init();
+
       this.canvasBackgroundController = new pskl.controller.CanvasBackgroundController();
       this.canvasBackgroundController.init();
 
       this.localStorageService = new pskl.service.LocalStorageService(this.piskelController);
       this.localStorageService.init();
 
+      this.desktopStorageService = new pskl.service.DesktopStorageService(this.piskelController);
+      this.desktopStorageService.init();
+
       this.imageUploadService = new pskl.service.ImageUploadService();
       this.imageUploadService.init();
 
@@ -105,7 +126,9 @@
       this.beforeUnloadService = new pskl.service.BeforeUnloadService(this.piskelController);
       this.beforeUnloadService.init();
 
-      this.fileDropperService = new pskl.service.FileDropperService(this.piskelController, $('#drawing-canvas-container').get(0));
+      this.fileDropperService = new pskl.service.FileDropperService(
+        this.piskelController,
+        document.querySelector('#drawing-canvas-container'));
       this.fileDropperService.init();
 
       if (this.isAppEngineVersion) {
@@ -129,13 +152,20 @@
       if (pskl.devtools) {
         pskl.devtools.init();
       }
+
+      if (pskl.utils.Environment.detectNodeWebkit() && pskl.utils.UserAgent.isMac) {
+        var gui = require('nw.gui');
+        var mb = new gui.Menu({type:'menubar'});
+        mb.createMacBuiltin('Piskel');
+        gui.Window.get().menu = mb;
+      }
     },
 
     loadPiskel_ : function (serializedPiskel, descriptor, fps) {
       pskl.utils.serialization.Deserializer.deserialize(serializedPiskel, function (piskel) {
         piskel.setDescriptor(descriptor);
         pskl.app.piskelController.setPiskel(piskel);
-        pskl.app.animationController.setFPS(fps);
+        pskl.app.previewController.setFPS(fps);
       });
     },
 
@@ -156,8 +186,8 @@
 
     render : function (delta) {
       this.drawingController.render(delta);
-      this.animationController.render(delta);
-      this.previewFilmController.render(delta);
+      this.previewController.render(delta);
+      this.framesListController.render(delta);
     },
 
     getFirstFrameAsPng : function () {
@@ -165,13 +195,13 @@
       var canvasRenderer = new pskl.rendering.CanvasRenderer(firstFrame, 1);
       canvasRenderer.drawTransparentAs('rgba(0,0,0,0)');
       var firstFrameCanvas = canvasRenderer.render();
-      return firstFrameCanvas.toDataURL("image/png");
+      return firstFrameCanvas.toDataURL('image/png');
     },
 
     getFramesheetAsPng : function () {
       var renderer = new pskl.rendering.PiskelRenderer(this.piskelController);
       var framesheetCanvas = renderer.renderAsCanvas();
-      return framesheetCanvas.toDataURL("image/png");
+      return framesheetCanvas.toDataURL('image/png');
     }
   };
 })();

src/js/controller/AnimatedPreviewController.js

@@ -1,153 +0,0 @@
-(function () {
-  var ns = $.namespace("pskl.controller");
-
-  // Preview is a square of PREVIEW_SIZE x PREVIEW_SIZE
-  var PREVIEW_SIZE = 200;
-
-  ns.AnimatedPreviewController = function (piskelController, container) {
-    this.piskelController = piskelController;
-    this.container = container;
-
-    this.elapsedTime = 0;
-    this.currentIndex = 0;
-
-    this.setFPS(Constants.DEFAULT.FPS);
-
-    var frame = this.piskelController.getCurrentFrame();
-
-    this.renderer = new pskl.rendering.frame.TiledFrameRenderer(this.container);
-  };
-
-  ns.AnimatedPreviewController.prototype.init = function () {
-    // the oninput event won't work on IE10 unfortunately, but at least will provide a
-    // consistent behavior across all other browsers that support the input type range
-    // see https://bugzilla.mozilla.org/show_bug.cgi?id=853670
-    $("#preview-fps")[0].addEventListener('change', this.onFPSSliderChange.bind(this));
-    document.querySelector(".right-column").style.width = Constants.ANIMATED_PREVIEW_WIDTH + 'px';
-
-    this.toggleOnionSkinEl = document.querySelector(".preview-toggle-onion-skin");
-    this.toggleOnionSkinEl.addEventListener('click', this.toggleOnionSkin_.bind(this));
-
-    pskl.app.shortcutService.addShortcut('alt+O', this.toggleOnionSkin_.bind(this));
-
-    $.subscribe(Events.FRAME_SIZE_CHANGED, this.onFrameSizeChange_.bind(this));
-    $.subscribe(Events.USER_SETTINGS_CHANGED, $.proxy(this.onUserSettingsChange_, this));
-
-    this.updateZoom_();
-    this.updateOnionSkinPreview_();
-  };
-
-  ns.AnimatedPreviewController.prototype.onUserSettingsChange_ = function (evt, name, value) {
-    if (name == pskl.UserSettings.ONION_SKIN) {
-      this.updateOnionSkinPreview_();
-    } else {
-      this.updateZoom_();
-      this.updateContainerDimensions_();
-    }
-  };
-
-  ns.AnimatedPreviewController.prototype.updateOnionSkinPreview_ = function () {
-    var enabledClassname = 'preview-toggle-onion-skin-enabled';
-    if (pskl.UserSettings.get(pskl.UserSettings.ONION_SKIN)) {
-      this.toggleOnionSkinEl.classList.add(enabledClassname);
-    } else {
-      this.toggleOnionSkinEl.classList.remove(enabledClassname);
-    }
-  };
-
-  ns.AnimatedPreviewController.prototype.updateZoom_ = function () {
-    var isTiled = pskl.UserSettings.get(pskl.UserSettings.TILED_PREVIEW);
-    var zoom = isTiled ? 1 : this.calculateZoom_();
-    this.renderer.setZoom(zoom);
-  };
-
-  ns.AnimatedPreviewController.prototype.getZoom = function () {
-    return this.calculateZoom_();
-  };
-
-  ns.AnimatedPreviewController.prototype.getCoordinates = function(x, y) {
-    var containerOffset = this.container.offset();
-    x = x - containerOffset.left;
-    y = y - containerOffset.top;
-    var zoom = this.getZoom();
-    return {
-      x : Math.floor(x / zoom),
-      y : Math.floor(y / zoom)
-    };
-  };
-
-  ns.AnimatedPreviewController.prototype.onFPSSliderChange = function (evt) {
-    this.setFPS(parseInt($("#preview-fps")[0].value, 10));
-  };
-
-  ns.AnimatedPreviewController.prototype.setFPS = function (fps) {
-    if (fps) {
-      this.fps = fps;
-      $("#preview-fps").val(this.fps);
-      $("#display-fps").html(this.fps + " FPS");
-    }
-  };
-
-  ns.AnimatedPreviewController.prototype.getFPS = function () {
-    return this.fps;
-  };
-
-  ns.AnimatedPreviewController.prototype.render = function (delta) {
-    this.elapsedTime += delta;
-    var index = Math.floor(this.elapsedTime / (1000/this.fps));
-    if (index != this.currentIndex) {
-      this.currentIndex = index;
-      if (!this.piskelController.hasFrameAt(this.currentIndex)) {
-        this.currentIndex = 0;
-        this.elapsedTime = 0;
-      }
-      var frame = this.piskelController.getFrameAt(this.currentIndex);
-      this.renderer.render(frame);
-    }
-  };
-
-  /**
-   * Calculate the preview zoom depending on the framesheet size
-   */
-  ns.AnimatedPreviewController.prototype.calculateZoom_ = function () {
-    var frame = this.piskelController.getCurrentFrame();
-    var previewSize = 200,
-      hZoom = previewSize / frame.getHeight(),
-      wZoom = previewSize / frame.getWidth();
-
-    return Math.min(hZoom, wZoom);
-  };
-
-  ns.AnimatedPreviewController.prototype.onFrameSizeChange_ = function () {
-    this.updateZoom_();
-    this.updateContainerDimensions_();
-  };
-
-  ns.AnimatedPreviewController.prototype.updateContainerDimensions_ = function () {
-    var containerEl = this.container.get(0);
-    var isTiled = pskl.UserSettings.get(pskl.UserSettings.TILED_PREVIEW);
-    var height, width;
-
-    if (isTiled) {
-      height = PREVIEW_SIZE;
-      width = PREVIEW_SIZE;
-    } else {
-      var zoom = this.getZoom();
-      var frame = this.piskelController.getCurrentFrame();
-      height = frame.getHeight() * zoom;
-      width = frame.getWidth() * zoom;
-    }
-
-    containerEl.style.height = height + "px";
-    containerEl.style.width = width + "px";
-    containerEl.style.marginTop = ((PREVIEW_SIZE - height) / 2) + "px";
-    containerEl.style.marginBottom = ((PREVIEW_SIZE - height) / 2) + "px";
-    containerEl.style.marginLeft = ((PREVIEW_SIZE - width) / 2) + "px";
-    containerEl.style.marginRight = ((PREVIEW_SIZE - width) / 2) + "px";
-  };
-
-  ns.AnimatedPreviewController.prototype.toggleOnionSkin_ = function () {
-    var currentValue = pskl.UserSettings.get(pskl.UserSettings.ONION_SKIN);
-    pskl.UserSettings.set(pskl.UserSettings.ONION_SKIN, !currentValue);
-  };
-})();

src/js/controller/CanvasBackgroundController.js

@@ -10,7 +10,6 @@
     this.updateBackgroundClass_(pskl.UserSettings.get(pskl.UserSettings.CANVAS_BACKGROUND));
   };
 
-
   ns.CanvasBackgroundController.prototype.onUserSettingsChange_ = function (evt, settingName, settingValue) {
     if (settingName == pskl.UserSettings.CANVAS_BACKGROUND) {
       this.updateBackgroundClass_(settingValue);
@@ -25,4 +24,4 @@
     this.body.classList.add(newClass);
     this.body.dataset.currentBackgroundClass = newClass;
   };
-})();
+})();

src/js/controller/CursorCoordinatesController.js

@@ -4,8 +4,10 @@
   ns.CursorCoordinatesController = function (piskelController) {
     this.piskelController = piskelController;
     this.origin = null;
-    this.coordinates = {x:-1,y:-1};
-
+    this.coordinates = {
+      x : -1,
+      y : -1
+    };
   };
 
   ns.CursorCoordinatesController.prototype.init = function () {
@@ -31,9 +33,9 @@
     if (currentFrame.containsPixel(x, y)) {
       html += x + ':' + y;
       if (this.origin) {
-        var dX = Math.abs(x-this.origin.x) + 1;
-        var dY = Math.abs(y-this.origin.y) + 1;
-        html += ' (' + dX + 'x' + dY +')';
+        var dX = Math.abs(x - this.origin.x) + 1;
+        var dY = Math.abs(y - this.origin.y) + 1;
+        html += ' (' + dX + 'x' + dY + ')';
       }
     }
 
@@ -43,7 +45,7 @@
   ns.CursorCoordinatesController.prototype.getFrameSizeHTML_ = function () {
     var w = this.piskelController.getWidth();
     var h = this.piskelController.getHeight();
-    return '['+w+'x'+h+'] ';
+    return '[' + w + 'x' + h + '] ';
   };
 
   ns.CursorCoordinatesController.prototype.onCursorMoved_ = function (event, x, y) {
@@ -60,5 +62,4 @@
     this.origin = null;
     this.redraw();
   };
-
-})();
+})();

src/js/controller/DrawingController.js

@@ -1,6 +1,6 @@
 (function () {
 
-  var ns = $.namespace("pskl.controller");
+  var ns = $.namespace('pskl.controller');
 
   ns.DrawingController = function (piskelController, paletteController, container) {
     /**
@@ -10,6 +10,8 @@
 
     this.paletteController = paletteController;
 
+    this.dragHandler = new ns.drawing.DragHandler(this);
+
     /**
      * @public
      */
@@ -20,20 +22,19 @@
      */
     this.container = container;
 
-    // TODO(vincz): Store user prefs in a localstorage string ?
-    var renderingOptions = {
-      "zoom": this.calculateZoom_(),
-      "supportGridRendering" : true,
-      "height" : this.getContainerHeight_(),
-      "width" : this.getContainerWidth_(),
-      "xOffset" : 0,
-      "yOffset" : 0
+    var cfg = {
+      'zoom': this.calculateZoom_(),
+      'supportGridRendering' : true,
+      'height' : this.getContainerHeight_(),
+      'width' : this.getContainerWidth_(),
+      'xOffset' : 0,
+      'yOffset' : 0
     };
 
-    this.overlayRenderer = new pskl.rendering.frame.CachedFrameRenderer(this.container, renderingOptions, ["canvas-overlay"]);
-    this.renderer = new pskl.rendering.frame.CachedFrameRenderer(this.container, renderingOptions, ["drawing-canvas"]);
-    this.onionSkinRenderer = new pskl.rendering.OnionSkinRenderer(this.container, renderingOptions, piskelController);
-    this.layersRenderer = new pskl.rendering.layer.LayersRenderer(this.container, renderingOptions, piskelController);
+    this.overlayRenderer = new pskl.rendering.frame.CachedFrameRenderer(this.container, cfg, ['canvas-overlay']);
+    this.renderer = new pskl.rendering.frame.CachedFrameRenderer(this.container, cfg, ['drawing-canvas']);
+    this.onionSkinRenderer = pskl.rendering.OnionSkinRenderer.createInContainer(this.container, cfg, piskelController);
+    this.layersRenderer = new pskl.rendering.layer.LayersRenderer(this.container, cfg, piskelController);
 
     this.compositeRenderer = new pskl.rendering.CompositeRenderer();
     this.compositeRenderer
@@ -62,20 +63,23 @@
     $(window).resize($.proxy(this.startResizeTimer_, this));
 
     $.subscribe(Events.USER_SETTINGS_CHANGED, $.proxy(this.onUserSettingsChange_, this));
-    $.subscribe(Events.FRAME_SIZE_CHANGED, $.proxy(this.onFrameSizeChanged_, this));
+    $.subscribe(Events.FRAME_SIZE_CHANGED, $.proxy(this.onFrameSizeChange_, this));
 
     pskl.app.shortcutService.addShortcut('0', this.resetZoom_.bind(this));
     pskl.app.shortcutService.addShortcut('+', this.increaseZoom_.bind(this, 1));
     pskl.app.shortcutService.addShortcut('-', this.decreaseZoom_.bind(this, 1));
 
-    window.setTimeout(this.afterWindowResize_.bind(this), 100);
+    window.setTimeout(function () {
+      this.afterWindowResize_();
+      this.resetZoom_();
+    }.bind(this), 100);
   };
 
   ns.DrawingController.prototype.initMouseBehavior = function() {
     var body = $('body');
     this.container.mousedown($.proxy(this.onMousedown_, this));
 
-    if (pskl.utils.UserAgent.isChrome) {
+    if (pskl.utils.UserAgent.isChrome || pskl.utils.UserAgent.isIE11) {
       this.container.on('mousewheel', $.proxy(this.onMousewheel_, this));
     } else {
       this.container.on('wheel', $.proxy(this.onMousewheel_, this));
@@ -87,6 +91,7 @@
 
     // Deactivate right click:
     body.contextmenu(this.onCanvasContextMenu_);
+
   };
 
   ns.DrawingController.prototype.startResizeTimer_ = function () {
@@ -98,6 +103,7 @@
 
   ns.DrawingController.prototype.afterWindowResize_ = function () {
     var initialWidth = this.compositeRenderer.getDisplaySize().width;
+
     this.compositeRenderer.setDisplaySize(this.getContainerWidth_(), this.getContainerHeight_());
     this.centerColumnWrapperHorizontally_();
     var ratio = this.compositeRenderer.getDisplaySize().width / initialWidth;
@@ -111,7 +117,7 @@
    * @private
    */
   ns.DrawingController.prototype.onUserSettingsChange_ = function (evt, settingsName, settingsValue) {
-    if(settingsName == pskl.UserSettings.SHOW_GRID) {
+    if (settingsName == pskl.UserSettings.SHOW_GRID) {
       console.warn('DrawingController:onUserSettingsChange_ not implemented !');
     } else if (settingsName == pskl.UserSettings.ONION_SKIN || settingsName == pskl.UserSettings.LAYER_PREVIEW) {
       this.onionSkinRenderer.clear();
@@ -122,7 +128,7 @@
     }
   };
 
-  ns.DrawingController.prototype.onFrameSizeChanged_ = function () {
+  ns.DrawingController.prototype.onFrameSizeChange_ = function () {
     this.compositeRenderer.setDisplaySize(this.getContainerWidth_(), this.getContainerHeight_());
     this.centerColumnWrapperHorizontally_();
     this.compositeRenderer.setZoom(this.calculateZoom_());
@@ -138,15 +144,14 @@
     var frame = this.piskelController.getCurrentFrame();
     var coords = this.getSpriteCoordinates(event.clientX, event.clientY);
 
-    if (event.button === Constants.MIDDLE_BUTTON) {
-      if (frame.containsPixel(coords.x, coords.y)) {
-        $.publish(Events.SELECT_PRIMARY_COLOR, [frame.getPixel(coords.x, coords.y)]);
-      }
-    } else {
-      this.isClicked = true;
-      this.setCurrentButton(event);
-      this.currentToolBehavior.hideHighlightedPixel(this.overlayFrame);
+    this.isClicked = true;
+    this.setCurrentButton(event);
 
+    if (event.button === Constants.MIDDLE_BUTTON) {
+      this.dragHandler.startDrag(event.clientX, event.clientY);
+    } else {
+      this.currentToolBehavior.hideHighlightedPixel(this.overlayFrame);
+      $.publish(Events.TOOL_PRESSED);
       this.currentToolBehavior.applyToolAt(
         coords.x,
         coords.y,
@@ -168,35 +173,12 @@
     var currentTime = new Date().getTime();
     // Throttling of the mousemove event:
 
-    if ((currentTime - this.previousMousemoveTime) > Constants.MOUSEMOVE_THROTTLING ) {
+    if ((currentTime - this.previousMousemoveTime) > Constants.MOUSEMOVE_THROTTLING) {
       this.moveTool_(this._clientX, this._clientY, event);
       this.previousMousemoveTime = currentTime;
     }
   };
 
-  ns.DrawingController.prototype.resetZoom_ = function () {
-    this.setZoom_(this.calculateZoom_());
-  };
-
-  ns.DrawingController.prototype.increaseZoom_ = function (zoomMultiplier) {
-    var step = (zoomMultiplier || 1) * this.getZoomStep_();
-    this.setZoom_(this.renderer.getZoom() + step);
-  };
-
-  ns.DrawingController.prototype.decreaseZoom_ = function (zoomMultiplier) {
-    var step = (zoomMultiplier || 1) * this.getZoomStep_();
-    this.setZoom_(this.renderer.getZoom() - step);
-  };
-
-  ns.DrawingController.prototype.getZoomStep_ = function () {
-    return this.calculateZoom_() / 10;
-  };
-
-  ns.DrawingController.prototype.setZoom_ = function (zoom) {
-    this.compositeRenderer.setZoom(zoom);
-    $.publish(Events.ZOOM_CHANGED);
-  };
-
   /**
    * @private
    */
@@ -209,19 +191,22 @@
     var currentFrame = this.piskelController.getCurrentFrame();
 
     if (this.isClicked) {
-      $.publish(Events.MOUSE_EVENT, [event, this]);
-      // Warning : do not call setCurrentButton here
-      // mousemove do not have the correct mouse button information on all browsers
-      this.currentToolBehavior.moveToolAt(
-        coords.x | 0,
-        coords.y | 0,
-        this.getCurrentColor_(),
-        currentFrame,
-        this.overlayFrame,
-        event
-      );
+      if (this.currentMouseButton_ == Constants.MIDDLE_BUTTON) {
+        this.dragHandler.updateDrag(x, y);
+      } else {
+        $.publish(Events.MOUSE_EVENT, [event, this]);
+        // Warning : do not call setCurrentButton here
+        // mousemove do not have the correct mouse button information on all browsers
+        this.currentToolBehavior.moveToolAt(
+          coords.x | 0,
+          coords.y | 0,
+          this.getCurrentColor_(),
+          currentFrame,
+          this.overlayFrame,
+          event
+        );
+      }
     } else {
-
       this.currentToolBehavior.moveUnactiveToolAt(
         coords.x,
         coords.y,
@@ -236,8 +221,16 @@
 
   ns.DrawingController.prototype.onMousewheel_ = function (jQueryEvent) {
     var event = jQueryEvent.originalEvent;
-    var delta = event.wheelDeltaY || (-2 * event.deltaY);
-    var modifier = Math.abs(delta/120);
+    // Ratio between wheelDeltaY (mousewheel event) and deltaY (wheel event) is -40
+    var delta;
+    if (pskl.utils.UserAgent.isChrome) {
+      delta = event.wheelDeltaY;
+    } else if (pskl.utils.UserAgent.isIE11) {
+      delta = event.wheelDelta;
+    } else if (pskl.utils.UserAgent.isFirefox) {
+      delta = -40 * event.deltaY;
+    }
+    var modifier = Math.abs(delta / 120);
     if (delta > 0) {
       this.increaseZoom_(modifier);
     } else if (delta < 0) {
@@ -245,11 +238,23 @@
     }
   };
 
+  ns.DrawingController.prototype.increaseZoom_ = function (zoomMultiplier) {
+    var step = (zoomMultiplier || 1) * this.getZoomStep_();
+    this.setZoom_(this.renderer.getZoom() + step);
+  };
+
+  ns.DrawingController.prototype.decreaseZoom_ = function (zoomMultiplier) {
+    var step = (zoomMultiplier || 1) * this.getZoomStep_();
+    this.setZoom_(this.renderer.getZoom() - step);
+  };
+
   /**
    * @private
    */
   ns.DrawingController.prototype.onMouseup_ = function (event) {
-    if(this.isClicked) {
+    var frame = this.piskelController.getCurrentFrame();
+    var coords = this.getSpriteCoordinates(event.clientX, event.clientY);
+    if (this.isClicked) {
       $.publish(Events.MOUSE_EVENT, [event, this]);
       // A mouse button was clicked on the drawing canvas before this mouseup event,
       // the user was probably drawing on the canvas.
@@ -259,17 +264,24 @@
       this.isClicked = false;
       this.setCurrentButton(event);
 
-      var coords = this.getSpriteCoordinates(event.clientX, event.clientY);
-      this.currentToolBehavior.releaseToolAt(
-        coords.x,
-        coords.y,
-        this.getCurrentColor_(),
-        this.piskelController.getCurrentFrame(),
-        this.overlayFrame,
-        event
-      );
+      if (event.button === Constants.MIDDLE_BUTTON) {
+        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.getCurrentColor_(),
+          this.piskelController.getCurrentFrame(),
+          this.overlayFrame,
+          event
+        );
 
-      $.publish(Events.TOOL_RELEASED);
+        $.publish(Events.TOOL_RELEASED);
+      }
     }
   };
 
@@ -301,9 +313,9 @@
     // on a mouse move event
     // This always matches a LEFT mouse button which is __really__ not helpful
 
-    if(this.currentMouseButton_ == Constants.RIGHT_BUTTON) {
+    if (this.currentMouseButton_ == Constants.RIGHT_BUTTON) {
       return this.paletteController.getSecondaryColor();
-    } else if(this.currentMouseButton_ == Constants.LEFT_BUTTON) {
+    } else if (this.currentMouseButton_ == Constants.LEFT_BUTTON) {
       return this.paletteController.getPrimaryColor();
     } else {
       return Constants.DEFAULT_PEN_COLOR;
@@ -345,10 +357,10 @@
    * @private
    */
   ns.DrawingController.prototype.calculateZoom_ = function() {
-    var frameHeight = this.piskelController.getCurrentFrame().getHeight(),
-        frameWidth = this.piskelController.getCurrentFrame().getWidth();
+    var frameHeight = this.piskelController.getCurrentFrame().getHeight();
+    var frameWidth = this.piskelController.getCurrentFrame().getWidth();
 
-    return Math.min(this.getAvailableWidth_()/frameWidth, this.getAvailableHeight_()/frameHeight);
+    return Math.min(this.getAvailableWidth_() / frameWidth, this.getAvailableHeight_() / frameHeight);
   };
 
   ns.DrawingController.prototype.getAvailableHeight_ = function () {
@@ -356,22 +368,24 @@
   };
 
   ns.DrawingController.prototype.getAvailableWidth_ = function () {
-    var leftSectionWidth = $('.left-column').outerWidth(true),
-    rightSectionWidth = $('.right-column').outerWidth(true),
-    toolsContainerWidth = $('#tool-section').outerWidth(true),
-    settingsContainerWidth = $('#application-action-section').outerWidth(true),
-    availableWidth = $('#main-wrapper').width() - leftSectionWidth - rightSectionWidth - toolsContainerWidth - settingsContainerWidth;
+    var leftSectionWidth = $('.left-column').outerWidth(true);
+    var rightSectionWidth = $('.right-column').outerWidth(true);
+    var toolsContainerWidth = $('#tool-section').outerWidth(true);
+    var settingsContainerWidth = $('#application-action-section').outerWidth(true);
+
+    var usedWidth = leftSectionWidth + rightSectionWidth + toolsContainerWidth + settingsContainerWidth;
+    var availableWidth = $('#main-wrapper').width() - usedWidth;
 
     var comfortMargin = 10;
     return availableWidth - comfortMargin;
   };
 
   ns.DrawingController.prototype.getContainerHeight_ = function () {
-    return this.calculateZoom_() * this.piskelController.getCurrentFrame().getHeight();
+    return this.getAvailableHeight_();
   };
 
   ns.DrawingController.prototype.getContainerWidth_ = function () {
-    return this.calculateZoom_() * this.piskelController.getCurrentFrame().getWidth();
+    return this.getAvailableWidth_();
   };
 
   /**
@@ -389,8 +403,26 @@
     return this.compositeRenderer;
   };
 
+  ns.DrawingController.prototype.getOffset = function () {
+    return this.compositeRenderer.getOffset();
+  };
+
   ns.DrawingController.prototype.setOffset = function (x, y) {
     this.compositeRenderer.setOffset(x, y);
     $.publish(Events.ZOOM_CHANGED);
   };
-})();
+
+  ns.DrawingController.prototype.resetZoom_ = function () {
+    this.setZoom_(this.calculateZoom_());
+  };
+
+  ns.DrawingController.prototype.getZoomStep_ = function () {
+    return this.calculateZoom_() / 10;
+  };
+
+  ns.DrawingController.prototype.setZoom_ = function (zoom) {
+    this.compositeRenderer.setZoom(zoom);
+    $.publish(Events.ZOOM_CHANGED);
+  };
+
+})();

src/js/controller/FramesListController.js

@@ -1,5 +1,5 @@
 (function () {
-  var ns = $.namespace("pskl.controller");
+  var ns = $.namespace('pskl.controller');
 
   var ACTION = {
     SELECT : 'select',
@@ -8,8 +8,7 @@
     NEW_FRAME : 'newframe'
   };
 
-  ns.PreviewFilmController = function (piskelController, container) {
-
+  ns.FramesListController = function (piskelController, container) {
     this.piskelController = piskelController;
     this.container = container;
     this.refreshZoom_();
@@ -21,7 +20,7 @@
     this.cachedFrameProcessor.setOutputCloner(this.clonePreviewCanvas_.bind(this));
   };
 
-  ns.PreviewFilmController.prototype.init = function() {
+  ns.FramesListController.prototype.init = function() {
     $.subscribe(Events.TOOL_RELEASED, this.flagForRedraw_.bind(this));
     $.subscribe(Events.PISKEL_RESET, this.flagForRedraw_.bind(this));
     $.subscribe(Events.USER_SETTINGS_CHANGED, this.flagForRedraw_.bind(this));
@@ -33,29 +32,30 @@
     this.updateScrollerOverflows();
   };
 
-  ns.PreviewFilmController.prototype.flagForRedraw_ = function () {
+  ns.FramesListController.prototype.flagForRedraw_ = function () {
     this.redrawFlag = true;
   };
 
-  ns.PreviewFilmController.prototype.refreshZoom_ = function () {
+  ns.FramesListController.prototype.refreshZoom_ = function () {
     this.zoom = this.calculateZoom_();
   };
 
-  ns.PreviewFilmController.prototype.render = function () {
+  ns.FramesListController.prototype.render = function () {
     if (this.redrawFlag) {
       this.createPreviews_();
       this.redrawFlag = false;
     }
   };
 
-  ns.PreviewFilmController.prototype.updateScrollerOverflows = function () {
+  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 overflowTop = false,
-      overflowBottom = false;
+    var overflowTop = false;
+    var overflowBottom = false;
+
     if (scrollerHeight < scrollerContentHeight) {
       if (scrollTop > treshold) {
         overflowTop = true;
@@ -70,7 +70,7 @@
     wrapper.toggleClass('bottom-overflow-visible', overflowBottom);
   };
 
-  ns.PreviewFilmController.prototype.onContainerClick_ = function (event) {
+  ns.FramesListController.prototype.onContainerClick_ = function (event) {
     var target = pskl.utils.Dom.getParentWithData(event.target, 'tileAction');
     if (!target) {
       return;
@@ -92,124 +92,128 @@
     }
   };
 
-  ns.PreviewFilmController.prototype.createPreviews_ = function () {
-
-    this.container.html("");
+  ns.FramesListController.prototype.createPreviews_ = function () {
+    this.container.html('');
     // Manually remove tooltips since mouseout events were shortcut by the DOM refresh:
-    $(".tooltip").remove();
+    $('.tooltip').remove();
 
     var frameCount = this.piskelController.getFrameCount();
 
-    for (var i = 0, l = frameCount; i < l ; i++) {
+    for (var i = 0 ; i < frameCount ; i++) {
       this.container.append(this.createPreviewTile_(i));
     }
     // Append 'new empty frame' button
-    var newFrameButton = document.createElement("div");
-    newFrameButton.id = "add-frame-action";
-    newFrameButton.className = "add-frame-action";
+    var newFrameButton = document.createElement('div');
+    newFrameButton.id = 'add-frame-action';
+    newFrameButton.className = 'add-frame-action';
     newFrameButton.setAttribute('data-tile-action', ACTION.NEW_FRAME);
-    newFrameButton.innerHTML = "<p class='label'>Add new frame</p>";
+    newFrameButton.innerHTML = '<p class="label">Add new frame</p>';
     this.container.append(newFrameButton);
 
     var needDragndropBehavior = (frameCount > 1);
-    if(needDragndropBehavior) {
+    if (needDragndropBehavior) {
       this.initDragndropBehavior_();
     }
     this.updateScrollerOverflows();
   };
 
-
   /**
    * @private
    */
-  ns.PreviewFilmController.prototype.initDragndropBehavior_ = function () {
+  ns.FramesListController.prototype.initDragndropBehavior_ = function () {
 
-    $("#preview-list").sortable({
-      placeholder: "preview-tile-drop-proxy",
+    $('#preview-list').sortable({
+      placeholder: 'preview-tile-drop-proxy',
       update: $.proxy(this.onUpdate_, this),
-      items: ".preview-tile"
+      items: '.preview-tile'
     });
-    $("#preview-list").disableSelection();
+    $('#preview-list').disableSelection();
   };
 
   /**
    * @private
    */
-  ns.PreviewFilmController.prototype.onUpdate_ = function( event, ui ) {
-    var originFrameId = parseInt(ui.item.data("tile-number"), 10);
+  ns.FramesListController.prototype.onUpdate_ = function (event, ui) {
+    var originFrameId = parseInt(ui.item.data('tile-number'), 10);
     var targetInsertionId = $('.preview-tile').index(ui.item);
 
     this.piskelController.moveFrame(originFrameId, targetInsertionId);
     this.piskelController.setCurrentFrameIndex(targetInsertionId);
   };
 
-
   /**
    * @private
    * TODO(vincz): clean this giant rendering function & remove listeners.
    */
-  ns.PreviewFilmController.prototype.createPreviewTile_ = function(tileNumber) {
+  ns.FramesListController.prototype.createPreviewTile_ = function(tileNumber) {
     var currentFrame = this.piskelController.getCurrentLayer().getFrameAt(tileNumber);
 
-    var previewTileRoot = document.createElement("li");
-    previewTileRoot.setAttribute("data-tile-number", tileNumber);
+    var previewTileRoot = document.createElement('li');
+    previewTileRoot.setAttribute('data-tile-number', tileNumber);
     previewTileRoot.setAttribute('data-tile-action', ACTION.SELECT);
-    previewTileRoot.classList.add("preview-tile");
+    previewTileRoot.classList.add('preview-tile');
     if (this.piskelController.getCurrentFrame() == currentFrame) {
-      previewTileRoot.classList.add("selected");
+      previewTileRoot.classList.add('selected');
     }
 
-    var canvasContainer = document.createElement("div");
-    canvasContainer.classList.add("canvas-container", pskl.UserSettings.get(pskl.UserSettings.CANVAS_BACKGROUND));
+    var canvasContainer = document.createElement('div');
+    canvasContainer.classList.add('canvas-container', pskl.UserSettings.get(pskl.UserSettings.CANVAS_BACKGROUND));
 
+    var height = this.zoom * this.piskelController.getCurrentFrame().getHeight();
+    var horizontalMargin = (Constants.PREVIEW_FILM_SIZE - height) / 2;
+    canvasContainer.style.marginTop = horizontalMargin + 'px';
 
-    var canvasBackground = document.createElement("div");
-    canvasBackground.className = "canvas-background";
+    var width = this.zoom * this.piskelController.getCurrentFrame().getWidth();
+    var verticalMargin = (Constants.PREVIEW_FILM_SIZE - width) / 2;
+    canvasContainer.style.marginLeft = verticalMargin + 'px';
+    canvasContainer.style.marginRight = verticalMargin + 'px';
+
+    var canvasBackground = document.createElement('div');
+    canvasBackground.className = 'canvas-background';
     canvasContainer.appendChild(canvasBackground);
 
-    var cloneFrameButton = document.createElement("button");
+    var cloneFrameButton = document.createElement('button');
     cloneFrameButton.setAttribute('rel', 'tooltip');
     cloneFrameButton.setAttribute('data-placement', 'right');
     cloneFrameButton.setAttribute('data-tile-number', tileNumber);
     cloneFrameButton.setAttribute('data-tile-action', ACTION.CLONE);
     cloneFrameButton.setAttribute('title', 'Duplicate this frame');
-    cloneFrameButton.className = "tile-overlay duplicate-frame-action";
+    cloneFrameButton.className = 'tile-overlay duplicate-frame-action';
     previewTileRoot.appendChild(cloneFrameButton);
 
-
     canvasContainer.appendChild(this.getCanvasForFrame(currentFrame));
     previewTileRoot.appendChild(canvasContainer);
 
-    if(tileNumber > 0 || this.piskelController.getFrameCount() > 1) {
+    if (tileNumber > 0 || this.piskelController.getFrameCount() > 1) {
       // Add 'remove frame' button.
-      var deleteButton = document.createElement("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";
+      deleteButton.className = 'tile-overlay delete-frame-action';
       previewTileRoot.appendChild(deleteButton);
 
       // Add 'dragndrop handle'.
-      var dndHandle = document.createElement("div");
-      dndHandle.className = "tile-overlay dnd-action";
+      var dndHandle = document.createElement('div');
+      dndHandle.className = 'tile-overlay dnd-action';
       previewTileRoot.appendChild(dndHandle);
     }
-    var tileCount = document.createElement("div");
-    tileCount.className = "tile-overlay tile-count";
+    var tileCount = document.createElement('div');
+    tileCount.className = 'tile-overlay tile-count';
     tileCount.innerHTML = tileNumber + 1;
     previewTileRoot.appendChild(tileCount);
 
     return previewTileRoot;
   };
 
-  ns.PreviewFilmController.prototype.getCanvasForFrame = function (frame) {
+  ns.FramesListController.prototype.getCanvasForFrame = function (frame) {
     var canvas = this.cachedFrameProcessor.get(frame, this.zoom);
     return canvas;
   };
 
-  ns.PreviewFilmController.prototype.frameToPreviewCanvas_ = function (frame) {
+  ns.FramesListController.prototype.frameToPreviewCanvas_ = function (frame) {
     var canvasRenderer = new pskl.rendering.CanvasRenderer(frame, this.zoom);
     canvasRenderer.drawTransparentAs(Constants.TRANSPARENT_COLOR);
     var canvas = canvasRenderer.render();
@@ -217,8 +221,8 @@
     return canvas;
   };
 
-  ns.PreviewFilmController.prototype.clonePreviewCanvas_ = function (canvas) {
-    var clone = pskl.CanvasUtils.clone(canvas);
+  ns.FramesListController.prototype.clonePreviewCanvas_ = function (canvas) {
+    var clone = pskl.utils.CanvasUtils.clone(canvas);
     clone.classList.add('tile-view', 'canvas');
     return clone;
   };
@@ -226,11 +230,10 @@
   /**
    * Calculate the preview zoom depending on the piskel size
    */
-  ns.PreviewFilmController.prototype.calculateZoom_ = function () {
-    var curFrame = this.piskelController.getCurrentFrame(),
-      frameHeight = curFrame.getHeight(),
-      frameWidth = curFrame.getWidth();
+  ns.FramesListController.prototype.calculateZoom_ = function () {
+    var frame = this.piskelController.getCurrentFrame();
+    var frameSize = Math.max(frame.getHeight(), frame.getWidth());
 
-    return Math.min(Constants.PREVIEW_FILM_SIZE/frameHeight, Constants.PREVIEW_FILM_SIZE/frameWidth);
+    return Constants.PREVIEW_FILM_SIZE / frameSize;
   };
-})();
+})();

src/js/controller/LayersListController.js

@@ -28,6 +28,31 @@
     this.layersListEl.innerHTML = '';
     var layers = this.piskelController.getLayers();
     layers.forEach(this.addLayerItem.bind(this));
+    this.updateButtonStatus_();
+  };
+
+  ns.LayersListController.prototype.updateButtonStatus_ = function () {
+    var layers = this.piskelController.getLayers();
+    var currentLayer = this.piskelController.getCurrentLayer();
+    var index = this.piskelController.getCurrentLayerIndex();
+
+    var isLast = index === 0;
+    var isOnly = layers.length === 1;
+    var isFirst = index === layers.length - 1;
+
+    this.toggleButtonDisabledState_('up', isFirst);
+    this.toggleButtonDisabledState_('down', isLast);
+    this.toggleButtonDisabledState_('merge', isLast);
+    this.toggleButtonDisabledState_('delete', isOnly);
+  };
+
+  ns.LayersListController.prototype.toggleButtonDisabledState_ = function (buttonAction, isDisabled) {
+    var button = document.querySelector('.layers-button[data-action="' + buttonAction + '"]');
+    if (isDisabled) {
+      button.setAttribute('disabled', 'disabled');
+    } else {
+      button.removeAttribute('disabled');
+    }
   };
 
   ns.LayersListController.prototype.updateToggleLayerPreview_ = function () {
@@ -64,21 +89,25 @@
     } else if (el.classList.contains('layer-item')) {
       index = el.dataset.layerIndex;
       this.piskelController.setCurrentLayerIndex(parseInt(index, 10));
-    } else if (el.classList.contains('edit-icon')) {
-      index = el.parentNode.dataset.layerIndex;
-      this.renameLayerAt_(index);
     }
   };
 
-  ns.LayersListController.prototype.renameLayerAt_ = function (index) {
-    var layer = this.piskelController.getLayerAt(index);
-    var name = window.prompt("Please enter the layer name", layer.getName());
+  ns.LayersListController.prototype.renameCurrentLayer_ = function () {
+    var layer = this.piskelController.getCurrentLayer();
+    var name = window.prompt('Please enter the layer name', layer.getName());
     if (name) {
+      var index = this.piskelController.getCurrentLayerIndex();
       this.piskelController.renameLayerAt(index, name);
       this.renderLayerList_();
     }
   };
 
+  ns.LayersListController.prototype.mergeDownCurrentLayer_ = function () {
+    var index = this.piskelController.getCurrentLayerIndex();
+    this.piskelController.mergeDownLayerAt(index);
+    this.renderLayerList_();
+  };
+
   ns.LayersListController.prototype.onButtonClick_ = function (button) {
     var action = button.getAttribute('data-action');
     if (action == 'up') {
@@ -89,6 +118,10 @@
       this.piskelController.createLayer();
     } else if (action == 'delete') {
       this.piskelController.removeCurrentLayer();
+    } else if (action == 'merge') {
+      this.mergeDownCurrentLayer_();
+    } else if (action == 'edit') {
+      this.renameCurrentLayer_();
     }
   };
 
@@ -96,4 +129,4 @@
     var currentValue = pskl.UserSettings.get(pskl.UserSettings.LAYER_PREVIEW);
     pskl.UserSettings.set(pskl.UserSettings.LAYER_PREVIEW, !currentValue);
   };
-})();
+})();

src/js/controller/MinimapController.js

@@ -1,21 +1,22 @@
 (function () {
   var ns = $.namespace('pskl.controller');
 
-  ns.MinimapController = function (piskelController, animationController, drawingController, container) {
+  ns.MinimapController = function (piskelController, previewController, drawingController, container) {
     this.piskelController = piskelController;
-    this.animationController = animationController;
+    this.previewController = previewController;
     this.drawingController = drawingController;
     this.container = container;
 
     this.isClicked = false;
+    this.isVisible = false;
   };
 
   ns.MinimapController.prototype.init = function () {
     // Create minimap DOM elements
-    this.cropFrame = document.createElement('DIV');
-    this.cropFrame.className = 'minimap-crop-frame';
-    this.cropFrame.style.display = 'none';
-    $(this.container).append(this.cropFrame);
+    this.minimapEl = document.createElement('DIV');
+    this.minimapEl.className = 'minimap-crop-frame';
+    this.minimapEl.style.display = 'none';
+    $(this.container).append(this.minimapEl);
 
     // Init mouse events
     $(this.container).mousedown(this.onMinimapMousedown_.bind(this));
@@ -26,34 +27,81 @@
   };
 
   ns.MinimapController.prototype.renderMinimap_ = function () {
-    var zoomRatio = this.getDrawingAreaZoomRatio_();
-    if (zoomRatio > 1) {
-      this.displayCropFrame_(zoomRatio, this.drawingController.getRenderer().getOffset());
+    var verticalRatio = this.getVerticalRatio_();
+    var horizontalRatio = this.getHorizontalRatio_();
+    if (verticalRatio > 1 || horizontalRatio > 1) {
+      this.displayMinimap_();
     } else {
-      this.hideCropFrame_();
+      this.hideMinimap_();
     }
   };
 
-  ns.MinimapController.prototype.displayCropFrame_ = function (ratio, offset) {
-    this.cropFrame.style.display = 'block';
-    this.cropFrame.style.top = (offset.y * this.animationController.getZoom()) +  'px';
-    this.cropFrame.style.left = (offset.x * this.animationController.getZoom()) +  'px';
-    var zoomRatio = this.getDrawingAreaZoomRatio_();
-    this.cropFrame.style.width = (this.container.width() / zoomRatio) +  'px';
-    this.cropFrame.style.height = (this.container.height() / zoomRatio) +  'px';
+  ns.MinimapController.prototype.displayMinimap_ = function () {
+    var minimapSize = this.getMinimapSize_();
+    var previewSize = this.getPreviewSize_();
 
+    var containerHeight = this.container.height();
+    var containerWidth = this.container.width();
+
+    // offset(x, y) in frame pixels
+    var offset = this.drawingController.getRenderer().getOffset();
+
+    // the preview is centered in a square container
+    // if the sprite is not a square, a margin is needed on the appropriate coordinate
+    // before adding the offset coming from the drawing area
+    var leftMargin = (containerWidth - Math.max(minimapSize.width, previewSize.width)) / 2;
+    var leftOffset = offset.x * this.previewController.getZoom();
+    var left = leftMargin + leftOffset;
+
+    var topMargin = (containerHeight - Math.max(minimapSize.height, previewSize.height)) / 2;
+    var topOffset = offset.y * this.previewController.getZoom();
+    var top = topMargin + topOffset;
+
+    this.minimapEl.style.display = 'block';
+    this.minimapEl.style.width = Math.min(minimapSize.width, containerWidth) + 'px';
+    this.minimapEl.style.height = Math.min(minimapSize.height, containerHeight) + 'px';
+    this.minimapEl.style.left = Math.max(0, left) +  'px';
+    this.minimapEl.style.top = Math.max(0, top) +  'px';
+
+    this.isVisible = true;
   };
 
-  ns.MinimapController.prototype.hideCropFrame_ = function () {
-    this.cropFrame.style.display = 'none';
+  ns.MinimapController.prototype.getMinimapSize_ = function () {
+    // Calculate the ratio to translate drawing area sizes to animated preview sizes
+    var drawingAreaZoom = this.drawingController.getRenderer().getZoom();
+    var animatedPreviewZoom = this.previewController.getZoom();
+    var ratio = drawingAreaZoom / animatedPreviewZoom;
+
+    var displaySize = this.drawingController.getRenderer().getDisplaySize();
+    var minimapWidth  = displaySize.width / ratio;
+    var minimapHeight = displaySize.height / ratio;
+
+    return {
+      width : minimapWidth,
+      height: minimapHeight
+    };
+  };
+
+  ns.MinimapController.prototype.getPreviewSize_ = function () {
+    var frame = this.piskelController.getCurrentFrame();
+    var previewWidth = frame.getWidth() * this.previewController.getZoom();
+    var previewHeight = frame.getHeight() * this.previewController.getZoom();
+
+    return {
+      width : previewWidth,
+      height: previewHeight
+    };
+  };
+
+  ns.MinimapController.prototype.hideMinimap_ = function () {
+    this.minimapEl.style.display = 'none';
+    this.isVisible = false;
   };
 
   ns.MinimapController.prototype.onMinimapMousemove_ = function (evt) {
-    if (this.isClicked) {
-      if (this.getDrawingAreaZoomRatio_() > 1) {
-        var coords = this.getCoordinatesCenteredAround_(evt.clientX, evt.clientY);
-        this.drawingController.setOffset(coords.x, coords.y);
-      }
+    if (this.isVisible && this.isClicked) {
+      var coords = this.getCoordinatesCenteredAround_(evt.clientX, evt.clientY);
+      this.drawingController.setOffset(coords.x, coords.y);
     }
   };
 
@@ -66,25 +114,35 @@
   };
 
   ns.MinimapController.prototype.getCoordinatesCenteredAround_ = function (x, y) {
-    var frameCoords = this.animationController.getCoordinates(x, y);
-    var zoomRatio = this.getDrawingAreaZoomRatio_();
+    var frameCoords = this.previewController.getCoordinates(x, y);
+
     var frameWidth = this.piskelController.getCurrentFrame().getWidth();
     var frameHeight = this.piskelController.getCurrentFrame().getHeight();
 
-    var width = frameWidth / zoomRatio;
-    var height = frameHeight / zoomRatio;
+    var width = frameWidth / this.getHorizontalRatio_();
+    var height = frameHeight / this.getVerticalRatio_();
 
     return {
-      x : frameCoords.x - (width/2),
-      y : frameCoords.y - (height/2)
+      x : frameCoords.x - (width / 2),
+      y : frameCoords.y - (height / 2)
     };
   };
 
-  ns.MinimapController.prototype.getDrawingAreaZoomRatio_ = function () {
+  ns.MinimapController.prototype.getVerticalRatio_ = function () {
     var drawingAreaZoom = this.drawingController.getRenderer().getZoom();
-    var drawingAreaFullHeight = this.piskelController.getCurrentFrame().getHeight() * drawingAreaZoom;
-    var zoomRatio = drawingAreaFullHeight / this.drawingController.getRenderer().getDisplaySize().height;
+    var frame = this.piskelController.getCurrentFrame();
+    var frameTotalHeight = frame.getHeight() * drawingAreaZoom;
+    var frameDisplayHeight = this.drawingController.getRenderer().getDisplaySize().height;
 
-    return zoomRatio;
+    return frameTotalHeight / frameDisplayHeight;
   };
-})();
+
+  ns.MinimapController.prototype.getHorizontalRatio_ = function () {
+    var drawingAreaZoom = this.drawingController.getRenderer().getZoom();
+    var frame = this.piskelController.getCurrentFrame();
+    var frameTotalWidth = frame.getWidth() * drawingAreaZoom;
+    var frameDisplayWidth = this.drawingController.getRenderer().getDisplaySize().width;
+
+    return frameTotalWidth / frameDisplayWidth;
+  };
+})();

src/js/controller/NotificationController.js

@@ -1,5 +1,5 @@
 (function () {
-  var ns = $.namespace("pskl.controller");
+  var ns = $.namespace('pskl.controller');
 
   ns.NotificationController = function () {};
 
@@ -18,22 +18,27 @@
     this.removeMessage_();
 
     var message = document.createElement('div');
-    message.id = "user-message";
-    message.className = "user-message";
+    message.id = 'user-message';
+    message.className = 'user-message';
     message.innerHTML = messageInfo.content;
-    message.innerHTML = message.innerHTML + "<div title='Close message' class='close'>x</div>";
+    message.innerHTML = message.innerHTML + '<div title="Close message" class="close">x</div>';
     document.body.appendChild(message);
-    $(message).find(".close").click($.proxy(this.removeMessage_, this));
-    if(messageInfo.behavior) {
+
+    message.querySelector('.close').addEventListener('click', this.removeMessage_.bind(this));
+    if (messageInfo.behavior) {
       messageInfo.behavior(message);
     }
+
+    if (messageInfo.hideDelay) {
+      window.setTimeout(this.removeMessage_.bind(this), messageInfo.hideDelay);
+    }
   };
 
   /**
    * @private
    */
   ns.NotificationController.prototype.removeMessage_ = function (evt) {
-    var message = $("#user-message");
+    var message = $('#user-message');
     if (message.length) {
       message.remove();
     }

src/js/controller/PaletteController.js

@@ -1,5 +1,5 @@
 (function () {
-  var ns = $.namespace("pskl.controller");
+  var ns = $.namespace('pskl.controller');
 
   ns.PaletteController = function () {
     this.primaryColor =  Constants.DEFAULT_PEN_COLOR;
@@ -50,7 +50,7 @@
    */
   ns.PaletteController.prototype.onPickerChange_ = function(evt, isPrimary) {
     var inputPicker = $(evt.target);
-    if(evt.data.isPrimary) {
+    if (evt.data.isPrimary) {
       this.setPrimaryColor(inputPicker.val());
     } else {
       this.setSecondaryColor(inputPicker.val());
@@ -62,7 +62,7 @@
    */
   ns.PaletteController.prototype.onColorSelected_ = function(args, evt, color) {
     var inputPicker = $(evt.target);
-    if(args.isPrimary) {
+    if (args.isPrimary) {
       this.setPrimaryColor(color);
     } else {
       this.setSecondaryColor(color);
@@ -114,10 +114,10 @@
       // The colorpicker can't be set to a transparent state.
       // We set its background to white and insert the
       // string "TRANSPARENT" to mimic this state:
-      colorPicker.spectrum("set", Constants.TRANSPARENT_COLOR);
+      colorPicker.spectrum('set', Constants.TRANSPARENT_COLOR);
       colorPicker.val(Constants.TRANSPARENT_COLOR);
     } else {
-      colorPicker.spectrum("set", color);
+      colorPicker.spectrum('set', color);
     }
     this.setTitleOnPicker_(color, colorPicker);
   };
@@ -127,6 +127,3 @@
     colorPicker.next(spectrumInputSelector).attr('title', title);
   };
 })();
-
-
-

src/js/controller/PalettesListController.js

@@ -10,103 +10,151 @@
   // I apologize to my future self for this one.
   var NO_SCROLL_MAX_COLORS = 20;
 
-
   ns.PalettesListController = function (paletteController, usedColorService) {
     this.usedColorService = usedColorService;
+    this.paletteService = pskl.app.paletteService;
     this.paletteController = paletteController;
   };
 
   ns.PalettesListController.prototype.init = function () {
     this.paletteColorTemplate_ = pskl.utils.Template.get('palette-color-template');
+
     this.colorListContainer_ = document.querySelector('.palettes-list-colors');
     this.colorPaletteSelect_ = document.querySelector('.palettes-list-select');
-    this.paletteListOptGroup_ = document.querySelector('.palettes-list-select-group');
+
+    var createPaletteButton_ = document.querySelector('.create-palette-button');
+    var editPaletteButton_ = document.querySelector('.edit-palette-button');
 
     this.colorPaletteSelect_.addEventListener('change', this.onPaletteSelected_.bind(this));
     this.colorListContainer_.addEventListener('mouseup', this.onColorContainerMouseup.bind(this));
     this.colorListContainer_.addEventListener('contextmenu', this.onColorContainerContextMenu.bind(this));
 
+    createPaletteButton_.addEventListener('click', this.onCreatePaletteClick_.bind(this));
+    editPaletteButton_.addEventListener('click', this.onEditPaletteClick_.bind(this));
+
     $.subscribe(Events.PALETTE_LIST_UPDATED, this.onPaletteListUpdated.bind(this));
     $.subscribe(Events.CURRENT_COLORS_UPDATED, this.fillColorListContainer.bind(this));
     $.subscribe(Events.PRIMARY_COLOR_SELECTED, this.highlightSelectedColors.bind(this));
     $.subscribe(Events.SECONDARY_COLOR_SELECTED, this.highlightSelectedColors.bind(this));
+    $.subscribe(Events.USER_SETTINGS_CHANGED, $.proxy(this.onUserSettingsChange_, this));
+
+    pskl.app.shortcutService.addShortcuts(['>', 'shift+>'], this.selectNextColor_.bind(this));
+    pskl.app.shortcutService.addShortcut('<', this.selectPreviousColor_.bind(this));
 
     this.fillPaletteList();
-    this.selectPaletteFromUserSettings();
+    this.updateFromUserSettings();
     this.fillColorListContainer();
   };
 
   ns.PalettesListController.prototype.fillPaletteList = function () {
-    var palettes = [{
-      id : Constants.NO_PALETTE_ID,
-      name : 'No palette'
-    }];
-    palettes = palettes.concat(this.retrievePalettes());
+    var palettes = this.paletteService.getPalettes();
 
     var html = palettes.map(function (palette) {
       return pskl.utils.Template.replace('<option value="{{id}}">{{name}}</option>', palette);
     }).join('');
-    this.paletteListOptGroup_.innerHTML = html;
+    this.colorPaletteSelect_.innerHTML = html;
   };
 
   ns.PalettesListController.prototype.fillColorListContainer = function () {
+
     var colors = this.getSelectedPaletteColors_();
 
-    var html = colors.map(function (color) {
-      return pskl.utils.Template.replace(this.paletteColorTemplate_, {color : color});
-    }.bind(this)).join('');
-    this.colorListContainer_.innerHTML = html;
+    if (colors.length > 0) {
+      var html = colors.map(function (color, index) {
+        return pskl.utils.Template.replace(this.paletteColorTemplate_, {color : color, index : index});
+      }.bind(this)).join('');
+      this.colorListContainer_.innerHTML = html;
 
-    this.highlightSelectedColors();
+      this.highlightSelectedColors();
 
-    var hasScrollbar = colors.length > NO_SCROLL_MAX_COLORS;
-    if (hasScrollbar && !pskl.utils.UserAgent.isChrome) {
-      this.colorListContainer_.classList.add(HAS_SCROLL_CLASSNAME);
+      var hasScrollbar = colors.length > NO_SCROLL_MAX_COLORS;
+      if (hasScrollbar && !pskl.utils.UserAgent.isChrome) {
+        this.colorListContainer_.classList.add(HAS_SCROLL_CLASSNAME);
+      } else {
+        this.colorListContainer_.classList.remove(HAS_SCROLL_CLASSNAME);
+      }
     } else {
-      this.colorListContainer_.classList.remove(HAS_SCROLL_CLASSNAME);
+      this.colorListContainer_.innerHTML = pskl.utils.Template.get('palettes-list-no-colors-partial');
     }
   };
 
+  ns.PalettesListController.prototype.selectPalette = function (paletteId) {
+    pskl.UserSettings.set(pskl.UserSettings.SELECTED_PALETTE, paletteId);
+  };
+
   ns.PalettesListController.prototype.getSelectedPaletteColors_ = function () {
     var colors = [];
-    var paletteId = this.colorPaletteSelect_.value;
-    if (paletteId === Constants.CURRENT_COLORS_PALETTE_ID) {
-      colors = this.usedColorService.getCurrentColors();
-    } else {
-      var palette = this.getPaletteById(paletteId, this.retrievePalettes());
-      if (palette) {
-        colors = palette.colors;
-      }
+    var palette = this.getSelectedPalette_();
+    if (palette) {
+      colors = palette.getColors();
     }
 
-    if (colors.length > Constants.MAX_CURRENT_COLORS_DISPLAYED) {
-      colors = colors.slice(0, Constants.MAX_CURRENT_COLORS_DISPLAYED);
+    if (colors.length > Constants.MAX_PALETTE_COLORS) {
+      colors = colors.slice(0, Constants.MAX_PALETTE_COLORS);
     }
 
     return colors;
   };
 
-  ns.PalettesListController.prototype.selectPalette = function (paletteId) {
-    this.colorPaletteSelect_.value = paletteId;
+  ns.PalettesListController.prototype.getSelectedPalette_ = function () {
+    var paletteId = pskl.UserSettings.get(pskl.UserSettings.SELECTED_PALETTE);
+    return this.paletteService.getPaletteById(paletteId);
   };
 
-  ns.PalettesListController.prototype.selectPaletteFromUserSettings = function () {
-    this.selectPalette(pskl.UserSettings.get(pskl.UserSettings.SELECTED_PALETTE));
+  ns.PalettesListController.prototype.selectNextColor_ = function () {
+    this.selectColor_(this.getCurrentColorIndex_() + 1);
+  };
+
+  ns.PalettesListController.prototype.selectPreviousColor_ = function () {
+    this.selectColor_(this.getCurrentColorIndex_() - 1);
+  };
+
+  ns.PalettesListController.prototype.getCurrentColorIndex_ = function () {
+    var currentIndex = 0;
+    var selectedColor = document.querySelector('.' + PRIMARY_COLOR_CLASSNAME);
+    if (selectedColor) {
+      currentIndex = parseInt(selectedColor.dataset.colorIndex, 10);
+    }
+    return currentIndex;
+  };
+
+  ns.PalettesListController.prototype.selectColor_ = function (index) {
+    var colors = this.getSelectedPaletteColors_();
+    var color = colors[index];
+    if (color) {
+      $.publish(Events.SELECT_PRIMARY_COLOR, [color]);
+    }
+  };
+
+  ns.PalettesListController.prototype.onUserSettingsChange_ = function (evt, name, value) {
+    if (name == pskl.UserSettings.SELECTED_PALETTE) {
+      this.updateFromUserSettings();
+    }
+  };
+
+  ns.PalettesListController.prototype.updateFromUserSettings = function () {
+    var paletteId = pskl.UserSettings.get(pskl.UserSettings.SELECTED_PALETTE);
+    this.fillColorListContainer();
+    this.colorPaletteSelect_.value = paletteId;
   };
 
   ns.PalettesListController.prototype.onPaletteSelected_ = function (evt) {
     var paletteId = this.colorPaletteSelect_.value;
-    if (paletteId === Constants.MANAGE_PALETTE_ID) {
-      $.publish(Events.DIALOG_DISPLAY, 'manage-palettes');
-      this.selectPaletteFromUserSettings();
-    } else {
-      pskl.UserSettings.set(pskl.UserSettings.SELECTED_PALETTE, paletteId);
-    }
-
-    this.fillColorListContainer();
+    this.selectPalette(paletteId);
+    this.colorPaletteSelect_.blur();
   };
 
+  ns.PalettesListController.prototype.onCreatePaletteClick_ = function (evt) {
+    $.publish(Events.DIALOG_DISPLAY, 'create-palette');
+  };
 
+  ns.PalettesListController.prototype.onEditPaletteClick_ = function (evt) {
+    var paletteId = this.colorPaletteSelect_.value;
+    $.publish(Events.DIALOG_DISPLAY, {
+      dialogId : 'create-palette',
+      initArgs : paletteId
+    });
+  };
 
   ns.PalettesListController.prototype.onColorContainerContextMenu = function (event) {
     event.preventDefault();
@@ -143,7 +191,7 @@
   };
 
   ns.PalettesListController.prototype.getColorContainer_ = function (color) {
-    return this.colorListContainer_.querySelector('.palettes-list-color[data-color="'+color+'"]');
+    return this.colorListContainer_.querySelector('.palettes-list-color[data-color="' + color + '"]');
   };
 
   ns.PalettesListController.prototype.removeClass_ = function (cssClass) {
@@ -155,24 +203,6 @@
 
   ns.PalettesListController.prototype.onPaletteListUpdated = function () {
     this.fillPaletteList();
-    this.selectPaletteFromUserSettings();
-    this.fillColorListContainer();
+    this.updateFromUserSettings();
   };
-
-  ns.PalettesListController.prototype.getPaletteById = function (paletteId, palettes) {
-    var match = null;
-
-    palettes.forEach(function (palette) {
-      if (palette.id === paletteId) {
-        match = palette;
-      }
-    });
-
-    return match;
-  };
-
-  ns.PalettesListController.prototype.retrievePalettes =  function () {
-    var palettesString = window.localStorage.getItem('piskel.palettes');
-    return JSON.parse(palettesString) || [];
-  };
-})();
+})();

src/js/controller/ProgressBarController.js

@@ -0,0 +1,61 @@
+(function () {
+  var ns = $.namespace('pskl.controller');
+
+  ns.ProgressBarController = function () {
+    this.template = pskl.utils.Template.get('progress-bar-template');
+    this.progressBar = null;
+    this.progressBarStatus = null;
+
+    this.showProgressTimer_ = 0;
+  };
+
+  ns.ProgressBarController.prototype.init = function () {
+    $.subscribe(Events.SHOW_PROGRESS, $.proxy(this.showProgress_, this));
+    $.subscribe(Events.UPDATE_PROGRESS, $.proxy(this.updateProgress_, this));
+    $.subscribe(Events.HIDE_PROGRESS, $.proxy(this.hideProgress_, this));
+  };
+
+  ns.ProgressBarController.prototype.showProgress_ = function (event, progressInfo) {
+    this.removeProgressBar_();
+    this.showProgressTimer_ = window.setTimeout(this.onTimerExpired_.bind(this, progressInfo), 300);
+  };
+
+  ns.ProgressBarController.prototype.onTimerExpired_ = function (progressInfo) {
+    var progressBarHtml = pskl.utils.Template.replace(this.template, {
+      name : progressInfo.name,
+      status : 0
+    });
+
+    var progressBarEl = pskl.utils.Template.createFromHTML(progressBarHtml);
+    document.body.appendChild(progressBarEl);
+
+    this.progressBar = document.querySelector('.progress-bar');
+    this.progressBarStatus = document.querySelector('.progress-bar-status');
+  };
+
+  ns.ProgressBarController.prototype.updateProgress_ = function (event, progressInfo) {
+    if (this.progressBar && this.progressBarStatus) {
+      var progress = progressInfo.progress;
+      var width = this.progressBar.offsetWidth;
+      var progressWidth = width - ((progress * width) / 100);
+      this.progressBar.style.backgroundPosition = (-progressWidth) + 'px 0';
+      this.progressBarStatus.innerHTML = progress + '%';
+    }
+  };
+
+  ns.ProgressBarController.prototype.hideProgress_ = function (event, progressInfo) {
+    if (this.showProgressTimer_) {
+      window.clearTimeout(this.showProgressTimer_);
+    }
+    this.removeProgressBar_();
+  };
+
+  ns.ProgressBarController.prototype.removeProgressBar_ = function () {
+    var progressBarContainer = document.querySelector('.progress-bar-container');
+    if (progressBarContainer) {
+      progressBarContainer.parentNode.removeChild(progressBarContainer);
+      this.progressBar = null;
+      this.progressBarStatus = null;
+    }
+  };
+})();

src/js/controller/ToolController.js

@@ -1,5 +1,5 @@
 (function () {
-  var ns = $.namespace("pskl.controller");
+  var ns = $.namespace('pskl.controller');
 
   ns.ToolController = function () {
     var toDescriptor = function (id, shortcut, instance) {
@@ -7,23 +7,22 @@
     };
 
     this.tools = [
-      toDescriptor('simplePen', 'P', new pskl.drawingtools.SimplePen()),
-      toDescriptor('verticalMirrorPen', 'V', new pskl.drawingtools.VerticalMirrorPen()),
-      toDescriptor('paintBucket', 'B', new pskl.drawingtools.PaintBucket()),
-      toDescriptor('colorSwap', 'A', new pskl.drawingtools.ColorSwap()),
-      toDescriptor('eraser', 'E', new pskl.drawingtools.Eraser()),
-      toDescriptor('stroke', 'L', new pskl.drawingtools.Stroke()),
-      toDescriptor('rectangle', 'R', new pskl.drawingtools.Rectangle()),
-      toDescriptor('circle', 'C', new pskl.drawingtools.Circle()),
-      toDescriptor('move', 'M', new pskl.drawingtools.Move()),
-      toDescriptor('rectangleSelect', 'S', new pskl.drawingtools.RectangleSelect()),
-      toDescriptor('shapeSelect', 'Z', new pskl.drawingtools.ShapeSelect()),
-      toDescriptor('lighten', 'U', new pskl.drawingtools.Lighten()),
-      toDescriptor('colorPicker', 'O', new pskl.drawingtools.ColorPicker())
+      toDescriptor('simplePen', 'P', new pskl.tools.drawing.SimplePen()),
+      toDescriptor('verticalMirrorPen', 'V', new pskl.tools.drawing.VerticalMirrorPen()),
+      toDescriptor('paintBucket', 'B', new pskl.tools.drawing.PaintBucket()),
+      toDescriptor('colorSwap', 'A', new pskl.tools.drawing.ColorSwap()),
+      toDescriptor('eraser', 'E', new pskl.tools.drawing.Eraser()),
+      toDescriptor('stroke', 'L', new pskl.tools.drawing.Stroke()),
+      toDescriptor('rectangle', 'R', new pskl.tools.drawing.Rectangle()),
+      toDescriptor('circle', 'C', new pskl.tools.drawing.Circle()),
+      toDescriptor('move', 'M', new pskl.tools.drawing.Move()),
+      toDescriptor('rectangleSelect', 'S', new pskl.tools.drawing.RectangleSelect()),
+      toDescriptor('shapeSelect', 'Z', new pskl.tools.drawing.ShapeSelect()),
+      toDescriptor('lighten', 'U', new pskl.tools.drawing.Lighten()),
+      toDescriptor('colorPicker', 'O', new pskl.tools.drawing.ColorPicker())
     ];
 
-    this.currentSelectedTool = this.tools[0];
-    this.previousSelectedTool = this.tools[0];
+    this.toolIconRenderer = new pskl.tools.IconMarkupRenderer();
   };
 
   /**
@@ -37,7 +36,7 @@
     // Set SimplePen as default selected tool:
     this.selectTool_(this.tools[0]);
     // Activate listener on tool panel:
-    $("#tool-section").mousedown($.proxy(this.onToolIconClicked_, this));
+    $('#tool-section').mousedown($.proxy(this.onToolIconClicked_, this));
 
     $.subscribe(Events.SELECT_TOOL, this.onSelectToolEvent_.bind(this));
   };
@@ -46,14 +45,14 @@
    * @private
    */
   ns.ToolController.prototype.activateToolOnStage_ = function(tool) {
-    var stage = $("body");
-    var previousSelectedToolClass = stage.data("selected-tool-class");
-    if(previousSelectedToolClass) {
+    var stage = $('body');
+    var previousSelectedToolClass = stage.data('selected-tool-class');
+    if (previousSelectedToolClass) {
       stage.removeClass(previousSelectedToolClass);
-      stage.removeClass(pskl.drawingtools.Move.TOOL_ID);
+      stage.removeClass(pskl.tools.drawing.Move.TOOL_ID);
     }
     stage.addClass(tool.instance.toolId);
-    stage.data("selected-tool-class", tool.instance.toolId);
+    stage.data('selected-tool-class', tool.instance.toolId);
   };
 
   ns.ToolController.prototype.onSelectToolEvent_ = function(event, toolId) {
@@ -84,9 +83,9 @@
    */
   ns.ToolController.prototype.onToolIconClicked_ = function(evt) {
     var target = $(evt.target);
-    var clickedTool = target.closest(".tool-icon");
+    var clickedTool = target.closest('.tool-icon');
 
-    if(clickedTool.length) {
+    if (clickedTool.length) {
       var toolId = clickedTool.data().toolId;
       var tool = this.getToolById_(toolId);
       if (tool) {
@@ -105,48 +104,26 @@
   };
 
   ns.ToolController.prototype.getToolById_ = function (toolId) {
-    for(var i = 0 ; i < this.tools.length ; i++) {
-      var tool = this.tools[i];
-      if (tool.instance.toolId == toolId) {
-        return tool;
-      }
-    }
-    return null;
+    return pskl.utils.Array.find(this.tools, function (tool) {
+      return tool.instance.toolId == toolId;
+    });
   };
 
   /**
    * @private
    */
   ns.ToolController.prototype.createToolsDom_ = function() {
-    var toolMarkup = '';
-    for(var i = 0 ; i < this.tools.length ; i++) {
-      toolMarkup += this.getToolMarkup_(this.tools[i]);
+    var html = '';
+    for (var i = 0 ; i < this.tools.length ; i++) {
+      var tool = this.tools[i];
+      html += this.toolIconRenderer.render(tool.instance, tool.shortcut);
     }
-    $('#tools-container').html(toolMarkup);
-  };
-
-  /**
-   * @private
-   */
-  ns.ToolController.prototype.getToolMarkup_ = function(tool) {
-    var toolId = tool.instance.toolId;
-
-    var classList = ['tool-icon', toolId];
-    if (this.currentSelectedTool == tool) {
-      classList.push('selected');
-    }
-
-    var tpl = pskl.utils.Template.get('drawing-tool-item-template');
-    return pskl.utils.Template.replace(tpl, {
-      cssclass : classList.join(' '),
-      toolid : toolId,
-      title : tool.instance.getTooltipText(tool.shortcut)
-    });
+    $('#tools-container').html(html);
   };
 
   ns.ToolController.prototype.addKeyboardShortcuts_ = function () {
-    for(var i = 0 ; i < this.tools.length ; i++) {
+    for (var i = 0 ; i < this.tools.length ; i++) {
       pskl.app.shortcutService.addShortcut(this.tools[i].shortcut, this.onKeyboardShortcut_.bind(this));
     }
   };
-})();
+})();

src/js/controller/TransformationsController.js

@@ -0,0 +1,41 @@
+(function () {
+  var ns = $.namespace('pskl.controller');
+
+  ns.TransformationsController = function () {
+
+    var toDescriptor = function (id, shortcut, instance) {
+      return {id:id, shortcut:shortcut, instance:instance};
+    };
+
+    this.tools = [
+      toDescriptor('flip', '', new pskl.tools.transform.Flip()),
+      toDescriptor('rotate', '', new pskl.tools.transform.Rotate()),
+      toDescriptor('clone', '', new pskl.tools.transform.Clone())
+    ];
+
+    this.toolIconRenderer = new pskl.tools.IconMarkupRenderer();
+  };
+
+  ns.TransformationsController.prototype.init = function () {
+    var container = document.querySelector('.transformations-container');
+    this.toolsContainer = container.querySelector('.tools-wrapper');
+    container.addEventListener('click', this.onTransformationClick.bind(this));
+    this.createToolsDom_();
+  };
+
+  ns.TransformationsController.prototype.onTransformationClick = function (evt) {
+    var toolId = evt.target.dataset.toolId;
+    this.tools.forEach(function (tool) {
+      if (tool.instance.toolId === toolId) {
+        tool.instance.apply(evt);
+      }
+    }.bind(this));
+  };
+
+  ns.TransformationsController.prototype.createToolsDom_ = function() {
+    var html = this.tools.reduce(function (p, tool) {
+      return p + this.toolIconRenderer.render(tool.instance, tool.shortcut, 'left');
+    }.bind(this), '');
+    this.toolsContainer.innerHTML = html;
+  };
+})();

src/js/controller/dialogs/AbstractDialogController.js

@@ -3,7 +3,6 @@
 
   ns.AbstractDialogController = function () {};
 
-
   ns.AbstractDialogController.prototype.init = function () {
     this.closeButton = document.querySelector('.dialog-close');
     this.closeButton.addEventListener('click', this.closeDialog.bind(this));
@@ -12,7 +11,14 @@
   ns.AbstractDialogController.prototype.destroy = function () {};
 
   ns.AbstractDialogController.prototype.closeDialog = function () {
+    this.destroy();
     $.publish(Events.DIALOG_HIDE);
   };
 
-})();
+  ns.AbstractDialogController.prototype.setTitle = function (title) {
+    var dialogTitle = document.querySelector('.dialog-title');
+    if (dialogTitle) {
+      dialogTitle.innerText = title;
+    }
+  };
+})();

src/js/controller/dialogs/BrowseLocalController.js

@@ -9,7 +9,7 @@
   ns.BrowseLocalController.prototype.init = function () {
     this.superclass.init.call(this);
 
-    this.localStorageItemTemplate_ = pskl.utils.Template.get("local-storage-item-template");
+    this.localStorageItemTemplate_ = pskl.utils.Template.get('local-storage-item-template');
 
     this.service_ = pskl.app.localStorageService;
     this.piskelList = $('.local-piskel-list');
@@ -37,7 +37,7 @@
   };
 
   ns.BrowseLocalController.prototype.fillLocalPiskelsList_ = function () {
-    var html = "";
+    var html = '';
     var keys = this.service_.getKeys();
 
     keys.sort(function (k1, k2) {
@@ -47,11 +47,11 @@
     });
 
     keys.forEach((function (key) {
-      var date = pskl.utils.DateUtils.format(key.date, "{{Y}}/{{M}}/{{D}} {{H}}:{{m}}");
+      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});
     }).bind(this));
 
     var tableBody_ = this.piskelList.get(0).tBodies[0];
     tableBody_.innerHTML = html;
   };
-})();
+})();

src/js/controller/dialogs/CreatePaletteController.js

@@ -0,0 +1,129 @@
+(function () {
+  var ns = $.namespace('pskl.controller.dialogs');
+
+  ns.CreatePaletteController = function (piskelController) {
+    this.paletteService = pskl.app.paletteService;
+    this.paletteImportService = pskl.app.paletteImportService;
+  };
+
+  pskl.utils.inherit(ns.CreatePaletteController, ns.AbstractDialogController);
+
+  ns.CreatePaletteController.prototype.init = function (paletteId) {
+    this.superclass.init.call(this);
+
+    this.hiddenFileInput = document.querySelector('.create-palette-import-input');
+    this.nameInput = document.querySelector('input[name="palette-name"]');
+
+    var buttonsContainer = document.querySelector('.create-palette-actions');
+    var deleteButton = document.querySelector('.create-palette-delete');
+    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));
+
+    buttonsContainer.addEventListener('click', this.onButtonClick_.bind(this));
+    downloadButton.addEventListener('click', this.onDownloadButtonClick_.bind(this));
+    importFileButton.addEventListener('click', this.onImportFileButtonClick_.bind(this));
+
+    var colorsListContainer = document.querySelector('.colors-container');
+    this.colorsListWidget = new pskl.widgets.ColorsList(colorsListContainer);
+
+    var palette;
+    var isCurrentColorsPalette = paletteId == Constants.CURRENT_COLORS_PALETTE_ID;
+    if (paletteId && !isCurrentColorsPalette) {
+      importFileButton.style.display = 'none';
+      this.setTitle('Edit Palette');
+
+      var paletteObject = this.paletteService.getPaletteById(paletteId);
+      palette = pskl.model.Palette.fromObject(paletteObject);
+    } else {
+      downloadButton.style.display = 'none';
+      deleteButton.style.display = 'none';
+      this.setTitle('Create Palette');
+
+      var uuid = pskl.utils.Uuid.generate();
+      if (isCurrentColorsPalette) {
+        palette = new pskl.model.Palette(uuid, 'Current colors clone', this.getCurrentColors_());
+      } else {
+        palette = new pskl.model.Palette(uuid, 'New palette', []);
+      }
+    }
+
+    this.setPalette_(palette);
+  };
+
+  ns.CreatePaletteController.prototype.getCurrentColors_ = function () {
+    var palette = this.paletteService.getPaletteById(Constants.CURRENT_COLORS_PALETTE_ID);
+    return palette.getColors();
+  };
+
+  ns.CreatePaletteController.prototype.setPalette_ = function (palette) {
+    this.palette = palette;
+    this.nameInput.value = pskl.utils.unescapeHtml(palette.name);
+    this.colorsListWidget.setColors(palette.getColors());
+  };
+
+  ns.CreatePaletteController.prototype.destroy = function () {
+    this.colorsListWidget.destroy();
+    this.nameInput = null;
+  };
+
+  ns.CreatePaletteController.prototype.onButtonClick_ = function (evt) {
+    var target = evt.target;
+    if (target.dataset.action === 'submit') {
+      this.saveAndSelectPalette_();
+    } else if (target.dataset.action === 'cancel') {
+      this.closeDialog();
+    } else if (target.dataset.action === 'delete') {
+      this.deletePalette_();
+    }
+  };
+
+  ns.CreatePaletteController.prototype.saveAndSelectPalette_ = function () {
+    this.palette.setColors(this.colorsListWidget.getColors());
+    this.paletteService.savePalette(this.palette);
+    pskl.UserSettings.set(pskl.UserSettings.SELECTED_PALETTE, this.palette.id);
+    this.closeDialog();
+  };
+
+  ns.CreatePaletteController.prototype.deletePalette_ = function () {
+    if (window.confirm('Are you sure you want to delete palette ' + this.palette.name)) {
+      this.paletteService.deletePaletteById(this.palette.id);
+      pskl.UserSettings.set(pskl.UserSettings.SELECTED_PALETTE, Constants.CURRENT_COLORS_PALETTE_ID);
+      this.closeDialog();
+    }
+  };
+
+  ns.CreatePaletteController.prototype.onDownloadButtonClick_ = function () {
+    var paletteWriter = new pskl.service.palette.PaletteGplWriter(this.palette);
+    var paletteAsString = paletteWriter.write();
+
+    pskl.utils.BlobUtils.stringToBlob(paletteAsString, function(blob) {
+      pskl.utils.FileUtils.downloadAsFile(blob, this.palette.name + '.gpl');
+    }.bind(this), 'application/json');
+  };
+
+  ns.CreatePaletteController.prototype.onImportFileButtonClick_ = function () {
+    this.hiddenFileInput.click();
+  };
+
+  ns.CreatePaletteController.prototype.onFileInputChange_ = function (evt) {
+    var files = this.hiddenFileInput.files;
+    if (files.length == 1) {
+      this.paletteImportService.read(files[0], this.setPalette_.bind(this), this.displayErrorMessage_.bind(this));
+    }
+  };
+
+  ns.CreatePaletteController.prototype.displayErrorMessage_ = function (message) {
+    message = 'Could not import palette : ' + message;
+    $.publish(Events.SHOW_NOTIFICATION, [{
+      'content' : message
+    }]);
+    window.setTimeout($.publish.bind($, Events.HIDE_NOTIFICATION), 2000);
+  };
+
+  ns.CreatePaletteController.prototype.onNameInputChange_ = function (evt) {
+    this.palette.name = pskl.utils.escapeHtml(this.nameInput.value);
+  };
+})();

src/js/controller/dialogs/DialogsController.js

@@ -2,9 +2,9 @@
   var ns = $.namespace('pskl.controller.dialogs');
 
   var dialogs = {
-    'manage-palettes' : {
-      template : 'templates/dialogs/manage-palettes.html',
-      controller : ns.PaletteManagerController
+    'create-palette' : {
+      template : 'templates/dialogs/create-palette.html',
+      controller : ns.CreatePaletteController
     },
     'browse-local' : {
       template : 'templates/dialogs/browse-local.html',
@@ -27,7 +27,8 @@
     $.subscribe(Events.DIALOG_DISPLAY, this.onDialogDisplayEvent_.bind(this));
     $.subscribe(Events.DIALOG_HIDE, this.onDialogHideEvent_.bind(this));
 
-    pskl.app.shortcutService.addShortcut('alt+P', this.onDialogDisplayEvent_.bind(this, null, 'manage-palettes'));
+    pskl.app.shortcutService.addShortcut('alt+P', this.onDialogDisplayEvent_.bind(this, null, 'create-palette'));
+
     this.dialogWrapper_.classList.add('animated');
   };
 
@@ -42,8 +43,8 @@
     if (!this.isDisplayed()) {
       var config = dialogs[dialogId];
       if (config) {
-        this.dialogContainer_.innerHTML = pskl.utils.Template.get(config.template);
         this.dialogContainer_.classList.add(dialogId);
+        this.dialogContainer_.innerHTML = pskl.utils.Template.get(config.template);
 
         var controller = new config.controller(this.piskelController);
         controller.init(initArgs);
@@ -91,4 +92,4 @@
     return this.currentDialog_ !== null;
   };
 
-})();
+})();

src/js/controller/dialogs/ImportImageController.js

@@ -28,7 +28,7 @@
     this.importImageForm = $('[name=import-image-form]');
     this.importImageForm.submit(this.onImportFormSubmit_.bind(this));
 
-    pskl.utils.FileUtils.readFile(this.file_, this.processImageSource_.bind(this));
+    pskl.utils.FileUtils.readImageFile(this.file_, this.onImageLoaded_.bind(this));
   };
 
   ns.ImportImageController.prototype.onImportFormSubmit_ = function (evt) {
@@ -47,7 +47,8 @@
     if (isNaN(value)) {
       value = 0;
     }
-    var height = this.importedImage_.height, width = this.importedImage_.width;
+    var height = this.importedImage_.height;
+    var width = this.importedImage_.width;
     if (from === 'width') {
       this.resizeHeight.val(Math.round(value * height / width));
     } else {
@@ -55,20 +56,11 @@
     }
   };
 
-  /**
-   * Create an image from the given source (url or data-url), and onload forward to onImageLoaded
-   * TODO : should be a generic utility method, should take a callback
-   * @param  {String} imageSource url or data-url, will be used as src for the image
-   */
-  ns.ImportImageController.prototype.processImageSource_ = function (imageSource) {
-    this.importedImage_ = new Image();
-    this.importedImage_.onload = this.onImageLoaded_.bind(this);
-    this.importedImage_.src = imageSource;
-  };
+  ns.ImportImageController.prototype.onImageLoaded_ = function (image) {
+    this.importedImage_ = image;
 
-  ns.ImportImageController.prototype.onImageLoaded_ = function (evt) {
-    var w = this.importedImage_.width,
-        h = this.importedImage_.height;
+    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
@@ -101,7 +93,7 @@
     } else {
       parts = [path];
     }
-    return parts[parts.length-1];
+    return parts[parts.length - 1];
   };
 
   ns.ImportImageController.prototype.importImageToPiskel_ = function () {
@@ -113,9 +105,9 @@
         });
 
         gifLoader.load({
-          success : function(){
+          success : function () {
             var images = gifLoader.getFrames().map(function (frame) {
-              return pskl.CanvasUtils.createFromImageData(frame.data);
+              return pskl.utils.CanvasUtils.createFromImageData(frame.data);
             });
             this.createPiskelFromImages_(images);
             this.closeDialog();
@@ -149,6 +141,6 @@
     var piskel = pskl.model.Piskel.fromLayers([layer], descriptor);
 
     pskl.app.piskelController.setPiskel(piskel);
-    pskl.app.animationController.setFPS(Constants.DEFAULT.FPS);
+    pskl.app.previewController.setFPS(Constants.DEFAULT.FPS);
   };
-})();
+})();

src/js/controller/dialogs/PaletteManagerController.js

@@ -1,382 +0,0 @@
-(function () {
-  var ns = $.namespace('pskl.controller.dialogs');
-
-  var tinycolor = window.tinycolor;
-
-  var SELECTED_CLASSNAME = 'selected';
-  var NEW_COLOR_CLASS = 'palette-manager-new-color';
-  var CLOSE_ICON_CLASS = 'palette-manager-delete-card';
-  var EDIT_NAME_CLASS = 'edit-icon';
-
-  ns.PaletteManagerController = function (piskelController) {
-    this.piskelController = piskelController;
-    this.palettes = this.retrieveUserPalettes();
-    this.originalPalettes = this.retrieveUserPalettes();
-    this.selectedPaletteId = null;
-
-    // Keep track of all spectrum instances created, to dispose them when closing the popup
-    this.spectrumContainers = [];
-  };
-
-  pskl.utils.inherit(ns.PaletteManagerController, ns.AbstractDialogController);
-
-  ns.PaletteManagerController.prototype.init = function () {
-    this.superclass.init.call(this);
-
-    this.palettesList = document.querySelector('.palette-manager-list');
-    this.paletteBody = document.querySelector('.palette-manager-details-body');
-    this.paletteHead = document.querySelector('.palette-manager-details-head');
-    this.createButton = document.querySelector('.palette-manager-actions-button[data-action="create"]');
-    this.saveAllButton = document.querySelector('.palette-manager-actions-button[data-action="save-all"]');
-
-    this.colorCardTemplate = pskl.utils.Template.get('palette-color-card-template');
-    this.newColorTemplate = pskl.utils.Template.get('palette-new-color-template');
-    this.paletteHeadTemplate = pskl.utils.Template.get('palette-details-head-template');
-
-    // Events
-    this.palettesList.addEventListener('click', this.onPaletteListClick.bind(this));
-    // Delegated event listener for events repeated on all cards
-    this.paletteBody.addEventListener('click', this.delegatedPaletteBodyClick.bind(this));
-    this.paletteHead.addEventListener('click', this.delegatedPaletteHeadClick.bind(this));
-    this.createButton.addEventListener('click', this.onCreateClick_.bind(this));
-    this.saveAllButton.addEventListener('click', this.saveAll.bind(this));
-
-    // Init markup
-    this.createPaletteListMarkup();
-    if (this.palettes.length > 0) {
-      this.selectPalette(this.palettes[0].id);
-    } else {
-      this.createPalette('New palette');
-    }
-  };
-
-  ns.PaletteManagerController.prototype.destroy = function () {
-    this.destroySpectrumPickers();
-  };
-
-  ns.PaletteManagerController.prototype.onCreateClick_ = function (evt) {
-    this.createPalette();
-  };
-
-  ns.PaletteManagerController.prototype.createPalette = function (name) {
-    if (!name) {
-      name = window.prompt('Please enter a name for your palette', 'New palette');
-    }
-    if (name) {
-      var palette = this.createPaletteObject(name);
-      this.palettes.push(palette);
-      this.createPaletteListMarkup();
-      this.selectPalette(palette.id);
-    }
-  };
-
-  ns.PaletteManagerController.prototype.createPaletteObject = function (name) {
-    return {
-      id : 'palette-' + Date.now() + '-' + Math.floor(Math.random()*1000),
-      name : name,
-      colors : []
-    };
-  };
-
-  ns.PaletteManagerController.prototype.redraw = function () {
-    this.createPaletteListMarkup();
-    this.selectPalette(this.selectedPaletteId);
-  };
-
-  ns.PaletteManagerController.prototype.selectPalette = function (paletteId) {
-    this.deselectCurrentPalette();
-    var paletteListItem = this.palettesList.querySelector('[data-palette-id='+paletteId+']');
-    if (paletteListItem) {
-      this.selectedPaletteId = paletteId;
-      paletteListItem.classList.add(SELECTED_CLASSNAME);
-      this.refreshPaletteDetails();
-    }
-  };
-
-  ns.PaletteManagerController.prototype.refreshPaletteDetails = function () {
-    this.createPaletteHeadMarkup();
-    this.createPaletteBodyMarkup();
-    this.initPaletteDetailsEvents();
-    this.initPaletteCardsSpectrum();
-  };
-
-  ns.PaletteManagerController.prototype.createPaletteListMarkup = function () {
-    var html = this.palettes.map(function (palette) {
-      var paletteCopy = {
-        id : palette.id,
-        name : this.isPaletteModified(palette) ? palette.name + " *" : palette.name
-      };
-      return pskl.utils.Template.replace('<li data-palette-id="{{id}}">{{name}}</li>', paletteCopy);
-    }.bind(this)).join('');
-    this.palettesList.innerHTML = html;
-  };
-
-  /**
-   * Fill the palette body container with color cards for the selected palette
-   */
-  ns.PaletteManagerController.prototype.createPaletteHeadMarkup = function () {
-    var palette = this.getSelectedPalette();
-    var dict = {
-      'name' : palette.name,
-      'save:disabled' : !this.isPaletteModified(palette),
-      'revert:disabled' : !this.isPaletteModified(palette),
-      'delete:disabled' : this.palettes.length < 2
-    };
-    var html = pskl.utils.Template.replace(this.paletteHeadTemplate, dict);
-
-    this.paletteHead.innerHTML = html;
-  };
-
-  ns.PaletteManagerController.prototype.isPaletteModified = function (palette) {
-    var isModified = false;
-    var originalPalette = this.getPaletteById(palette.id, this.originalPalettes);
-    if (originalPalette) {
-      var differentName = originalPalette.name !== palette.name;
-      var differentColors = palette.colors.join('') !== originalPalette.colors.join('');
-      isModified = differentName || differentColors;
-    } else {
-      isModified = true;
-    }
-    return isModified;
-  };
-
-  /**
-   * Fill the palette body container with color cards for the selected palette
-   */
-  ns.PaletteManagerController.prototype.createPaletteBodyMarkup = function () {
-    var palette = this.getSelectedPalette();
-
-    var html = this.getColorCardsMarkup(palette.colors);
-    html += pskl.utils.Template.replace(this.newColorTemplate, {classname : NEW_COLOR_CLASS});
-
-    this.paletteBody.innerHTML = html;
-  };
-
-  ns.PaletteManagerController.prototype.initPaletteDetailsEvents = function () {
-    // New Card click event
-    var newCard = this.paletteBody.querySelector('.' + NEW_COLOR_CLASS);
-    newCard.addEventListener('click', this.onNewCardClick.bind(this));
-
-    if (this.palettes.length < 2) {
-      var deleteButton = this.paletteHead.querySelector('.palette-manager-palette-button[data-action="delete"]');
-      deleteButton.setAttribute("disabled", "disabled");
-    }
-  };
-
-  ns.PaletteManagerController.prototype.onNewCardClick = function () {
-    var color;
-    var palette = this.getSelectedPalette();
-    if (palette && palette.colors.length > 0) {
-      color = palette.colors[palette.colors.length-1];
-    } else {
-      color = '#FFFFFF';
-    }
-    this.addColorInSelectedPalette(color);
-  };
-
-  ns.PaletteManagerController.prototype.delegatedPaletteBodyClick = function (event) {
-    var target = event.target;
-    if (target.classList.contains(CLOSE_ICON_CLASS)) {
-      var colorId = parseInt(target.parentNode.dataset.colorId, 10);
-      this.removeColorInSelectedPalette(colorId);
-    }
-  };
-
-  ns.PaletteManagerController.prototype.delegatedPaletteHeadClick = function (event) {
-    var target = event.target;
-    if (target.classList.contains(EDIT_NAME_CLASS)) {
-      this.renameSelectedPalette();
-    } else if (target.classList.contains('palette-manager-palette-button')) {
-      var action = target.dataset.action;
-      if (action === 'save') {
-        this.savePalette(this.getSelectedPalette().id);
-        this.redraw();
-      } else if (action === 'revert') {
-        this.revertChanges();
-      } else if (action === 'delete') {
-        this.deleteSelectedPalette();
-      }
-    }
-  };
-
-  ns.PaletteManagerController.prototype.getSpectrumSelector_ = function () {
-    return ':not(.' + NEW_COLOR_CLASS + ')>.palette-manager-color-square';
-  };
-
-  ns.PaletteManagerController.prototype.initPaletteCardsSpectrum = function () {
-    var oSelf = this;
-    var container = $(this.getSpectrumSelector_());
-    container.spectrum({
-      clickoutFiresChange : true,
-      showInput: true,
-      showButtons: false,
-      change : function (color) {
-        var target = this;
-        var colorId = parseInt(target.parentNode.dataset.colorId, 10);
-        oSelf.updateColorInSelectedPalette(colorId, color);
-      },
-      beforeShow : function() {
-        var target = this;
-        var colorId = parseInt(target.parentNode.dataset.colorId, 10);
-        var palette = oSelf.getSelectedPalette();
-        var color = palette.colors[colorId];
-        container.spectrum("set", color);
-      }
-    });
-
-    this.spectrumContainers.push(container);
-  };
-
-  /**
-   * Destroy all spectrum instances generated by the palette manager
-   */
-  ns.PaletteManagerController.prototype.destroySpectrumPickers = function () {
-    this.spectrumContainers.forEach(function (container) {
-      container.spectrum("destroy");
-    });
-    this.spectrumContainers = [];
-  };
-
-  ns.PaletteManagerController.prototype.updateColorInSelectedPalette = function (colorId, color) {
-    var palette = this.getSelectedPalette();
-    var hexColor = '#' + (color.toHex().toUpperCase());
-    palette.colors.splice(colorId, 1, hexColor);
-
-    this.redraw();
-  };
-
-  ns.PaletteManagerController.prototype.addColorInSelectedPalette = function (color) {
-    var selectedPalette = this.getSelectedPalette();
-    selectedPalette.colors.push(color);
-
-    this.redraw();
-  };
-
-  ns.PaletteManagerController.prototype.removeColorInSelectedPalette = function (colorId) {
-    var palette = this.getSelectedPalette();
-    palette.colors.splice(colorId, 1);
-
-    this.redraw();
-  };
-
-  ns.PaletteManagerController.prototype.renameSelectedPalette = function () {
-    var palette = this.getSelectedPalette();
-    var name = window.prompt('Please enter a new name for palette "' + palette.name + '"', palette.name);
-    if (name) {
-      palette.name = name;
-      this.redraw();
-    }
-  };
-
-  ns.PaletteManagerController.prototype.getSelectedPalette = function () {
-    return this.getPaletteById(this.selectedPaletteId, this.palettes);
-  };
-
-  ns.PaletteManagerController.prototype.getColorCardsMarkup = function (colors) {
-    var html = colors.map(function (color, index) {
-      var dict = {
-        colorId : index,
-        hex : color,
-        rgb : tinycolor(color).toRgbString(),
-        hsl :  tinycolor(color).toHslString()
-      };
-      return pskl.utils.Template.replace(this.colorCardTemplate, dict);
-    }.bind(this)).join('');
-    return html;
-  };
-
-  ns.PaletteManagerController.prototype.getPaletteById = function (paletteId, palettes) {
-    var match = null;
-
-    palettes.forEach(function (palette) {
-      if (palette.id === paletteId) {
-        match = palette;
-      }
-    });
-
-    return match;
-  };
-
-  ns.PaletteManagerController.prototype.removePaletteById = function (paletteId, palettes) {
-    var palette = this.getPaletteById(paletteId, palettes);
-    if (palette) {
-      var index = palettes.indexOf(palette);
-      palettes.splice(index, 1);
-    }
-  };
-
-  ns.PaletteManagerController.prototype.deselectCurrentPalette = function () {
-    var selectedItem = this.palettesList.querySelector('.' + SELECTED_CLASSNAME);
-    if (selectedItem) {
-      this.selectedPaletteId = null;
-      selectedItem.classList.remove(SELECTED_CLASSNAME);
-    }
-  };
-
-  ns.PaletteManagerController.prototype.revertChanges = function () {
-    var palette = this.getSelectedPalette();
-    var originalPalette = this.getPaletteById(palette.id, this.originalPalettes);
-    palette.name = originalPalette.name;
-    palette.colors = originalPalette.colors.slice(0);
-
-    this.redraw();
-  };
-
-  ns.PaletteManagerController.prototype.deleteSelectedPalette = function () {
-    var palette = this.getSelectedPalette();
-    if (this.palettes.length > 1) {
-      if (window.confirm('Are you sure you want to delete "' + palette.name + '" ?')) {
-        this.removePaletteById(palette.id, this.palettes);
-        this.removePaletteById(palette.id, this.originalPalettes);
-
-        this.persistToLocalStorage();
-
-        this.createPaletteListMarkup();
-        this.selectPalette(this.palettes[0].id);
-      }
-    }
-  };
-
-  ns.PaletteManagerController.prototype.onPaletteListClick = function (event) {
-    var target = event.target;
-    if (target.dataset.paletteId) {
-      this.selectPalette(target.dataset.paletteId);
-    }
-  };
-
-  ns.PaletteManagerController.prototype.saveAll = function () {
-    this.palettes.forEach(function (palette) {
-      this.savePalette(palette.id);
-    }.bind(this));
-
-    this.redraw();
-  };
-
-  ns.PaletteManagerController.prototype.savePalette = function (paletteId) {
-    var palette = this.getPaletteById(paletteId, this.palettes);
-    var originalPalette = this.getPaletteById(paletteId, this.originalPalettes);
-    if (originalPalette) {
-      originalPalette.name = palette.name;
-      originalPalette.colors = palette.colors;
-    } else {
-      this.originalPalettes.push(palette);
-    }
-
-    this.persistToLocalStorage();
-
-    $.publish(Events.SHOW_NOTIFICATION, [{"content": "Palette " + palette.name + " successfully saved !"}]);
-    window.setTimeout($.publish.bind($, Events.HIDE_NOTIFICATION), 2000);
-  };
-
-  ns.PaletteManagerController.prototype.persistToLocalStorage = function () {
-    window.localStorage.setItem('piskel.palettes', JSON.stringify(this.originalPalettes));
-    this.originalPalettes = this.retrieveUserPalettes();
-    $.publish(Events.PALETTE_LIST_UPDATED);
-  };
-
-  ns.PaletteManagerController.prototype.retrieveUserPalettes = function () {
-    var palettesString = window.localStorage.getItem('piskel.palettes');
-    return JSON.parse(palettesString) || [];
-  };
-
-})();

src/js/controller/drawing/DragHandler.js

@@ -0,0 +1,84 @@
+(function () {
+  var ns = $.namespace('pskl.controller.drawing');
+
+  /**
+   * Multiplier applied between the mouse movement and viewport movement
+   * @type {Number}
+   */
+  var MULTIPLIER = 2;
+
+  /**
+   * Dedicated handler to drag the drawing canvas using the mouse
+   * Will store the initial coordinates as well as the status of the drag
+   * @param {DrawingController} drawingController
+   */
+  ns.DragHandler = function (drawingController) {
+    this.drawingController = drawingController;
+
+    this.isDragging_ = false;
+    this.updateOrigin_(-1, -1);
+  };
+
+  /**
+   * Initialize a drag session.
+   * @param {Number} x : x coordinate of the mouse event that initiated the drag
+   * @param {Number} y : y coordinate of the mouse event that initiated the drag
+   */
+  ns.DragHandler.prototype.startDrag = function (x, y) {
+    var coords = this.drawingController.getSpriteCoordinates(x, y);
+    this.updateOrigin_(coords.x, coords.y);
+  };
+
+  /**
+   * Update the drag status
+   * @param {Number} x : x coordinate of the mouse event that triggered the update
+   * @param {Number} y : y coordinate of the mouse event that triggered the update
+   */
+  ns.DragHandler.prototype.updateDrag = function (x, y) {
+    var currentOffset = this.drawingController.getOffset();
+    var offset = this.calculateOffset_(x, y);
+    if (currentOffset.y !== offset.y || currentOffset.x !== offset.x) {
+      this.isDragging_ = true;
+      this.drawingController.setOffset(offset.x, offset.y);
+
+      // retrieve the updated coordinates after moving the sprite
+      // and store them as the new drag origin
+      var coords = this.drawingController.getSpriteCoordinates(x, y);
+      this.updateOrigin_(coords.x, coords.y);
+    }
+  };
+
+  /**
+   * Stop the drag session
+   */
+  ns.DragHandler.prototype.stopDrag = function () {
+    this.isDragging_ = false;
+    this.origin = null;
+  };
+
+  /**
+   * Will return true if the drag handler effectively MOVED the offset
+   * during the current drag session
+   */
+  ns.DragHandler.prototype.isDragging = function () {
+    return this.isDragging_;
+  };
+
+  ns.DragHandler.prototype.calculateOffset_ = function (x, y) {
+    var coords = this.drawingController.getSpriteCoordinates(x, y);
+    var currentOffset = this.drawingController.getOffset();
+
+    var offset = {
+      x : currentOffset.x - MULTIPLIER * (coords.x - this.origin.x),
+      y : currentOffset.y - MULTIPLIER * (coords.y - this.origin.y)
+    };
+
+    return offset;
+  };
+
+  ns.DragHandler.prototype.updateOrigin_ = function (x, y) {
+    this.origin = this.origin || {};
+    this.origin.x = x;
+    this.origin.y = y;
+  };
+})();

src/js/controller/piskel/PiskelController.js

@@ -38,12 +38,12 @@
   /**
    * TODO : this should be removed
    * FPS should be stored in the Piskel model and not in the
-   * animationController
+   * 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.animationController.getFPS();
+    return pskl.app.previewController.getFPS();
   };
 
   ns.PiskelController.prototype.getLayers = function () {
@@ -78,7 +78,6 @@
     return layer.getFrameAt(this.currentFrameIndex);
   };
 
-
   ns.PiskelController.prototype.getCurrentLayerIndex = function () {
     return this.currentLayerIndex;
   };
@@ -125,7 +124,8 @@
   };
 
   ns.PiskelController.prototype.createEmptyFrame_ = function () {
-    var w = this.piskel.getWidth(), h = this.piskel.getHeight();
+    var w = this.piskel.getWidth();
+    var h = this.piskel.getHeight();
     return new pskl.model.Frame(w, h);
   };
 
@@ -147,7 +147,7 @@
     this.getLayers().forEach(function (l) {
       l.duplicateFrameAt(index);
     });
-    this.setCurrentFrameIndex(index+1);
+    this.setCurrentFrameIndex(index + 1);
   };
 
   ns.PiskelController.prototype.moveFrame = function (fromIndex, toIndex) {
@@ -158,7 +158,7 @@
 
   ns.PiskelController.prototype.getFrameCount = function () {
     var layer = this.piskel.getLayerAt(0);
-    return layer.length();
+    return layer.size();
   };
 
   ns.PiskelController.prototype.setCurrentFrameIndex = function (index) {
@@ -205,11 +205,23 @@
     }
   };
 
+  ns.PiskelController.prototype.mergeDownLayerAt = function (index) {
+    var layer = this.getLayerByIndex(index);
+    var downLayer = this.getLayerByIndex(index - 1);
+    if (layer && downLayer) {
+      var mergedLayer = pskl.utils.LayerUtils.mergeLayers(layer, downLayer);
+      this.removeLayerAt(index);
+      this.piskel.addLayerAt(mergedLayer, index);
+      this.removeLayerAt(index - 1);
+      this.selectLayer(mergedLayer);
+    }
+  };
+
   ns.PiskelController.prototype.generateLayerName_ = function () {
-    var name = "Layer " + this.layerIdCounter;
+    var name = 'Layer ' + this.layerIdCounter;
     while (this.hasLayerForName_(name)) {
       this.layerIdCounter++;
-      name = "Layer " + this.layerIdCounter;
+      name = 'Layer ' + this.layerIdCounter;
     }
     return name;
   };
@@ -247,6 +259,11 @@
     this.selectLayer(layer);
   };
 
+  ns.PiskelController.prototype.removeCurrentLayer = function () {
+    var currentLayerIndex = this.getCurrentLayerIndex();
+    this.removeLayerAt(currentLayerIndex);
+  };
+
   ns.PiskelController.prototype.removeLayerAt = function (index) {
     if (this.getLayers().length > 1) {
       var layer = this.getLayerAt(index);
@@ -260,4 +277,4 @@
   ns.PiskelController.prototype.serialize = function (expanded) {
     return pskl.utils.Serializer.serializePiskel(this.piskel, expanded);
   };
-})();
+})();

src/js/controller/piskel/PublicPiskelController.js

@@ -7,6 +7,29 @@
   };
 
   ns.PublicPiskelController.prototype.init = function () {
+    // DECORATED WITH RESET
+    this.resetWrap_('setCurrentFrameIndex');
+    this.resetWrap_('selectNextFrame');
+    this.resetWrap_('selectPreviousFrame');
+    this.resetWrap_('setCurrentLayerIndex');
+    this.resetWrap_('selectLayer');
+    // DECORATED WITH SAVE, NO RESET
+    this.saveWrap_('renameLayerAt', false);
+    // DECORATED WITH SAVE, WITH RESET
+    this.saveWrap_('removeCurrentLayer', true);
+    this.saveWrap_('addFrame', true);
+    this.saveWrap_('addFrameAtCurrentIndex', true);
+    this.saveWrap_('addFrameAt', true);
+    this.saveWrap_('removeFrameAt', true);
+    this.saveWrap_('duplicateCurrentFrame', true);
+    this.saveWrap_('duplicateFrameAt', true);
+    this.saveWrap_('moveFrame', true);
+    this.saveWrap_('createLayer', true);
+    this.saveWrap_('mergeDownLayerAt', true);
+    this.saveWrap_('moveLayerUp', true);
+    this.saveWrap_('moveLayerDown', true);
+    this.saveWrap_('removeCurrentLayer', true);
+
     pskl.app.shortcutService.addShortcut('up', this.selectPreviousFrame.bind(this));
     pskl.app.shortcutService.addShortcut('down', this.selectNextFrame.bind(this));
     pskl.app.shortcutService.addShortcut('n', this.addFrameAtCurrentIndex.bind(this));
@@ -23,122 +46,55 @@
     });
   };
 
-  ns.PublicPiskelController.prototype.addFrame = function () {
-    this.addFrameAt(this.getFrameCount());
+  ns.PublicPiskelController.prototype.resetWrap_ = function (methodName) {
+    this[methodName] = function () {
+      this.piskelController[methodName].apply(this.piskelController, arguments);
+      $.publish(Events.PISKEL_RESET);
+    };
   };
 
-  ns.PublicPiskelController.prototype.addFrameAtCurrentIndex = function () {
-    this.addFrameAt(this.getCurrentFrameIndex());
+  ns.PublicPiskelController.prototype.saveWrap_ = function (methodName, reset) {
+    this[methodName] = reset ? function () {
+      var stateInfo = this.getStateInfo_();
+      this.piskelController[methodName].apply(this.piskelController, arguments);
+      this.raiseSaveStateEvent_(this.piskelController[methodName], arguments, stateInfo);
+      $.publish(Events.PISKEL_RESET);
+    } : function () {
+      var stateInfo = this.getStateInfo_();
+      this.piskelController[methodName].apply(this.piskelController, arguments);
+      this.raiseSaveStateEvent_(this.piskelController[methodName], arguments, stateInfo);
+    };
   };
 
-  ns.PublicPiskelController.prototype.addFrameAt = function (index) {
-    this.raiseSaveStateEvent_(this.piskelController.addFrameAt, [index]);
-    this.piskelController.addFrameAt(index);
-    $.publish(Events.PISKEL_RESET);
+  ns.PublicPiskelController.prototype.getStateInfo_ = function () {
+    var stateInfo = {
+      frameIndex : this.piskelController.currentFrameIndex,
+      layerIndex : this.piskelController.currentLayerIndex
+    };
+    return stateInfo;
   };
 
-  ns.PublicPiskelController.prototype.removeFrameAt = function (index) {
-    this.raiseSaveStateEvent_(this.piskelController.removeFrameAt, [index]);
-    this.piskelController.removeFrameAt(index);
-    $.publish(Events.PISKEL_RESET);
+  ns.PublicPiskelController.prototype.raiseSaveStateEvent_ = function (fn, args, stateInfo) {
+    $.publish(Events.PISKEL_SAVE_STATE, {
+      type : pskl.service.HistoryService.REPLAY,
+      scope : this,
+      replay : {
+        fn : fn,
+        args : args
+      },
+      state : stateInfo
+    });
   };
 
-  ns.PublicPiskelController.prototype.duplicateCurrentFrame = function () {
-    this.duplicateFrameAt(this.getCurrentFrameIndex());
+  ns.PublicPiskelController.prototype.setSavePath = function (savePath) {
+    this.piskelController.piskel.savePath = savePath;
+  };
+
+  ns.PublicPiskelController.prototype.getSavePath = function () {
+    return this.piskelController.piskel.savePath;
   };
 
   ns.PublicPiskelController.prototype.replay = function (frame, replayData) {
     replayData.fn.apply(this.piskelController, replayData.args);
   };
-
-  ns.PublicPiskelController.prototype.duplicateFrameAt = function (index) {
-    this.raiseSaveStateEvent_(this.piskelController.duplicateFrameAt, [index]);
-    this.piskelController.duplicateFrameAt(index);
-    $.publish(Events.PISKEL_RESET);
-  };
-
-  ns.PublicPiskelController.prototype.moveFrame = function (fromIndex, toIndex) {
-    this.raiseSaveStateEvent_(this.piskelController.moveFrame, [fromIndex, toIndex]);
-    this.piskelController.moveFrame(fromIndex, toIndex);
-    $.publish(Events.PISKEL_RESET);
-  };
-
-  ns.PublicPiskelController.prototype.setCurrentFrameIndex = function (index) {
-    this.piskelController.setCurrentFrameIndex(index);
-    $.publish(Events.PISKEL_RESET);
-  };
-
-  ns.PublicPiskelController.prototype.selectNextFrame = function () {
-    this.piskelController.selectNextFrame();
-    $.publish(Events.PISKEL_RESET);
-  };
-
-  ns.PublicPiskelController.prototype.selectPreviousFrame = function () {
-    this.piskelController.selectPreviousFrame();
-    $.publish(Events.PISKEL_RESET);
-  };
-
-  ns.PublicPiskelController.prototype.setCurrentLayerIndex = function (index) {
-    this.piskelController.setCurrentLayerIndex(index);
-    $.publish(Events.PISKEL_RESET);
-  };
-
-  ns.PublicPiskelController.prototype.selectLayer = function (layer) {
-    this.piskelController.selectLayer(layer);
-    $.publish(Events.PISKEL_RESET);
-  };
-
-  ns.PublicPiskelController.prototype.renameLayerAt = function (index, name) {
-    this.raiseSaveStateEvent_(this.piskelController.renameLayerAt, [index, name]);
-    this.piskelController.renameLayerAt(index, name);
-  };
-
-  ns.PublicPiskelController.prototype.createLayer = function (name) {
-    this.raiseSaveStateEvent_(this.piskelController.createLayer, [name]);
-    this.piskelController.createLayer(name);
-    $.publish(Events.PISKEL_RESET);
-  };
-
-  ns.PublicPiskelController.prototype.moveLayerUp = function () {
-    this.raiseSaveStateEvent_(this.piskelController.moveLayerUp, []);
-    this.piskelController.moveLayerUp();
-    $.publish(Events.PISKEL_RESET);
-  };
-
-  ns.PublicPiskelController.prototype.moveLayerDown = function () {
-    this.raiseSaveStateEvent_(this.piskelController.moveLayerDown, []);
-    this.piskelController.moveLayerDown();
-    $.publish(Events.PISKEL_RESET);
-  };
-
-  ns.PublicPiskelController.prototype.removeCurrentLayer = function () {
-    var currentLayerIndex = this.getCurrentLayerIndex();
-    this.raiseSaveStateEvent_(this.piskelController.removeLayerAt, [currentLayerIndex]);
-    this.piskelController.removeLayerAt(currentLayerIndex);
-    $.publish(Events.PISKEL_RESET);
-  };
-
-  ns.PublicPiskelController.prototype.getCurrentLayerIndex = function () {
-    return this.piskelController.getCurrentLayerIndex();
-  };
-
-  ns.PublicPiskelController.prototype.getCurrentFrameIndex = function () {
-    return this.piskelController.currentFrameIndex;
-  };
-
-  ns.PublicPiskelController.prototype.getPiskel = function () {
-    return this.piskelController.piskel;
-  };
-
-  ns.PublicPiskelController.prototype.raiseSaveStateEvent_ = function (fn, args) {
-    $.publish(Events.PISKEL_SAVE_STATE, {
-      type : pskl.service.HistoryService.REPLAY_NO_SNAPSHOT,
-      scope : this,
-      replay : {
-        fn : fn,
-        args : args
-      }
-    });
-  };
-
-})();
+})();

src/js/controller/preview/PopupPreviewController.js

@@ -0,0 +1,87 @@
+(function () {
+  var ns = $.namespace('pskl.controller.preview');
+
+  var POPUP_TITLE = 'Piskel - preview';
+
+  ns.PopupPreviewController = function (piskelController) {
+    this.piskelController = piskelController;
+    this.popup = null;
+    this.renderer = null;
+    this.renderFlag = false;
+  };
+
+  ns.PopupPreviewController.prototype.init = function () {
+    pskl.utils.Event.addEventListener(window, 'unload', this.onMainWindowUnload_, this);
+  };
+
+  ns.PopupPreviewController.prototype.isOpen = function () {
+    return !!this.popup;
+  };
+
+  ns.PopupPreviewController.prototype.open = function () {
+    if (!this.isOpen()) {
+      this.popup = window.open('about:blank', '', 'width=320,height=320');
+      window.setTimeout(this.onPopupLoaded.bind(this), 500);
+    } else {
+      this.popup.focus();
+    }
+  };
+
+  ns.PopupPreviewController.prototype.onPopupLoaded = function () {
+    this.popup.document.title = POPUP_TITLE;
+    this.popup.document.body.innerHTML = pskl.utils.Template.get('popup-preview-partial');
+    pskl.utils.Event.addEventListener(this.popup, 'resize', this.onWindowResize_, this);
+    pskl.utils.Event.addEventListener(this.popup, 'unload', this.onPopupClosed_, this);
+    var container = this.popup.document.querySelector('.preview-container');
+    this.renderer = new pskl.rendering.frame.TiledFrameRenderer($(container));
+    this.updateZoom_();
+    this.renderFlag = true;
+  };
+
+  ns.PopupPreviewController.prototype.render = function (frame) {
+    if (this.isOpen() && this.renderer) {
+      this.renderer.render(frame);
+      this.renderFlag = false;
+    }
+  };
+
+  ns.PopupPreviewController.prototype.onWindowResize_ = function (frame) {
+    this.updateZoom_();
+    this.renderFlag = true;
+  };
+
+  ns.PopupPreviewController.prototype.updateZoom_ = function () {
+    var documentElement = this.popup.document.documentElement;
+    var wZoom = documentElement.clientWidth / this.piskelController.getWidth();
+    var hZoom = documentElement.clientHeight / this.piskelController.getHeight();
+    var zoom = Math.min(wZoom, hZoom);
+
+    this.renderer.setZoom(zoom);
+
+    var height = this.piskelController.getHeight() * zoom;
+    var width = this.piskelController.getWidth() * zoom;
+
+    var container = this.popup.document.querySelector('.preview-container');
+    container.style.height = height + 'px';
+    container.style.width = width + 'px';
+
+    var horizontalMargin = (documentElement.clientHeight - height) / 2;
+    container.style.marginTop = horizontalMargin + 'px';
+    container.style.marginBottom = horizontalMargin + 'px';
+
+    var verticalMargin = (documentElement.clientWidth - width) / 2;
+    container.style.marginLeft = verticalMargin + 'px';
+    container.style.marginRight = verticalMargin + 'px';
+  };
+
+  ns.PopupPreviewController.prototype.onPopupClosed_ = function () {
+    var popup = this.popup;
+    this.popup = null;
+  };
+
+  ns.PopupPreviewController.prototype.onMainWindowUnload_ = function () {
+    if (this.isOpen()) {
+      this.popup.close();
+    }
+  };
+})();

src/js/controller/preview/PreviewController.js

@@ -0,0 +1,209 @@
+(function () {
+  var ns = $.namespace('pskl.controller.preview');
+
+  // Preview is a square of PREVIEW_SIZE x PREVIEW_SIZE
+  var PREVIEW_SIZE = 200;
+
+  ns.PreviewController = function (piskelController, container) {
+    this.piskelController = piskelController;
+    this.container = container;
+
+    this.elapsedTime = 0;
+    this.currentIndex = 0;
+
+    this.renderFlag = true;
+
+    this.fpsRangeInput = $('#preview-fps');
+    this.fpsCounterDisplay = $('#display-fps');
+
+    this.setFPS(Constants.DEFAULT.FPS);
+
+    var frame = this.piskelController.getCurrentFrame();
+
+    this.renderer = new pskl.rendering.frame.TiledFrameRenderer(this.container);
+    this.popupPreviewController = new ns.PopupPreviewController(piskelController);
+  };
+
+  ns.PreviewController.prototype.init = function () {
+    // the oninput event won't work on IE10 unfortunately, but at least will provide a
+    // consistent behavior across all other browsers that support the input type range
+    // see https://bugzilla.mozilla.org/show_bug.cgi?id=853670
+    this.fpsRangeInput.on('input change', this.onFPSSliderChange.bind(this));
+    document.querySelector('.right-column').style.width = Constants.ANIMATED_PREVIEW_WIDTH + 'px';
+
+    this.toggleOnionSkinEl = document.querySelector('.preview-toggle-onion-skin');
+    this.toggleOnionSkinEl.addEventListener('click', this.toggleOnionSkin_.bind(this));
+
+    pskl.utils.Event.addEventListener('.open-popup-preview-button', 'click', this.onOpenPopupPreviewClick_, this);
+
+    pskl.app.shortcutService.addShortcut('alt+O', this.toggleOnionSkin_.bind(this));
+
+    $.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.PISKEL_RESET, this.setRenderFlag_.bind(this, true));
+
+    this.popupPreviewController.init();
+
+    this.updateZoom_();
+    this.updateOnionSkinPreview_();
+    this.updateMaxFPS_();
+    this.updateContainerDimensions_();
+  };
+
+  ns.PreviewController.prototype.onOpenPopupPreviewClick_ = function () {
+    this.popupPreviewController.open();
+  };
+
+  ns.PreviewController.prototype.onUserSettingsChange_ = function (evt, name, value) {
+    if (name == pskl.UserSettings.ONION_SKIN) {
+      this.updateOnionSkinPreview_();
+    } else if (name == pskl.UserSettings.MAX_FPS) {
+      this.updateMaxFPS_();
+    } else {
+      this.updateZoom_();
+      this.updateContainerDimensions_();
+    }
+  };
+
+  ns.PreviewController.prototype.updateOnionSkinPreview_ = function () {
+    var enabledClassname = 'preview-toggle-onion-skin-enabled';
+    if (pskl.UserSettings.get(pskl.UserSettings.ONION_SKIN)) {
+      this.toggleOnionSkinEl.classList.add(enabledClassname);
+    } else {
+      this.toggleOnionSkinEl.classList.remove(enabledClassname);
+    }
+  };
+
+  ns.PreviewController.prototype.updateMaxFPS_ = function () {
+    var maxFps = pskl.UserSettings.get(pskl.UserSettings.MAX_FPS);
+    this.fpsRangeInput.get(0).setAttribute('max', maxFps);
+    this.setFPS(Math.min(this.fps, maxFps));
+  };
+
+  ns.PreviewController.prototype.updateZoom_ = function () {
+    var isTiled = pskl.UserSettings.get(pskl.UserSettings.TILED_PREVIEW);
+    var zoom = isTiled ? 1 : this.calculateZoom_();
+    this.renderer.setZoom(zoom);
+    this.setRenderFlag_(true);
+  };
+
+  ns.PreviewController.prototype.getZoom = function () {
+    return this.calculateZoom_();
+  };
+
+  ns.PreviewController.prototype.getCoordinates = function(x, y) {
+    var containerOffset = this.container.offset();
+    x = x - containerOffset.left;
+    y = y - containerOffset.top;
+    var zoom = this.getZoom();
+    return {
+      x : Math.floor(x / zoom),
+      y : Math.floor(y / zoom)
+    };
+  };
+
+  ns.PreviewController.prototype.onFPSSliderChange = function (evt) {
+    this.setFPS(parseInt(this.fpsRangeInput[0].value, 10));
+
+  };
+
+  ns.PreviewController.prototype.setFPS = function (fps) {
+    if (typeof fps === 'number') {
+      this.fps = fps;
+      // reset
+      this.fpsRangeInput.get(0).value = 0;
+      // set proper value
+      this.fpsRangeInput.get(0).value = this.fps;
+      this.fpsRangeInput.blur();
+      this.fpsCounterDisplay.html(this.fps + ' FPS');
+    }
+  };
+
+  ns.PreviewController.prototype.getFPS = function () {
+    return this.fps;
+  };
+
+  ns.PreviewController.prototype.render = function (delta) {
+    this.elapsedTime += delta;
+    var index = this.getNextIndex_(delta);
+    if (this.shoudlRender_() || this.currentIndex != index) {
+      this.currentIndex = index;
+      var frame = this.piskelController.getFrameAt(this.currentIndex);
+      this.renderer.render(frame);
+      this.renderFlag = false;
+
+      this.popupPreviewController.render(frame);
+    }
+  };
+
+  ns.PreviewController.prototype.getNextIndex_ = function (delta) {
+    if (this.fps === 0) {
+      return this.piskelController.getCurrentFrameIndex();
+    } else {
+      var index = Math.floor(this.elapsedTime / (1000 / this.fps));
+      if (!this.piskelController.hasFrameAt(index)) {
+        this.elapsedTime = 0;
+        index = 0;
+      }
+      return index;
+    }
+  };
+
+  /**
+   * Calculate the preview zoom depending on the framesheet size
+   */
+  ns.PreviewController.prototype.calculateZoom_ = function () {
+    var frame = this.piskelController.getCurrentFrame();
+    var hZoom = PREVIEW_SIZE / frame.getHeight();
+    var wZoom = PREVIEW_SIZE / frame.getWidth();
+
+    return Math.min(hZoom, wZoom);
+  };
+
+  ns.PreviewController.prototype.onFrameSizeChange_ = function () {
+    this.updateZoom_();
+    this.updateContainerDimensions_();
+  };
+
+  ns.PreviewController.prototype.updateContainerDimensions_ = function () {
+    var containerEl = this.container.get(0);
+    var isTiled = pskl.UserSettings.get(pskl.UserSettings.TILED_PREVIEW);
+    var height, width;
+
+    if (isTiled) {
+      height = PREVIEW_SIZE;
+      width = PREVIEW_SIZE;
+    } else {
+      var zoom = this.getZoom();
+      var frame = this.piskelController.getCurrentFrame();
+      height = frame.getHeight() * zoom;
+      width = frame.getWidth() * zoom;
+    }
+
+    containerEl.style.height = height + 'px';
+    containerEl.style.width = width + 'px';
+
+    var horizontalMargin = (PREVIEW_SIZE - height) / 2;
+    containerEl.style.marginTop = horizontalMargin + 'px';
+    containerEl.style.marginBottom = horizontalMargin + 'px';
+
+    var verticalMargin = (PREVIEW_SIZE - width) / 2;
+    containerEl.style.marginLeft = verticalMargin + 'px';
+    containerEl.style.marginRight = verticalMargin + 'px';
+  };
+
+  ns.PreviewController.prototype.setRenderFlag_ = function (bool) {
+    this.renderFlag = bool;
+  };
+
+  ns.PreviewController.prototype.shoudlRender_ = function () {
+    return this.renderFlag || this.popupPreviewController.renderFlag;
+  };
+
+  ns.PreviewController.prototype.toggleOnionSkin_ = function () {
+    var currentValue = pskl.UserSettings.get(pskl.UserSettings.ONION_SKIN);
+    pskl.UserSettings.set(pskl.UserSettings.ONION_SKIN, !currentValue);
+  };
+})();

src/js/controller/settings/AbstractSettingController.js

@@ -0,0 +1,24 @@
+(function () {
+  var ns = $.namespace('pskl.controller.settings');
+  ns.AbstractSettingController = function () {};
+
+  ns.AbstractSettingController.prototype.addEventListener = function (el, type, callback) {
+    pskl.utils.Event.addEventListener(el, type, callback, this);
+  };
+
+  ns.AbstractSettingController.prototype.destroy = function () {
+    pskl.utils.Event.removeAllEventListeners(this);
+    this.nullifyDomReferences_();
+  };
+
+  ns.AbstractSettingController.prototype.nullifyDomReferences_ = function () {
+    for (var key in this) {
+      if (this.hasOwnProperty(key)) {
+        var isHTMLElement = this[key] && this[key].nodeName;
+        if (isHTMLElement) {
+          this[key] = null;
+        }
+      }
+    }
+  };
+})();

src/js/controller/settings/ApplicationSettingsController.js

@@ -1,41 +1,83 @@
 (function () {
-  var ns = $.namespace("pskl.controller.settings");
+  var ns = $.namespace('pskl.controller.settings');
 
   ns.ApplicationSettingsController = function () {};
 
-  /**
-   * @public
-   */
+  pskl.utils.inherit(ns.ApplicationSettingsController, pskl.controller.settings.AbstractSettingController);
+
   ns.ApplicationSettingsController.prototype.init = function() {
-    // Highlight selected background picker:
-    var backgroundClass = pskl.UserSettings.get(pskl.UserSettings.CANVAS_BACKGROUND);
-    $('#background-picker-wrapper')
-      .find('.background-picker[data-background-class=' + backgroundClass + ']')
-      .addClass('selected');
+    this.backgroundContainer = document.querySelector('.background-picker-wrapper');
+    this.addEventListener(this.backgroundContainer, 'click', this.onBackgroundClick_);
+
+    // Highlight selected background :
+    var background = pskl.UserSettings.get(pskl.UserSettings.CANVAS_BACKGROUND);
+    var selectedBackground = this.backgroundContainer.querySelector('[data-background=' + background + ']');
+    if (selectedBackground) {
+      selectedBackground.classList.add('selected');
+    }
 
     // Grid display and size
     var gridWidth = pskl.UserSettings.get(pskl.UserSettings.GRID_WIDTH);
-    $('#grid-width').val(gridWidth);
-    $('#grid-width').change(this.onGridWidthChange.bind(this));
+    var gridSelect = document.querySelector('.grid-width-select');
+    var selectedOption = gridSelect.querySelector('option[value="' + gridWidth + '"]');
+    if (selectedOption) {
+      selectedOption.setAttribute('selected', 'selected');
+    }
 
-    // Handle canvas background changes:
-    $('#background-picker-wrapper').click(this.onBackgroundClick.bind(this));
+    this.addEventListener(gridSelect, 'change', this.onGridWidthChange_);
+
+    // Tiled preview
+    var tiledPreview = pskl.UserSettings.get(pskl.UserSettings.TILED_PREVIEW);
+    var tiledPreviewCheckbox = document.querySelector('.tiled-preview-checkbox');
+    if (tiledPreview) {
+      tiledPreviewCheckbox.setAttribute('checked', tiledPreview);
+    }
+    this.addEventListener(tiledPreviewCheckbox, 'change', this.onTiledPreviewChange_);
+
+    // Max FPS
+    var maxFpsInput = document.querySelector('.max-fps-input');
+    maxFpsInput.value = pskl.UserSettings.get(pskl.UserSettings.MAX_FPS);
+    this.addEventListener(maxFpsInput, 'change', this.onMaxFpsChange_);
+
+    // Form
+    this.applicationSettingsForm = document.querySelector('[name="application-settings-form"]');
+    this.addEventListener(this.applicationSettingsForm, 'submit', this.onFormSubmit_);
   };
 
-  ns.ApplicationSettingsController.prototype.onGridWidthChange = function (evt) {
-    var width = $('#grid-width').val();
-    pskl.UserSettings.set(pskl.UserSettings.GRID_WIDTH, parseInt(width, 10));
+  ns.ApplicationSettingsController.prototype.onGridWidthChange_ = function (evt) {
+    var width = parseInt(evt.target.value, 10);
+    pskl.UserSettings.set(pskl.UserSettings.GRID_WIDTH, width);
   };
 
-  ns.ApplicationSettingsController.prototype.onBackgroundClick = function (evt) {
-    var target = $(evt.target).closest('.background-picker');
-    if (target.length) {
-      var backgroundClass = target.data('background-class');
-      pskl.UserSettings.set(pskl.UserSettings.CANVAS_BACKGROUND, backgroundClass);
+  ns.ApplicationSettingsController.prototype.onTiledPreviewChange_ = function (evt) {
+    pskl.UserSettings.set(pskl.UserSettings.TILED_PREVIEW, evt.currentTarget.checked);
+  };
 
-      $('.background-picker').removeClass('selected');
-      target.addClass('selected');
+  ns.ApplicationSettingsController.prototype.onBackgroundClick_ = function (evt) {
+    var target = evt.target;
+    var background = target.dataset.background;
+    if (background) {
+      pskl.UserSettings.set(pskl.UserSettings.CANVAS_BACKGROUND, background);
+      var selected = this.backgroundContainer.querySelector('.selected');
+      if (selected) {
+        selected.classList.remove('selected');
+      }
+      target.classList.add('selected');
     }
   };
 
-})();
+  ns.ApplicationSettingsController.prototype.onMaxFpsChange_ = function (evt) {
+    var target = evt.target;
+    var fps = parseInt(target.value, 10);
+    if (fps && !isNaN(fps)) {
+      pskl.UserSettings.set(pskl.UserSettings.MAX_FPS, fps);
+    } else {
+      target.value = pskl.UserSettings.get(pskl.UserSettings.MAX_FPS);
+    }
+  };
+
+  ns.ApplicationSettingsController.prototype.onFormSubmit_ = function (evt) {
+    evt.preventDefault();
+    $.publish(Events.CLOSE_SETTINGS_DRAWER);
+  };
+})();

src/js/controller/settings/GifExportController.js

@@ -1,173 +0,0 @@
-(function () {
-  var ns = $.namespace("pskl.controller.settings");
-
-  var URL_MAX_LENGTH = 30;
-  var MAX_GIF_COLORS = 256;
-  var MAX_EXPORT_ZOOM = 20;
-  var DEFAULT_EXPORT_ZOOM = 10;
-
-  ns.GifExportController = function (piskelController) {
-    this.piskelController = piskelController;
-  };
-
-  /**
-   * List of Resolutions applicable for Gif export
-   * @static
-   * @type {Array} array of Objects {zoom:{Number}, default:{Boolean}}
-   */
-  ns.GifExportController.RESOLUTIONS = [];
-  for (var i = 1 ; i <= MAX_EXPORT_ZOOM ; i++) {
-    ns.GifExportController.RESOLUTIONS.push({
-      zoom : i
-    });
-  }
-
-  ns.GifExportController.prototype.init = function () {
-    this.optionTemplate_ = pskl.utils.Template.get("gif-export-option-template");
-
-    this.uploadStatusContainerEl = document.querySelector(".gif-upload-status");
-
-    this.previewContainerEl = document.querySelector(".gif-export-preview");
-    this.selectResolutionEl = document.querySelector(".gif-export-select-resolution");
-
-    this.uploadButton = $(".gif-upload-button");
-    this.uploadButton.click(this.onUploadButtonClick_.bind(this));
-
-    this.downloadButton = $(".gif-download-button");
-    this.downloadButton.click(this.onDownloadButtonClick_.bind(this));
-
-    this.exportProgressStatusEl = document.querySelector('.gif-export-progress-status');
-    this.exportProgressBarEl = document.querySelector('.gif-export-progress-bar');
-
-    this.createOptionElements_();
-  };
-
-  ns.GifExportController.prototype.onUploadButtonClick_ = function (evt) {
-    evt.originalEvent.preventDefault();
-    var zoom = this.getSelectedZoom_(),
-        fps = this.piskelController.getFPS();
-
-    this.renderAsImageDataAnimatedGIF(zoom, fps, this.onGifRenderingCompleted_.bind(this));
-  };
-
-  ns.GifExportController.prototype.onDownloadButtonClick_ = function (evt) {
-    var fileName = this.piskelController.getPiskel().getDescriptor().name + '.gif';
-    var zoom = this.getSelectedZoom_(),
-        fps = this.piskelController.getFPS();
-
-    this.renderAsImageDataAnimatedGIF(zoom, fps, function (imageData) {
-      pskl.utils.BlobUtils.dataToBlob(imageData, "image/gif", function(blob) {
-        pskl.utils.FileUtils.downloadAsFile(blob, fileName);
-      });
-    }.bind(this));
-  };
-
-  ns.GifExportController.prototype.onGifRenderingCompleted_ = function (imageData) {
-    this.updatePreview_(imageData);
-    this.previewContainerEl.classList.add("preview-upload-ongoing");
-    pskl.app.imageUploadService.upload(imageData, this.onImageUploadCompleted_.bind(this));
-  };
-
-  ns.GifExportController.prototype.onImageUploadCompleted_ = function (imageUrl) {
-    this.updatePreview_(imageUrl);
-    this.updateStatus_(imageUrl);
-    this.previewContainerEl.classList.remove("preview-upload-ongoing");
-  };
-
-  ns.GifExportController.prototype.updatePreview_ = function (src) {
-    this.previewContainerEl.innerHTML = "<div><img style='max-width:32px;' src='"+src+"'/></div>";
-  };
-
-  ns.GifExportController.prototype.getSelectedZoom_ = function () {
-    return this.selectResolutionEl.value;
-  };
-
-  ns.GifExportController.prototype.createOptionElements_ = function () {
-    var resolutions = ns.GifExportController.RESOLUTIONS;
-    for (var i = 0 ; i < resolutions.length ; i++) {
-      var option = this.createOptionForResolution_(resolutions[i]);
-      this.selectResolutionEl.appendChild(option);
-    }
-  };
-
-  ns.GifExportController.prototype.createOptionForResolution_ = function (resolution) {
-    var zoom = resolution.zoom;
-    var label = zoom*this.piskelController.getWidth() + "x" + zoom*this.piskelController.getHeight();
-    var value = zoom;
-
-    var isSelected = zoom === DEFAULT_EXPORT_ZOOM;
-    var selected = isSelected ? 'selected' : '';
-    var optionHTML = pskl.utils.Template.replace(this.optionTemplate_, {value : value, label : label, selected : selected});
-    var optionEl = pskl.utils.Template.createFromHTML(optionHTML);
-
-    return optionEl;
-  };
-
-  ns.GifExportController.prototype.renderAsImageDataAnimatedGIF = function(zoom, fps, cb) {
-    var colorCount = pskl.app.currentColorsService.getCurrentColors().length;
-    var preserveColors = colorCount < MAX_GIF_COLORS;
-    var gif = new window.GIF({
-      workers: 2,
-      quality: 1,
-      width: this.piskelController.getWidth()*zoom,
-      height: this.piskelController.getHeight()*zoom,
-      preserveColors : preserveColors
-    });
-
-    for (var i = 0; i < this.piskelController.getFrameCount(); i++) {
-      var frame = this.piskelController.getFrameAt(i);
-      var canvasRenderer = new pskl.rendering.CanvasRenderer(frame, zoom);
-      var canvas = canvasRenderer.render();
-      gif.addFrame(canvas.getContext('2d'), {
-        delay: 1000 / fps
-      });
-    }
-
-    gif.on('progress', function(percentage) {
-      this.updateProgressStatus_((percentage*100).toFixed(2));
-    }.bind(this));
-
-    gif.on('finished', function(blob) {
-      this.hideProgressStatus_();
-      pskl.utils.FileUtils.readFile(blob, cb);
-    }.bind(this));
-
-    gif.render();
-  };
-
-  ns.GifExportController.prototype.updateProgressStatus_ = function (percentage) {
-    this.exportProgressStatusEl.innerHTML = percentage + '%';
-    this.exportProgressBarEl.style.width = percentage + "%";
-
-  };
-
-  ns.GifExportController.prototype.hideProgressStatus_ = function () {
-    this.exportProgressStatusEl.innerHTML = '';
-    this.exportProgressBarEl.style.width = "0";
-  };
-
-  // FIXME : HORRIBLE COPY/PASTA
-
-  ns.GifExportController.prototype.updateStatus_ = function (imageUrl, error) {
-    if (imageUrl) {
-      var linkTpl = "<a class='image-link' href='{{link}}' target='_blank'>{{shortLink}}</a>";
-      var linkHtml = pskl.utils.Template.replace(linkTpl, {
-        link : imageUrl,
-        shortLink : this.shorten_(imageUrl, URL_MAX_LENGTH, '...')
-      });
-      this.uploadStatusContainerEl.innerHTML = 'Your image is now available at : ' + linkHtml;
-    } else {
-      // FIXME : Should display error message instead
-    }
-  };
-
-  ns.GifExportController.prototype.shorten_ = function (url, maxLength, suffix) {
-    if (url.length > maxLength) {
-      var index = Math.round((maxLength-suffix.length) / 2);
-      var part1 = url.substring(0, index);
-      var part2 = url.substring(url.length - index, url.length);
-      url = part1 + suffix + part2;
-    }
-    return url;
-  };
-})();

src/js/controller/settings/ImportController.js

@@ -3,28 +3,44 @@
 
   ns.ImportController = function (piskelController) {
     this.piskelController = piskelController;
-    this.importedImage_ = null;
   };
 
+  pskl.utils.inherit(ns.ImportController, pskl.controller.settings.AbstractSettingController);
+
   ns.ImportController.prototype.init = function () {
-    this.browseLocalButton = document.querySelector('.browse-local-button');
-    this.browseLocalButton.addEventListener('click', this.onBrowseLocalClick_.bind(this));
+    this.hiddenFileInput = document.querySelector('[name="file-upload-input"]');
+    this.addEventListener(this.hiddenFileInput, 'change', this.onFileUploadChange_);
 
-    this.hiddenFileInput = $('[name=file-upload-input]');
-    this.hiddenFileInput.change(this.onFileUploadChange_.bind(this));
+    this.hiddenOpenPiskelInput = document.querySelector('[name="open-piskel-input"]');
 
-    this.fileInputButton = $('.file-input-button');
-    this.fileInputButton.click(this.onFileInputClick_.bind(this));
+    this.addEventListener('.browse-local-button', 'click', this.onBrowseLocalClick_);
+    this.addEventListener('.file-input-button', 'click', this.onFileInputClick_);
 
-    this.hiddenOpenPiskelInput = $('[name=open-piskel-input]');
-    this.hiddenOpenPiskelInput.change(this.onOpenPiskelChange_.bind(this));
+    // different handlers, depending on the Environment
+    if (pskl.utils.Environment.detectNodeWebkit()) {
+      this.addEventListener('.open-piskel-button', 'click', this.openPiskelDesktop_);
+    } else {
+      this.addEventListener(this.hiddenOpenPiskelInput, 'change', this.onOpenPiskelChange_);
+      this.addEventListener('.open-piskel-button', 'click', this.onOpenPiskelClick_);
+    }
 
-    this.openPiskelInputButton = $('.open-piskel-button');
-    this.openPiskelInputButton.click(this.onOpenPiskelClick_.bind(this));
+    this.initRestoreSession_();
+  };
 
-    this.prevSessionContainer = $('.previous-session');
-    this.previousSessionTemplate_ = pskl.utils.Template.get("previous-session-info-template");
-    this.fillRestoreSession_();
+  ns.ImportController.prototype.initRestoreSession_ = function () {
+    var previousSessionContainer = document.querySelector('.previous-session');
+    var previousInfo = pskl.app.backupService.getPreviousPiskelInfo();
+    if (previousInfo) {
+      var previousSessionTemplate_ = pskl.utils.Template.get('previous-session-info-template');
+      var date = pskl.utils.DateUtils.format(previousInfo.date, '{{H}}:{{m}} - {{Y}}/{{M}}/{{D}}');
+      previousSessionContainer.innerHTML = pskl.utils.Template.replace(previousSessionTemplate_, {
+        name : previousInfo.name,
+        date : date
+      });
+      this.addEventListener('.restore-session-button', 'click', this.onRestorePreviousSessionClick_);
+    } else {
+      previousSessionContainer.innerHTML = 'No piskel backup was found on this browser.';
+    }
   };
 
   ns.ImportController.prototype.closeDrawer_ = function () {
@@ -39,12 +55,17 @@
   };
 
   ns.ImportController.prototype.onOpenPiskelChange_ = function (evt) {
-    var files = this.hiddenOpenPiskelInput.get(0).files;
+    var files = this.hiddenOpenPiskelInput.files;
     if (files.length == 1) {
       this.openPiskelFile_(files[0]);
     }
   };
 
+  ns.ImportController.prototype.openPiskelDesktop_ = function (evt) {
+    this.closeDrawer_();
+    pskl.app.desktopStorageService.openPiskel();
+  };
+
   ns.ImportController.prototype.onOpenPiskelClick_ = function (evt) {
     this.hiddenOpenPiskelInput.click();
   };
@@ -55,18 +76,18 @@
   };
 
   ns.ImportController.prototype.openPiskelFile_ = function (file) {
-    if (this.isPiskel_(file)){
+    if (this.isPiskel_(file)) {
       pskl.utils.PiskelFileUtils.loadFromFile(file, function (piskel, descriptor, fps) {
         piskel.setDescriptor(descriptor);
         pskl.app.piskelController.setPiskel(piskel);
-        pskl.app.animationController.setFPS(fps);
+        pskl.app.previewController.setFPS(fps);
       });
       this.closeDrawer_();
     }
   };
 
   ns.ImportController.prototype.importPictureFromFile_ = function () {
-    var files = this.hiddenFileInput.get(0).files;
+    var files = this.hiddenFileInput.files;
     if (files.length == 1) {
       var file = files[0];
       if (this.isImage_(file)) {
@@ -77,7 +98,7 @@
         this.closeDrawer_();
       } else {
         this.closeDrawer_();
-        throw 'File is not an image : ' + file.type;
+        console.error('File is not an image : ' + file.type);
       }
     }
   };
@@ -90,26 +111,10 @@
     return (/\.piskel$/).test(file.name);
   };
 
-  ns.ImportController.prototype.fillRestoreSession_ = function () {
-    var previousInfo = pskl.app.backupService.getPreviousPiskelInfo();
-    if (previousInfo) {
-      var info = {
-        name : previousInfo.name,
-        date : pskl.utils.DateUtils.format(previousInfo.date, "{{H}}:{{m}} - {{Y}}/{{M}}/{{D}}")
-      };
-
-      this.prevSessionContainer.html(pskl.utils.Template.replace(this.previousSessionTemplate_, info));
-      $(".restore-session-button").click(this.onRestorePreviousSessionClick_.bind(this));
-    } else {
-      this.prevSessionContainer.html("No piskel backup was found on this browser.");
-    }
-  };
-
   ns.ImportController.prototype.onRestorePreviousSessionClick_ = function () {
     if (window.confirm('This will erase your current workspace. Continue ?')) {
       pskl.app.backupService.load();
       $.publish(Events.CLOSE_SETTINGS_DRAWER);
     }
   };
-
-})();
+})();

src/js/controller/settings/ResizeController.js

@@ -1,70 +0,0 @@
-(function () {
-  var ns = $.namespace('pskl.controller.settings');
-
-  ns.ResizeController = function (piskelController) {
-    this.piskelController = piskelController;
-  };
-
-  ns.ResizeController.prototype.init = function () {
-    this.resizeWidth = $('[name=resize-width]');
-    this.resizeHeight = $('[name=resize-height]');
-
-    this.resizeWidth.val(this.piskelController.getWidth());
-    this.resizeHeight.val(this.piskelController.getHeight());
-
-    this.cancelButton = $('.resize-cancel-button');
-    this.cancelButton.click(this.onCancelButtonClicked_.bind(this));
-
-    this.resizeForm = $("[name=resize-form]");
-    this.resizeForm.submit(this.onResizeFormSubmit_.bind(this));
-
-    this.resizeContentCheckbox = $(".resize-content-checkbox");
-  };
-
-  ns.ResizeController.prototype.onResizeFormSubmit_ = function (evt) {
-    evt.originalEvent.preventDefault();
-
-    var width = parseInt(this.resizeWidth.val(), 10);
-    var height = parseInt(this.resizeHeight.val(), 10);
-
-    var resizeContentEnabled = this.isResizeContentEnabled_();
-    var resizedLayers = this.piskelController.getLayers().map(this.resizeLayer_.bind(this));
-
-    var piskel = pskl.model.Piskel.fromLayers(resizedLayers, this.piskelController.getPiskel().getDescriptor());
-
-    pskl.app.piskelController.setPiskel(piskel, true);
-    $.publish(Events.CLOSE_SETTINGS_DRAWER);
-  };
-
-  ns.ResizeController.prototype.resizeLayer_ = function (layer) {
-    var resizedFrames = layer.getFrames().map(this.resizeFrame_.bind(this));
-    return pskl.model.Layer.fromFrames(layer.getName(), resizedFrames);
-  };
-
-  ns.ResizeController.prototype.resizeFrame_ = function (frame) {
-    var width = parseInt(this.resizeWidth.val(), 10);
-    var height = parseInt(this.resizeHeight.val(), 10);
-
-    var resizedFrame;
-    if (this.isResizeContentEnabled_()) {
-      resizedFrame = pskl.utils.FrameUtils.resize(frame, width, height, false);
-    } else {
-      resizedFrame = new pskl.model.Frame(width, height);
-      frame.forEachPixel(function (color, x, y) {
-        if (x < resizedFrame.getWidth() && y < resizedFrame.getHeight()) {
-          resizedFrame.setPixel(x, y, color);
-        }
-      });
-    }
-
-    return resizedFrame;
-  };
-
-  ns.ResizeController.prototype.isResizeContentEnabled_ = function () {
-    return !!this.resizeContentCheckbox.prop('checked');
-  };
-
-  ns.ResizeController.prototype.onCancelButtonClicked_ = function (evt) {
-    $.publish(Events.CLOSE_SETTINGS_DRAWER);
-  };
-})();

src/js/controller/settings/SaveController.js

@@ -5,63 +5,84 @@
     this.piskelController = piskelController;
   };
 
+  pskl.utils.inherit(ns.SaveController, pskl.controller.settings.AbstractSettingController);
+
   /**
    * @public
    */
   ns.SaveController.prototype.init = function () {
-
-    // Only available in app-engine mode ...
-    this.piskelName = document.querySelector('.piskel-name');
-
-    this.saveOnlineStatus = $('#save-online-status');
-
-    this.saveFileStatus = $('#save-file-status');
+    // timestamp used to generate unique name when saving as .piskel
     this.timestamp = new Date();
 
+    this.insertPartials_();
+
+    // Only available in app-engine mode
+    this.piskelName = document.querySelector('.piskel-name');
+    this.saveOnlineStatus = document.querySelector('#save-online-status');
+    this.saveFileStatus = document.querySelector('#save-file-status');
+    this.descriptionInput = document.querySelector('#save-description');
+    this.nameInput =  document.querySelector('#save-name');
+    this.saveOnlineButton = document.querySelector('#save-online-button');
+    this.isPublicCheckbox = document.querySelector('input[name=save-public-checkbox]');
+
     var descriptor = this.piskelController.getPiskel().getDescriptor();
-    this.descriptionInput = $('#save-description');
-    this.descriptionInput.val(descriptor.description);
-
-    this.isPublicCheckbox = $('input[name=save-public-checkbox]');
-    this.isPublicCheckbox.prop('checked', descriptor.isPublic);
-
-    this.saveFileButton = $('#save-file-button');
-    this.saveFileButton.click(this.saveFile_.bind(this));
-
-    this.saveLocalButton = $('#save-browser-button');
-    this.saveLocalButton.click(this.saveLocal_.bind(this));
-
-    this.saveOnlineButton = $('#save-online-button');
-    this.saveOnlineButton.click(this.saveOnline_.bind(this));
-
-    this.saveForm = $('form[name=save-form]');
-    this.saveForm.submit(this.onSaveFormSubmit_.bind(this));
-
-    this.nameInput =  $('#save-name');
-    this.nameInput.val(descriptor.name);
-    this.nameInput.keyup(this.updateLocalStatusFilename_.bind(this));
-
-    if (!pskl.app.isLoggedIn()) {
-      this.saveOnlineButton.hide();
-      $('.save-public-section').hide();
-      this.saveOnlineStatus.html(pskl.utils.Template.get('save-please-login-partial'));
-    } else {
-      this.saveOnlineStatus.html(pskl.utils.Template.get('save-online-status-partial'));
+    this.descriptionInput.value = descriptor.description;
+    this.nameInput.value = descriptor.name;
+    if (descriptor.isPublic) {
+      this.isPublicCheckbox.setAttribute('checked', true);
     }
 
-    this.updateLocalStatusFilename_();
+    if (pskl.utils.Environment.detectNodeWebkit()) {
+      this.addEventListener('#save-as-button', 'click', this.saveAs_);
+    }
+
+    this.addEventListener('#save-file-button', 'click', this.saveFile_);
+    this.addEventListener('#save-browser-button', 'click', this.saveLocal_);
+    this.addEventListener(this.saveOnlineButton, 'click', this.saveOnline_);
+    this.addEventListener('form[name=save-form]', 'submit', this.onSaveFormSubmit_);
+
+    if (pskl.app.isLoggedIn()) {
+      pskl.utils.Template.insert(this.saveOnlineStatus, 'beforeend', 'save-online-status-partial');
+    } else {
+      pskl.utils.Template.insert(this.saveOnlineStatus, 'beforeend', 'save-please-login-partial');
+      var container = document.querySelector('.setting-save-section');
+      container.classList.add('anonymous');
+    }
   };
 
-  ns.SaveController.prototype.updateLocalStatusFilename_ = function () {
-    this.saveFileStatus.html(pskl.utils.Template.getAndReplace('save-file-status-template', {
-      name : this.getLocalFilename_()
-    }));
+  ns.SaveController.prototype.insertPartials_ = function () {
+    var partials = [];
+    if (pskl.utils.Environment.detectNodeWebkit()) {
+      partials = [
+        'save-file-nw-partial',
+        'save-localstorage-partial',
+        'save-online-partial'
+      ];
+    } else if (pskl.app.isLoggedIn()) {
+      partials = [
+        'save-online-partial',
+        'save-localstorage-partial',
+        'save-file-partial'
+      ];
+    } else {
+      partials = [
+        'save-file-partial',
+        'save-localstorage-partial',
+        'save-online-partial'
+      ];
+    }
+
+    var container = document.querySelector('.save-form');
+    partials.forEach(function (partial) {
+      pskl.utils.Template.insert(container, 'beforeend', partial);
+    });
+
   };
 
   ns.SaveController.prototype.getLocalFilename_ = function () {
     var piskelName = this.getName();
-    var timestamp = pskl.utils.DateUtils.format(this.timestamp, "{{Y}}{{M}}{{D}}-{{H}}{{m}}{{s}}");
-    return piskelName + "-" + timestamp + ".piskel";
+    var timestamp = pskl.utils.DateUtils.format(this.timestamp, '{{Y}}{{M}}{{D}}-{{H}}{{m}}{{s}}');
+    return piskelName + '-' + timestamp + '.piskel';
   };
 
   ns.SaveController.prototype.onSaveFormSubmit_ = function (evt) {
@@ -85,15 +106,15 @@
 
     if (name) {
       var description = this.getDescription();
-      var isPublic = !!this.isPublicCheckbox.prop('checked');
+      var isPublic = this.isPublic_();
 
       var descriptor = new pskl.model.piskel.Descriptor(name, description, isPublic);
       this.piskelController.getPiskel().setDescriptor(descriptor);
 
       this.beforeSaving_();
 
-      this.saveOnlineButton.attr('disabled', true);
-      this.saveOnlineStatus.html('Saving ...');
+      this.saveOnlineButton.setAttribute('disabled', true);
+      this.saveOnlineStatus.innerHTML = 'Saving ...';
 
       pskl.app.storageService.store({
         success : this.onSaveSuccess_.bind(this),
@@ -123,20 +144,37 @@
   };
 
   ns.SaveController.prototype.saveFile_ = function () {
+    // detect if this is running in NodeWebkit
+    if (pskl.utils.Environment.detectNodeWebkit()) {
+      pskl.app.desktopStorageService.save();
+    } else {
+      this.saveFileBrowser_();
+    }
+  };
+
+  ns.SaveController.prototype.saveAs_ = function () {
+    pskl.app.desktopStorageService.savePiskelAs();
+  };
+
+  ns.SaveController.prototype.saveFileBrowser_ = function () {
     this.beforeSaving_();
     pskl.utils.BlobUtils.stringToBlob(pskl.app.piskelController.serialize(), function(blob) {
       pskl.utils.FileUtils.downloadAsFile(blob, this.getLocalFilename_());
       this.onSaveSuccess_();
       this.afterSaving_();
-    }.bind(this), "application/piskel+json");
+    }.bind(this), 'application/piskel+json');
   };
 
   ns.SaveController.prototype.getName = function () {
-    return this.nameInput.val();
+    return this.nameInput.value;
   };
 
   ns.SaveController.prototype.getDescription = function () {
-    return this.descriptionInput.val();
+    return this.descriptionInput.value;
+  };
+
+  ns.SaveController.prototype.isPublic_ = function () {
+    return !!this.isPublicCheckbox.checked;
   };
 
   ns.SaveController.prototype.beforeSaving_ = function () {
@@ -150,7 +188,7 @@
   ns.SaveController.prototype.updatePiskelDescriptor_ = function () {
     var name = this.getName();
     var description = this.getDescription();
-    var isPublic = !!this.isPublicCheckbox.prop('checked');
+    var isPublic = this.isPublic_();
 
     var descriptor = new pskl.model.piskel.Descriptor(name, description, isPublic);
     this.piskelController.getPiskel().setDescriptor(descriptor);
@@ -158,17 +196,17 @@
 
   ns.SaveController.prototype.onSaveSuccess_ = function () {
     $.publish(Events.CLOSE_SETTINGS_DRAWER);
-    $.publish(Events.SHOW_NOTIFICATION, [{"content": "Successfully saved !"}]);
+    $.publish(Events.SHOW_NOTIFICATION, [{'content': 'Successfully saved !'}]);
     $.publish(Events.PISKEL_SAVED);
   };
 
   ns.SaveController.prototype.onSaveError_ = function (status) {
-    $.publish(Events.SHOW_NOTIFICATION, [{"content": "Saving failed ("+status+")"}]);
+    $.publish(Events.SHOW_NOTIFICATION, [{'content': 'Saving failed (' + status + ')'}]);
   };
 
   ns.SaveController.prototype.afterOnlineSaving_ = function () {
-    this.saveOnlineButton.attr('disabled', false);
-    this.saveOnlineStatus.html('');
+    this.saveOnlineButton.setAttribute('disabled', false);
+    this.saveOnlineStatus.innerHTML = '';
     this.afterSaving_();
   };
 
@@ -179,4 +217,4 @@
 
     window.setTimeout($.publish.bind($, Events.HIDE_NOTIFICATION), 5000);
   };
-})();
+})();

src/js/controller/settings/SettingsController.js

@@ -8,11 +8,11 @@
     },
     'resize' : {
       template : 'templates/settings/resize.html',
-      controller : ns.ResizeController
+      controller : ns.resize.ResizeController
     },
     'export' : {
       template : 'templates/settings/export.html',
-      controller : ns.ImageExportController
+      controller : ns.exportimage.ImageExportController
     },
     'import' : {
       template : 'templates/settings/import.html',
@@ -73,16 +73,22 @@
   };
 
   ns.SettingsController.prototype.loadSetting = function (setting) {
+    if (this.currentController && this.currentController.destroy) {
+      this.currentController.destroy();
+    }
+
     this.drawerContainer.innerHTML = pskl.utils.Template.get(settings[setting].template);
-    (new settings[setting].controller(this.piskelController)).init();
+
+    this.currentSetting = setting;
+    this.currentController = new settings[setting].controller(this.piskelController);
+    this.currentController.init();
 
     this.settingsContainer.addClass(EXP_DRAWER_CLS);
 
     $('.' + SEL_SETTING_CLS).removeClass(SEL_SETTING_CLS);
-    $('[data-setting='+setting+']').addClass(SEL_SETTING_CLS);
+    $('[data-setting=' + setting + ']').addClass(SEL_SETTING_CLS);
 
     this.isExpanded = true;
-    this.currentSetting = setting;
   };
 
   ns.SettingsController.prototype.closeDrawer = function () {
@@ -94,5 +100,4 @@
 
     document.activeElement.blur();
   };
-
-})();
+})();

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

@@ -0,0 +1,176 @@
+(function () {
+  var ns = $.namespace('pskl.controller.settings.exportimage');
+
+  var URL_MAX_LENGTH = 30;
+  var MAX_GIF_COLORS = 256;
+  var MAX_EXPORT_ZOOM = 20;
+  var DEFAULT_EXPORT_ZOOM = 10;
+  var MAGIC_PINK = '#FF00FF';
+
+  ns.GifExportController = function (piskelController) {
+    this.piskelController = piskelController;
+  };
+
+  pskl.utils.inherit(ns.GifExportController, pskl.controller.settings.AbstractSettingController);
+
+  /**
+   * List of Resolutions applicable for Gif export
+   * @static
+   * @type {Array} array of Objects {zoom:{Number}, default:{Boolean}}
+   */
+  ns.GifExportController.RESOLUTIONS = [];
+  for (var i = 1 ; i <= MAX_EXPORT_ZOOM ; i++) {
+    ns.GifExportController.RESOLUTIONS.push({
+      zoom : i
+    });
+  }
+
+  ns.GifExportController.prototype.init = function () {
+
+    this.uploadStatusContainerEl = document.querySelector('.gif-upload-status');
+    this.previewContainerEl = document.querySelector('.gif-export-preview');
+    this.widthInput = document.querySelector('.export-gif-resize-width');
+    this.heightInput = document.querySelector('.export-gif-resize-height');
+    this.uploadButton = document.querySelector('.gif-upload-button');
+    this.downloadButton = document.querySelector('.gif-download-button');
+
+    this.sizeInputWidget = new pskl.widgets.SizeInput(
+      this.widthInput, this.heightInput,
+      this.piskelController.getWidth(), this.piskelController.getHeight());
+
+    this.addEventListener(this.uploadButton, 'click', this.onUploadButtonClick_);
+    this.addEventListener(this.downloadButton, 'click', this.onDownloadButtonClick_);
+  };
+
+  ns.GifExportController.prototype.destroy = function () {
+    this.sizeInputWidget.destroy();
+    this.superclass.destroy.call(this);
+  };
+
+  ns.GifExportController.prototype.onUploadButtonClick_ = function (evt) {
+    evt.preventDefault();
+    var zoom = this.getZoom_();
+    var fps = this.piskelController.getFPS();
+
+    this.renderAsImageDataAnimatedGIF(zoom, fps, this.uploadImageData_.bind(this));
+  };
+
+  ns.GifExportController.prototype.onDownloadButtonClick_ = function (evt) {
+    var zoom = this.getZoom_();
+    var fps = this.piskelController.getFPS();
+
+    this.renderAsImageDataAnimatedGIF(zoom, fps, this.downloadImageData_.bind(this));
+  };
+
+  ns.GifExportController.prototype.downloadImageData_ = function (imageData) {
+    var fileName = this.piskelController.getPiskel().getDescriptor().name + '.gif';
+    pskl.utils.BlobUtils.dataToBlob(imageData, 'image/gif', function(blob) {
+      pskl.utils.FileUtils.downloadAsFile(blob, fileName);
+    });
+  };
+
+  ns.GifExportController.prototype.uploadImageData_ = function (imageData) {
+    this.updatePreview_(imageData);
+    this.previewContainerEl.classList.add('preview-upload-ongoing');
+
+    pskl.app.imageUploadService.upload(imageData,
+      this.onImageUploadCompleted_.bind(this),
+      this.onImageUploadFailed_.bind(this));
+  };
+
+  ns.GifExportController.prototype.onImageUploadCompleted_ = function (imageUrl) {
+    this.updatePreview_(imageUrl);
+    this.updateStatus_(imageUrl);
+    this.previewContainerEl.classList.remove('preview-upload-ongoing');
+  };
+
+  ns.GifExportController.prototype.onImageUploadFailed_ = function (event, xhr) {
+    if (xhr.status === 500) {
+      $.publish(Events.SHOW_NOTIFICATION, [{
+        'content': 'Upload failed : ' + xhr.responseText,
+        'hideDelay' : 5000
+      }]);
+    }
+  };
+
+  ns.GifExportController.prototype.updatePreview_ = function (src) {
+    this.previewContainerEl.innerHTML = '<div><img style="max-width:32px;"src="' + src + '"/></div>';
+  };
+
+  ns.GifExportController.prototype.getZoom_ = function () {
+    return parseInt(this.widthInput.value, 10) / this.piskelController.getWidth();
+  };
+
+  ns.GifExportController.prototype.renderAsImageDataAnimatedGIF = function(zoom, fps, cb) {
+    var currentColors = pskl.app.currentColorsService.getCurrentColors();
+
+    var preserveColors = currentColors.length < MAX_GIF_COLORS;
+    var transparentColor = this.getTransparentColor(currentColors);
+
+    var gif = new window.GIF({
+      workers: 5,
+      quality: 1,
+      width: this.piskelController.getWidth() * zoom,
+      height: this.piskelController.getHeight() * zoom,
+      preserveColors : preserveColors,
+      transparent : parseInt(transparentColor.substring(1), 16)
+    });
+
+    for (var i = 0 ; i < this.piskelController.getFrameCount() ; i++) {
+      var frame = this.piskelController.getFrameAt(i);
+      var canvasRenderer = new pskl.rendering.CanvasRenderer(frame, zoom);
+      canvasRenderer.drawTransparentAs(transparentColor);
+      var canvas = canvasRenderer.render();
+      gif.addFrame(canvas.getContext('2d'), {
+        delay: 1000 / fps
+      });
+    }
+
+    $.publish(Events.SHOW_PROGRESS, [{'name': 'Building animated GIF ...'}]);
+    gif.on('progress', function(percentage) {
+      $.publish(Events.UPDATE_PROGRESS, [{'progress': (percentage * 100).toFixed(1)}]);
+    }.bind(this));
+
+    gif.on('finished', function(blob) {
+      $.publish(Events.HIDE_PROGRESS);
+      pskl.utils.FileUtils.readFile(blob, cb);
+    }.bind(this));
+
+    gif.render();
+  };
+
+  ns.GifExportController.prototype.getTransparentColor = function(currentColors) {
+    var transparentColor = pskl.utils.ColorUtils.getUnusedColor(currentColors);
+
+    if (!transparentColor) {
+      console.error('Unable to find unused color to use as transparent color in the current sprite');
+      transparentColor = MAGIC_PINK;
+    }
+
+    return transparentColor;
+  };
+
+  // FIXME : JD : HORRIBLE COPY/PASTA (JD later : where???)
+  ns.GifExportController.prototype.updateStatus_ = function (imageUrl, error) {
+    if (imageUrl) {
+      var linkTpl = '<a class="image-link" href="{{link}}" target="_blank">{{shortLink}}</a>';
+      var linkHtml = pskl.utils.Template.replace(linkTpl, {
+        link : imageUrl,
+        shortLink : this.shorten_(imageUrl, URL_MAX_LENGTH, '...')
+      });
+      this.uploadStatusContainerEl.innerHTML = 'Your image is now available at : ' + linkHtml;
+    } else {
+      // FIXME : Should display error message instead
+    }
+  };
+
+  ns.GifExportController.prototype.shorten_ = function (url, maxLength, suffix) {
+    if (url.length > maxLength) {
+      var index = Math.round((maxLength - suffix.length) / 2);
+      var part1 = url.substring(0, index);
+      var part2 = url.substring(url.length - index, url.length);
+      url = part1 + suffix + part2;
+    }
+    return url;
+  };
+})();

src/js/controller/settings/exportimage/ImageExportController.js

@@ -1,5 +1,5 @@
 (function () {
-  var ns = $.namespace("pskl.controller.settings");
+  var ns = $.namespace('pskl.controller.settings.exportimage');
 
   ns.ImageExportController = function (piskelController) {
     this.piskelController = piskelController;
@@ -11,4 +11,9 @@
     this.pngExportController.init();
     this.gifExportController.init();
   };
-})();
+
+  ns.ImageExportController.prototype.destroy = function () {
+    this.pngExportController.destroy();
+    this.gifExportController.destroy();
+  };
+})();

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

@@ -1,5 +1,5 @@
 (function () {
-  var ns = $.namespace("pskl.controller.settings");
+  var ns = $.namespace('pskl.controller.settings.exportimage');
 
   var URL_MAX_LENGTH = 60;
 
@@ -7,16 +7,17 @@
     this.piskelController = piskelController;
   };
 
+  pskl.utils.inherit(ns.PngExportController, pskl.controller.settings.AbstractSettingController);
+
   ns.PngExportController.prototype.init = function () {
-    this.previewContainerEl = document.querySelector(".png-export-preview");
     this.pngFilePrefixInput = document.getElementById('zip-prefix-name');
     this.pngFilePrefixInput.value = 'sprite_';
 
-    document.querySelector(".png-download-button").addEventListener('click', this.onPngDownloadButtonClick_.bind(this));
+    var downloadButton = document.querySelector('.png-download-button');
+    this.addEventListener(downloadButton, 'click', this.onPngDownloadButtonClick_);
 
-    document.querySelector(".zip-generate-button").addEventListener('click', this.onZipButtonClick_.bind(this));
-
-    this.updatePreview_(this.getFramesheetAsCanvas().toDataURL("image/png"));
+    var zipButton = document.querySelector('.zip-generate-button');
+    this.addEventListener(zipButton, 'click', this.onZipButtonClick_);
   };
 
   ns.PngExportController.prototype.onPngDownloadButtonClick_ = function (evt) {
@@ -29,17 +30,20 @@
   ns.PngExportController.prototype.onZipButtonClick_ = function () {
     var zip = new window.JSZip();
 
-    for (var i = 0; i < this.piskelController.getFrameCount(); i++) {
+    for (var i = 0 ; i < this.piskelController.getFrameCount() ; i++) {
       var frame = this.piskelController.getFrameAt(i);
       var canvas = this.getFrameAsCanvas_(frame);
       var basename = this.pngFilePrefixInput.value;
-      var filename =  basename + (i+1) + ".png";
-      zip.file(filename, pskl.CanvasUtils.getBase64FromCanvas(canvas) + '\n', {base64: true});
+      var filename =  basename + (i + 1) + '.png';
+      zip.file(filename, pskl.utils.CanvasUtils.getBase64FromCanvas(canvas) + '\n', {base64: true});
     }
 
     var fileName = this.getPiskelName_() + '.zip';
 
-    var blob = zip.generate({type:"blob"});
+    var blob = zip.generate({
+      type : 'blob'
+    });
+
     pskl.utils.FileUtils.downloadAsFile(blob, fileName);
   };
 
@@ -58,15 +62,9 @@
     return renderer.renderAsCanvas();
   };
 
-  ns.PngExportController.prototype.onImageUploadCompleted_ = function (imageUrl) {
-    this.updatePreview_(imageUrl);
-    this.updateStatus_(imageUrl);
-    this.previewContainerEl.classList.remove("preview-upload-ongoing");
-  };
-
   ns.PngExportController.prototype.updateStatus_ = function (imageUrl, error) {
     if (imageUrl) {
-      var linkTpl = "<a class='image-link' href='{{link}}' target='_blank'>{{shortLink}}</a>";
+      var linkTpl = '<a class="image-link" href="{{link}}" target="_blank">{{shortLink}}</a>';
       var linkHtml = pskl.utils.Template.replace(linkTpl, {
         link : imageUrl,
         shortLink : this.shorten_(imageUrl, URL_MAX_LENGTH, '...')
@@ -77,10 +75,6 @@
     }
   };
 
-  ns.PngExportController.prototype.updatePreview_ = function (src) {
-    this.previewContainerEl.innerHTML = "<img class='light-picker-background' style='max-width:240px;' src='"+src+"'/>";
-  };
-
   ns.PngExportController.prototype.shorten_ = function (url, maxLength, suffix) {
     if (url.length > maxLength) {
       url = url.substring(0, maxLength);

src/js/controller/settings/resize/AnchorWidget.js

@@ -0,0 +1,87 @@
+(function () {
+  var ns = $.namespace('pskl.controller.settings.resize');
+
+  var OPTION_CLASSNAME = 'resize-origin-option';
+
+  ns.AnchorWidget = function (container) {
+    this.container = container;
+    this.disabled = false;
+    pskl.utils.Event.addEventListener(this.container, 'click', this.onResizeOriginClick_, this);
+  };
+
+  ns.AnchorWidget.ORIGIN = {
+    TOPLEFT : 'TOPLEFT',
+    TOP : 'TOP',
+    TOPRIGHT : 'TOPRIGHT',
+    MIDDLELEFT : 'MIDDLELEFT',
+    MIDDLE : 'MIDDLE',
+    MIDDLERIGHT : 'MIDDLERIGHT',
+    BOTTOMLEFT : 'BOTTOMLEFT',
+    BOTTOM : 'BOTTOM',
+    BOTTOMRIGHT : 'BOTTOMRIGHT'
+  };
+
+  ns.AnchorWidget.prototype.destroy = function (evt) {
+    pskl.utils.Event.removeAllEventListeners(this);
+    this.container = null;
+  };
+
+  ns.AnchorWidget.prototype.onResizeOriginClick_ = function (evt) {
+    var origin = evt.target.dataset.origin;
+    if (origin && ns.AnchorWidget.ORIGIN[origin] && !this.disabled) {
+      this.setOrigin(origin);
+    }
+  };
+
+  ns.AnchorWidget.prototype.setOrigin = function (origin) {
+    this.origin = origin;
+    var previous = document.querySelector('.' + OPTION_CLASSNAME + '.selected');
+    if (previous) {
+      previous.classList.remove('selected');
+    }
+
+    var selected = document.querySelector('.' + OPTION_CLASSNAME + '[data-origin="' + origin + '"]');
+    if (selected) {
+      selected.classList.add('selected');
+      this.refreshNeighbors_(selected);
+    }
+  };
+
+  ns.AnchorWidget.prototype.getOrigin = function () {
+    return this.origin;
+  };
+
+  ns.AnchorWidget.prototype.disable = function () {
+    this.disabled = true;
+    this.container.classList.add('transition');
+    this.container.classList.add('disabled');
+  };
+
+  ns.AnchorWidget.prototype.enable = function () {
+    this.disabled = false;
+    this.container.classList.remove('disabled');
+    window.setTimeout(this.container.classList.remove.bind(this.container.classList, 'transition'), 250);
+  };
+
+  ns.AnchorWidget.prototype.refreshNeighbors_ = function (selected) {
+    var options = document.querySelectorAll('.' + OPTION_CLASSNAME);
+    for (var i = 0 ; i < options.length ; i++) {
+      options[i].removeAttribute('data-neighbor');
+    }
+
+    var selectedIndex = Array.prototype.indexOf.call(options, selected);
+
+    this.setNeighborhood_(options[selectedIndex - 1], 'left');
+    this.setNeighborhood_(options[selectedIndex + 1], 'right');
+    this.setNeighborhood_(options[selectedIndex - 3], 'top');
+    this.setNeighborhood_(options[selectedIndex + 3], 'bottom');
+  };
+
+  ns.AnchorWidget.prototype.setNeighborhood_ = function (el, neighborhood) {
+    var origin = this.origin.toLowerCase();
+    var isNeighborhoodValid = origin.indexOf(neighborhood) === -1;
+    if (isNeighborhoodValid) {
+      el.setAttribute('data-neighbor', neighborhood);
+    }
+  };
+})();

src/js/controller/settings/resize/DefaultSizeController.js

@@ -0,0 +1,47 @@
+(function () {
+  var ns = $.namespace('pskl.controller.settings.resize');
+
+  ns.DefaultSizeController = function (piskelController) {
+    this.piskelController = piskelController;
+  };
+
+  pskl.utils.inherit(ns.DefaultSizeController, pskl.controller.settings.AbstractSettingController);
+
+  ns.DefaultSizeController.prototype.init = function () {
+    this.container = document.querySelector('.settings-default-size');
+
+    var defaultSize = pskl.UserSettings.get(pskl.UserSettings.DEFAULT_SIZE);
+
+    this.widthInput = this.container.querySelector('[name="default-width"]');
+    this.heightInput = this.container.querySelector('[name="default-height"]');
+
+    this.widthInput.value = defaultSize.width;
+    this.heightInput.value = defaultSize.height;
+
+    this.defaultSizeForm = this.container.querySelector('form');
+    this.addEventListener(this.defaultSizeForm, 'submit', this.onFormSubmit_);
+  };
+
+  ns.DefaultSizeController.prototype.onFormSubmit_ = function (evt) {
+    evt.preventDefault();
+
+    var defaultSize = pskl.UserSettings.get(pskl.UserSettings.DEFAULT_SIZE);
+
+    var width = this.toNumber_(this.widthInput.value, defaultSize.width);
+    var height = this.toNumber_(this.heightInput.value, defaultSize.height);
+
+    pskl.UserSettings.set(pskl.UserSettings.DEFAULT_SIZE, {
+      width : width,
+      height : height
+    });
+    $.publish(Events.CLOSE_SETTINGS_DRAWER);
+  };
+
+  ns.DefaultSizeController.prototype.toNumber_ = function (strValue, defaultValue) {
+    var value = parseInt(strValue, 10);
+    if (value === 0 || isNaN(value)) {
+      value = defaultValue;
+    }
+    return value;
+  };
+})();

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

@@ -0,0 +1,129 @@
+(function () {
+  var ns = $.namespace('pskl.controller.settings.resize');
+
+  ns.ResizeController = function (piskelController) {
+    this.piskelController = piskelController;
+
+    this.container = document.querySelector('.resize-canvas');
+
+    var anchorWidgetContainer = this.container.querySelector('.resize-origin-container');
+    this.anchorWidget = new ns.AnchorWidget(anchorWidgetContainer);
+    this.defaultSizeController = new ns.DefaultSizeController(piskelController);
+  };
+
+  pskl.utils.inherit(ns.ResizeController, pskl.controller.settings.AbstractSettingController);
+
+  ns.ResizeController.prototype.init = function () {
+    this.widthInput = this.container.querySelector('[name="resize-width"]');
+    this.heightInput = this.container.querySelector('[name="resize-height"]');
+    this.resizeForm = this.container.querySelector('form');
+    this.resizeContentCheckbox = this.container.querySelector('.resize-content-checkbox');
+    this.maintainRatioCheckbox = this.container.querySelector('.resize-ratio-checkbox');
+
+    var initWidth = this.piskelController.getWidth();
+    var initHeight = this.piskelController.getHeight();
+    this.sizeInputWidget = new pskl.widgets.SizeInput(this.widthInput, this.heightInput, initWidth, initHeight);
+
+    this.anchorWidget.setOrigin(ns.AnchorWidget.ORIGIN.TOPLEFT);
+
+    this.addEventListener(this.resizeForm, 'submit', this.onResizeFormSubmit_);
+    this.addEventListener(this.resizeContentCheckbox, 'change', this.onResizeContentChange_);
+    this.addEventListener(this.maintainRatioCheckbox, 'change', this.onMaintainRatioChange_);
+
+    this.defaultSizeController.init();
+  };
+
+  ns.ResizeController.prototype.destroy = function () {
+    this.anchorWidget.destroy();
+    this.sizeInputWidget.destroy();
+    this.superclass.destroy.call(this);
+  };
+
+  ns.ResizeController.prototype.onResizeFormSubmit_ = function (evt) {
+    evt.preventDefault();
+
+    var resizedLayers = this.piskelController.getLayers().map(this.resizeLayer_.bind(this));
+
+    var piskel = pskl.model.Piskel.fromLayers(resizedLayers, this.piskelController.getPiskel().getDescriptor());
+
+    // propagate savepath to new Piskel
+    piskel.savePath = pskl.app.piskelController.getSavePath();
+    pskl.app.piskelController.setPiskel(piskel, true);
+
+    $.publish(Events.CLOSE_SETTINGS_DRAWER);
+  };
+
+  ns.ResizeController.prototype.resizeLayer_ = function (layer) {
+    var resizedFrames = layer.getFrames().map(this.resizeFrame_.bind(this));
+    return pskl.model.Layer.fromFrames(layer.getName(), resizedFrames);
+  };
+
+  ns.ResizeController.prototype.onResizeContentChange_ = function (evt) {
+    var target = evt.target;
+    if (target.checked) {
+      this.anchorWidget.disable();
+    } else {
+      this.anchorWidget.enable();
+    }
+  };
+
+  ns.ResizeController.prototype.onMaintainRatioChange_ = function (evt) {
+    var target = evt.target;
+    if (target.checked) {
+      this.sizeInputWidget.enableSync();
+    } else {
+      this.sizeInputWidget.disableSync();
+    }
+  };
+
+  /***********************/
+  /* 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

@@ -33,7 +33,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 layer = new pskl.model.Layer("Layer 1");
+    var layer = new pskl.model.Layer('Layer 1');
     var frame = new pskl.model.Frame(width, height);
 
     layer.addFrame(frame);
@@ -47,7 +47,7 @@
     var then = function () {};
 
     image.onload = function () {
-      this.referencePng = pskl.CanvasUtils.createFromImage(image).toDataURL();
+      this.referencePng = pskl.utils.CanvasUtils.createFromImage(image).toDataURL();
       then();
     }.bind(this);
     image.src = this.referencePng;
@@ -88,8 +88,8 @@
         this.playInstrumentedEvent_(recordEvent);
       }
 
-      if (this.events[index+1]) {
-        this.playEvent_(index+1);
+      if (this.events[index + 1]) {
+        this.playEvent_(index + 1);
       } else {
         this.onTestEnd_();
       }
@@ -101,6 +101,10 @@
     var screenCoordinates = pskl.app.drawingController.getScreenCoordinates(recordEvent.coords.x, recordEvent.coords.y);
     event.clientX = screenCoordinates.x;
     event.clientY = screenCoordinates.y;
+    if (pskl.utils.UserAgent.isMac && event.ctrlKey) {
+      event.metaKey = true;
+    }
+
     if (event.type == 'mousedown') {
       pskl.app.drawingController.onMousedown_(event);
     } else if (event.type == 'mouseup') {
@@ -144,4 +148,4 @@
     this.callbacks.push(callback);
   };
 
-})();
+})();

src/js/devtools/DrawingTestRecorder.js

@@ -105,11 +105,11 @@
   ns.DrawingTestRecorder.prototype.recordMouseEvent_ = function (mouseEvent) {
     var coords = pskl.app.drawingController.getSpriteCoordinates(mouseEvent.clientX, mouseEvent.clientY);
     var recordEvent = new ns.MouseEvent(mouseEvent, coords);
-    var lastEvent = this.events[this.events.length-1];
+    var lastEvent = this.events[this.events.length - 1];
 
     if (!recordEvent.equals(lastEvent)) {
       this.events.push(recordEvent);
     }
   };
 
-})();
+})();

src/js/devtools/DrawingTestRunner.js

@@ -18,8 +18,7 @@
     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:' + png);
     document.body.appendChild(testResult);
   };
-
-})();
+})();

src/js/devtools/DrawingTestSuiteController.js

@@ -60,7 +60,7 @@
   ns.DrawingTestSuiteController.prototype.onTestSuiteEnd_ = function (evt, status) {
     console.log('on test suite end');
     var elapsed = Date.now() - this.startTime_;
-    elapsed = (elapsed/1000).toFixed(4);
+    elapsed = (elapsed / 1000).toFixed(4);
 
     var testSuiteStatus = document.createElement('li');
     testSuiteStatus.innerHTML = pskl.utils.Template.replace(
@@ -74,4 +74,4 @@
     // keep only the part after the last '/'
     return path.replace(/^.*\/([^\/]+.json$)/, '$1');
   };
-})();
+})();

src/js/devtools/DrawingTestSuiteRunner.js

@@ -60,4 +60,4 @@
     this.status = success ? ns.DrawingTestSuiteRunner.STATUS.SUCCESS : ns.DrawingTestSuiteRunner.STATUS.ERROR;
     $.publish(Events.TEST_SUITE_END, [this.status]);
   };
-})();
+})();

src/js/devtools/MouseEvent.js

@@ -22,5 +22,4 @@
       return false;
     }
   };
-
-})();
+})();

src/js/devtools/TestRecordController.js

@@ -27,7 +27,7 @@
     var stopInput = document.createElement('button');
     stopInput.innerHTML = 'Stop record';
     stopInput.addEventListener('click', this.onStopInputClick_.bind(this));
-    stopInput.setAttribute('disabled','disabled');
+    stopInput.setAttribute('disabled', 'disabled');
 
     this.container = container;
     this.fileInput = this.container.appendChild(fileInput);
@@ -43,9 +43,9 @@
   ns.TestRecordController.prototype.onFileInputChange_  = function () {
     var files = this.fileInput.files;
     if (files.length == 1) {
-      var file =files[0];
+      var file = files[0];
       pskl.utils.FileUtils.readFile(file, function (content) {
-        var testRecord = JSON.parse(window.atob(content.replace(/data\:.*?\;base64\,/,'')));
+        var testRecord = JSON.parse(window.atob(content.replace(/data\:.*?\;base64\,/, '')));
         var testPlayer = new ns.DrawingTestPlayer(testRecord);
         testPlayer.start();
       }.bind(this));
@@ -54,7 +54,7 @@
 
   ns.TestRecordController.prototype.onStartInputClick_  = function () {
     this.testRecorder.startRecord();
-    this.startInput.setAttribute('disabled','disabled');
+    this.startInput.setAttribute('disabled', 'disabled');
     this.stopInput.removeAttribute('disabled');
   };
 
@@ -63,14 +63,14 @@
 
     pskl.utils.BlobUtils.stringToBlob(testRecord, function(blob) {
       pskl.utils.FileUtils.downloadAsFile(blob, 'record_piskel.json');
-    }.bind(this), "application/json");
+    }.bind(this), 'application/json');
 
     this.startInput.removeAttribute('disabled');
-    this.stopInput.setAttribute('disabled','disabled');
+    this.stopInput.setAttribute('disabled', 'disabled');
   };
 
   ns.TestRecordController.prototype.onTestRecordEnd_  = function (evt, success) {
     window.alert('Test finished : ', success);
   };
 
-})();
+})();

src/js/devtools/init.js

@@ -31,4 +31,4 @@
     }
   };
 
-})();
+})();

src/js/devtools/lib/Blob.js

@@ -0,0 +1,195 @@
+(function (view) {
+  "use strict";
+
+  view.URL = view.URL || view.webkitURL;
+
+  if (view.Blob && view.URL) {
+    try {
+      new Blob;
+      return;
+    } catch (e) {}
+  }
+
+  // Internally we use a BlobBuilder implementation to base Blob off of
+  // in order to support older browsers that only have BlobBuilder
+  var BlobBuilder = view.BlobBuilder || view.WebKitBlobBuilder || view.MozBlobBuilder || (function(view) {
+    var
+        get_class = function(object) {
+        return Object.prototype.toString.call(object).match(/^\[object\s(.*)\]$/)[1];
+      }
+      , FakeBlobBuilder = function BlobBuilder() {
+        this.data = [];
+      }
+      , FakeBlob = function Blob(data, type, encoding) {
+        this.data = data;
+        this.size = data.length;
+        this.type = type;
+        this.encoding = encoding;
+      }
+      , FBB_proto = FakeBlobBuilder.prototype
+      , FB_proto = FakeBlob.prototype
+      , FileReaderSync = view.FileReaderSync
+      , FileException = function(type) {
+        this.code = this[this.name = type];
+      }
+      , file_ex_codes = (
+          "NOT_FOUND_ERR SECURITY_ERR ABORT_ERR NOT_READABLE_ERR ENCODING_ERR "
+        + "NO_MODIFICATION_ALLOWED_ERR INVALID_STATE_ERR SYNTAX_ERR"
+      ).split(" ")
+      , file_ex_code = file_ex_codes.length
+      , real_URL = view.URL || view.webkitURL || view
+      , real_create_object_URL = real_URL.createObjectURL
+      , real_revoke_object_URL = real_URL.revokeObjectURL
+      , URL = real_URL
+      , btoa = view.btoa
+      , atob = view.atob
+
+      , ArrayBuffer = view.ArrayBuffer
+      , Uint8Array = view.Uint8Array
+
+      , origin = /^[\w-]+:\/*\[?[\w\.:-]+\]?(?::[0-9]+)?/
+    ;
+    FakeBlob.fake = FB_proto.fake = true;
+    while (file_ex_code--) {
+      FileException.prototype[file_ex_codes[file_ex_code]] = file_ex_code + 1;
+    }
+    // Polyfill URL
+    if (!real_URL.createObjectURL) {
+      URL = view.URL = function(uri) {
+        var
+            uri_info = document.createElementNS("http://www.w3.org/1999/xhtml", "a")
+          , uri_origin
+        ;
+        uri_info.href = uri;
+        if (!("origin" in uri_info)) {
+          if (uri_info.protocol.toLowerCase() === "data:") {
+            uri_info.origin = null;
+          } else {
+            uri_origin = uri.match(origin);
+            uri_info.origin = uri_origin && uri_origin[1];
+          }
+        }
+        return uri_info;
+      };
+    }
+    URL.createObjectURL = function(blob) {
+      var
+          type = blob.type
+        , data_URI_header
+      ;
+      if (type === null) {
+        type = "application/octet-stream";
+      }
+      if (blob instanceof FakeBlob) {
+        data_URI_header = "data:" + type;
+        if (blob.encoding === "base64") {
+          return data_URI_header + ";base64," + blob.data;
+        } else if (blob.encoding === "URI") {
+          return data_URI_header + "," + decodeURIComponent(blob.data);
+        } if (btoa) {
+          return data_URI_header + ";base64," + btoa(blob.data);
+        } else {
+          return data_URI_header + "," + encodeURIComponent(blob.data);
+        }
+      } else if (real_create_object_URL) {
+        return real_create_object_URL.call(real_URL, blob);
+      }
+    };
+    URL.revokeObjectURL = function(object_URL) {
+      if (object_URL.substring(0, 5) !== "data:" && real_revoke_object_URL) {
+        real_revoke_object_URL.call(real_URL, object_URL);
+      }
+    };
+    FBB_proto.append = function(data/*, endings*/) {
+      var bb = this.data;
+      // decode data to a binary string
+      if (Uint8Array && (data instanceof ArrayBuffer || data instanceof Uint8Array)) {
+        var
+            str = ""
+          , buf = new Uint8Array(data)
+          , i = 0
+          , buf_len = buf.length
+        ;
+        for (; i < buf_len; i++) {
+          str += String.fromCharCode(buf[i]);
+        }
+        bb.push(str);
+      } else if (get_class(data) === "Blob" || get_class(data) === "File") {
+        if (FileReaderSync) {
+          var fr = new FileReaderSync;
+          bb.push(fr.readAsBinaryString(data));
+        } else {
+          // async FileReader won't work as BlobBuilder is sync
+          throw new FileException("NOT_READABLE_ERR");
+        }
+      } else if (data instanceof FakeBlob) {
+        if (data.encoding === "base64" && atob) {
+          bb.push(atob(data.data));
+        } else if (data.encoding === "URI") {
+          bb.push(decodeURIComponent(data.data));
+        } else if (data.encoding === "raw") {
+          bb.push(data.data);
+        }
+      } else {
+        if (typeof data !== "string") {
+          data += ""; // convert unsupported types to strings
+        }
+        // decode UTF-16 to binary string
+        bb.push(unescape(encodeURIComponent(data)));
+      }
+    };
+    FBB_proto.getBlob = function(type) {
+      if (!arguments.length) {
+        type = null;
+      }
+      return new FakeBlob(this.data.join(""), type, "raw");
+    };
+    FBB_proto.toString = function() {
+      return "[object BlobBuilder]";
+    };
+    FB_proto.slice = function(start, end, type) {
+      var args = arguments.length;
+      if (args < 3) {
+        type = null;
+      }
+      return new FakeBlob(
+          this.data.slice(start, args > 1 ? end : this.data.length)
+        , type
+        , this.encoding
+      );
+    };
+    FB_proto.toString = function() {
+      return "[object Blob]";
+    };
+    FB_proto.close = function() {
+      this.size = 0;
+      delete this.data;
+    };
+    return FakeBlobBuilder;
+  }(view));
+
+  view.Blob = function(blobParts, options) {
+    var type = options ? (options.type || "") : "";
+    var builder = new BlobBuilder();
+    if (blobParts) {
+      for (var i = 0, len = blobParts.length; i < len; i++) {
+        if (Uint8Array && blobParts[i] instanceof Uint8Array) {
+          builder.append(blobParts[i].buffer);
+        }
+        else {
+          builder.append(blobParts[i]);
+        }
+      }
+    }
+    var blob = builder.getBlob(type);
+    if (!blob.slice && blob.webkitSlice) {
+      blob.slice = blob.webkitSlice;
+    }
+    return blob;
+  };
+
+  var getPrototypeOf = Object.getPrototypeOf || function(object) {
+    return object.__proto__;
+  };
+  view.Blob.prototype = getPrototypeOf(new view.Blob());
+}(typeof self !== "undefined" && self || typeof window !== "undefined" && window || this.content || this));

src/js/lib/gif/libgif.js

@@ -624,6 +624,7 @@ var SuperGif = function ( opts ) {
   };
 
   var load_callback = false;
+  var step_callback = false;
   var error_callback = false;
   var tmpCanvas = document.createElement('canvas');
 
@@ -632,6 +633,7 @@ var SuperGif = function ( opts ) {
     load: function (callback) {
 
       load_callback = callback.success;
+      step_callback = callback.step;
       error_callback = callback.error;
 
       loading = true;