update handling of resize message

js/angular/components/iconic/iconic.js

@@ -146,10 +146,12 @@
         var svgElement, ico = iconic.getAccess();
 
         injectSvg(element[0]);
+
+        // subscribe for resize events
+        foundationApi.subscribe('resize', resize);
 
-        foundationApi.subscribe('resize', function () {
-          // only run update on current element
-          ico.update(element[0]);
+        scope.$on("$destroy", function() {
+          foundationApi.unsubscribe('resize', resize);
         });
 
         // handle dynamic updating of src
@@ -249,6 +251,11 @@
             }
           });
         }
+
+        function resize() {
+          // run update on current element
+          ico.update(element[0]);
+        }
       }
 
       function addDataDash(attr) {

js/angular/components/interchange/interchange.js

@@ -27,8 +27,32 @@
 
       var globalQueries = foundationMQ.getMediaQueries();
 
-      //setup
-      foundationApi.subscribe('resize', function(msg) {
+      // subscribe for resize events
+      foundationApi.subscribe('resize', resize);
+
+      scope.$on("$destroy", function() {
+        foundationApi.unsubscribe('resize', resize);
+      });
+
+      //init
+      foundationApi.publish('resize', 'initial resize');
+
+      function templateLoader(templateUrl) {
+        return $http.get(templateUrl, {cache: $templateCache});
+      }
+
+      function collectInformation(el) {
+        var data = foundationMQ.collectScenariosFromElement(el);
+
+        scenarios = data.scenarios;
+        innerTemplates = data.templates;
+      }
+
+      function checkScenario(scenario) {
+        return !current || current !== scenario;
+      }
+
+      function resize(msg) {
         transclude(function(clone, newScope) {
           if(!scenarios || !innerTemplates) {
             collectInformation(clone);
@@ -68,25 +92,6 @@
             }
           }
         });
-
-      });
-
-      //init
-      foundationApi.publish('resize', 'initial resize');
-
-      function templateLoader(templateUrl) {
-        return $http.get(templateUrl, {cache: $templateCache});
-      }
-
-      function collectInformation(el) {
-        var data = foundationMQ.collectScenariosFromElement(el);
-
-        scenarios = data.scenarios;
-        innerTemplates = data.templates;
-      }
-
-      function checkScenario(scenario) {
-        return !current || current !== scenario;
       }
     }
   }
@@ -220,17 +225,10 @@
 
       function postLink(scope, element, attrs) {
         // subscribe for resize events
-        foundationApi.subscribe('resize', function() {
-          var orignalVisibilty = scope[queryResult];
-          runQuery();
-          if (orignalVisibilty != scope[queryResult]) {
-            // digest if visibility changed
-            scope.$digest();
-          }
-        });
+        foundationApi.subscribe('resize', resize);
 
         scope.$on("$destroy", function() {
-          foundationApi.unsubscribe('resize');
+          foundationApi.unsubscribe('resize', resize);
         });
 
         // run first media query check
@@ -255,6 +253,15 @@
             }
           }
         }
+
+        function resize() {
+          var orignalVisibilty = scope[queryResult];
+          runQuery();
+          if (orignalVisibilty != scope[queryResult]) {
+            // digest if visibility changed
+            scope.$digest();
+          }
+        }
       }
     }
   }

js/angular/services/foundation.core.js

@@ -41,8 +41,27 @@
     }
 
     function unsubscribe(name, callback) {
+      var listenerIndex = -1, i, resizeListeners;
+
       if (listeners[name] !== undefined) {
-        delete listeners[name];
+        if (name == 'resize') {
+          resizeListeners = listeners['resize'];
+          for (i = 0; i < resizeListeners.length; i++) {
+            if (resizeListeners[i] === callback) {
+              // listener found
+              listenerIndex = i;
+              break;
+            }
+          }
+
+          if (listenerIndex != -1) {
+            // remove listener
+            resizeListeners.splice(listenerIndex, 1);
+          }
+        } else {
+          // delete all listeners
+          delete listeners[name];
+        }
       }
       if (typeof callback == 'function') {
           callback.call(this);