1.8.4

LucasMateijsen · Aug 24, 2015 · 0425839 · 0425839
1 parent 2b149ee
commit 0425839
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "elessar",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "Draggable multiple range sliders",
   "authors": [
     "Matt Brennan <[email protected]>"
@@ -21,4 +21,4 @@
     "requirejs": "~2.1.9",
     "moment": "~2.4.0"
   }
-}
+}
diff --git a/dist/elessar.js b/dist/elessar.js
@@ -93,7 +93,7 @@
             function (_dereq_, module, exports) {
                 var has = Object.prototype.hasOwnProperty;
                 module.exports = function getEventProperty(prop, event) {
-                    return has.call(event, prop) ? event[prop] : event.originalEvent && has.call(event.originalEvent, 'touches') ? event.originalEvent.touches[0][prop] : 0;
+                    return has.call(event, prop) ? event[prop] : event.originalEvent && event.originalEvent.touches ? event.originalEvent.touches[0][prop] : 0;
                 };
             },
             {}
@@ -787,14 +787,14 @@
                             Base.displayName = 'Base';
                             var attach, prototype = Base.prototype, constructor = Base;
                             attach = function (obj, name, prop, super$, superclass$) {
-                                return obj[name] = typeof prop === 'function' ? function () {
+                                return obj[name] = typeof prop === 'function' ? import$(function () {
                                     var this$ = this;
                                     prop.superclass$ = superclass$;
                                     prop.super$ = function () {
                                         return super$.apply(this$, arguments);
                                     };
                                     return prop.apply(this, arguments);
-                                } : prop;
+                                }, prop) : prop;
                             };
                             Base.extend = function (displayName, proto) {
                                 proto == null && (proto = displayName);
@@ -841,6 +841,13 @@
                             return Base;
                         }();
                     }));
+                    function import$(obj, src) {
+                        var own = {}.hasOwnProperty;
+                        for (var key in src)
+                            if (own.call(src, key))
+                                obj[key] = src[key];
+                        return obj;
+                    }
                     function extend$(sub, sup) {
                         function fun() {
                         }
@@ -850,13 +857,6 @@
                             sup.extended(sub);
                         return sub;
                     }
-                    function import$(obj, src) {
-                        var own = {}.hasOwnProperty;
-                        for (var key in src)
-                            if (own.call(src, key))
-                                obj[key] = src[key];
-                        return obj;
-                    }
                 }.call(this));
             },
             {}