Merge branch 'master' into fix-palette-bugs

src/js/utils/Event.js

@@ -0,0 +1,42 @@
+(function () {
+  var ns = $.namespace('pskl.utils');
+
+  ns.Event = {};
+
+  ns.Event.addEventListener = function (el, type, callback, scope, args) {
+    var listener = {
+      el : el,
+      type : type,
+      callback : callback,
+      handler : args ? callback.bind(scope, args) : callback.bind(scope)
+    };
+
+    scope.__pskl_listeners = scope.__pskl_listeners || [];
+    scope.__pskl_listeners.push(listener);
+    el.addEventListener(type, listener.handler);
+  };
+
+  ns.Event.removeEventListener = function (el, type, callback, scope) {
+    if (scope && scope.__pskl_listeners) {
+      var listeners = scope.__pskl_listeners;
+      for (var i = 0 ; i < listeners.length ; i++) {
+        if (listeners[i].callback === callback) {
+          el.removeEventListener(type, listeners[i].handler);
+          listeners.slice(i, 1);
+          break;
+        }
+      }
+    }
+  };
+
+  ns.Event.removeAllEventListeners = function (scope) {
+    if (scope && scope.__pskl_listeners) {
+      var listeners = scope.__pskl_listeners;
+      for (var i = 0 ; i < listeners.length ; i++) {
+        var listener = listeners[i];
+        listener.el.removeEventListener(listener.type, listener.handler);
+      }
+      scope.__pskl_listeners = [];
+    }
+  };
+})();

src/js/utils/UserSettings.js

@@ -3,6 +3,7 @@
 
   ns.UserSettings = {
     GRID_WIDTH : 'GRID_WIDTH',
+    MAX_FPS : 'MAX_FPS',
     CANVAS_BACKGROUND : 'CANVAS_BACKGROUND',
     SELECTED_PALETTE : 'SELECTED_PALETTE',
     TILED_PREVIEW : 'TILED_PREVIEW',
@@ -11,6 +12,7 @@
 
     KEY_TO_DEFAULT_VALUE_MAP_ : {
       'GRID_WIDTH' : 0,
+      'MAX_FPS' : 24,
       'CANVAS_BACKGROUND' : 'lowcont-dark-canvas-background',
       'SELECTED_PALETTE' : Constants.CURRENT_COLORS_PALETTE_ID,
       'TILED_PREVIEW' : false,