Merge pull request #48 from chrishumboldt/dev-rocket

Whoops. Lets just leave it at that.
chrishumboldt · Apr 5, 2017 · b5a3842 · b5a3842
2 parents 35c4d84 + a33d21f
commit b5a3842
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 52 deletions.
diff --git a/build/js/tools.js b/build/js/tools.js
@@ -807,38 +807,48 @@ var Rocket;
     Rocket.event = {
         add: function (elms, type, eventHandle) {
             if (type === void 0) { type = 'click'; }
+            Rocket.event.apply(elms, type, eventHandle, 'add');
         },
-        apply: function (elm, type, eventHandle, eventType) {
-            if (!Rocket.exists(elm))
+        apply: function (elms, type, eventHandle, eventType) {
+            if (type === void 0) { type = 'click'; }
+            var domElms = Rocket.dom.select(elms);
+            // Catch
+            if (domElms.length < 1) {
                 return;
-            // Check event type
-            switch (eventType) {
-                case 'add':
-                    if (elm.addEventListener) {
-                        elm.addEventListener(type, eventHandle, false);
-                    }
-                    else if (elm.attachEvent) {
-                        elm.attachEvent('on' + type, eventHandle);
-                    }
-                    else {
-                        elm['on' + type] = eventHandle;
-                    }
-                    break;
-                case 'remove':
-                    if (elm.removeEventListener) {
-                        elm.removeEventListener(type, eventHandle, false);
-                    }
-                    else if (elm.detachEvent) {
-                        elm.detachEvent('on' + type, eventHandle);
-                    }
-                    else {
-                        elm['on' + type] = eventHandle;
-                    }
-                    break;
+            }
+            // Continue
+            for (var _i = 0, domElms_1 = domElms; _i < domElms_1.length; _i++) {
+                var elm = domElms_1[_i];
+                // Check event type
+                switch (eventType) {
+                    case 'add':
+                        if (elm.addEventListener) {
+                            elm.addEventListener(type, eventHandle, false);
+                        }
+                        else if (elm.attachEvent) {
+                            elm.attachEvent('on' + type, eventHandle);
+                        }
+                        else {
+                            elm['on' + type] = eventHandle;
+                        }
+                        break;
+                    case 'remove':
+                        if (elm.removeEventListener) {
+                            elm.removeEventListener(type, eventHandle, false);
+                        }
+                        else if (elm.detachEvent) {
+                            elm.detachEvent('on' + type, eventHandle);
+                        }
+                        else {
+                            elm['on' + type] = eventHandle;
+                        }
+                        break;
+                }
             }
         },
         remove: function (elms, type, eventHandle) {
             if (type === void 0) { type = 'click'; }
+            Rocket.event.apply(elms, type, eventHandle, 'remove');
         }
     };
     // Gets

diff --git a/build/ts/tools.ts b/build/ts/tools.ts
@@ -848,36 +848,42 @@ module Rocket {
    // Events
    export const event = {
       add: (elms, type = 'click', eventHandle) => {
-
+         Rocket.event.apply(elms, type, eventHandle, 'add');
       },
-      apply: (elm, type, eventHandle, eventType) => {
-         if (!Rocket.exists(elm)) return;
+      apply: (elms, type = 'click', eventHandle, eventType) => {
+         var domElms = Rocket.dom.select(elms);
 
-         // Check event type
-         switch (eventType) {
-            case 'add':
-               if (elm.addEventListener) {
-                  elm.addEventListener(type, eventHandle, false);
-               } else if (elm.attachEvent) {
-                  elm.attachEvent('on' + type, eventHandle);
-               } else {
-                  elm['on' + type] = eventHandle;
-               }
-               break;
+         // Catch
+         if (domElms.length < 1) { return; }
 
-            case 'remove':
-               if (elm.removeEventListener) {
-                  elm.removeEventListener(type, eventHandle, false);
-               } else if (elm.detachEvent) {
-                  elm.detachEvent('on' + type, eventHandle);
-               } else {
-                  elm['on' + type] = eventHandle;
-               }
-               break;
+         // Continue
+         for (let elm of domElms) {
+            // Check event type
+            switch (eventType) {
+               case 'add':
+                  if (elm.addEventListener) {
+                     elm.addEventListener(type, eventHandle, false);
+                  } else if (elm.attachEvent) {
+                     elm.attachEvent('on' + type, eventHandle);
+                  } else {
+                     elm['on' + type] = eventHandle;
+                  }
+                  break;
+
+               case 'remove':
+                  if (elm.removeEventListener) {
+                     elm.removeEventListener(type, eventHandle, false);
+                  } else if (elm.detachEvent) {
+                     elm.detachEvent('on' + type, eventHandle);
+                  } else {
+                     elm['on' + type] = eventHandle;
+                  }
+                  break;
+            }
          }
       },
       remove: (elms, type = 'click', eventHandle) => {
-
+         Rocket.event.apply(elms, type, eventHandle, 'remove');
       }
    };