Fixes to make things just work

As-You-Like · Jan 16, 2015 · ebba546 · ebba546
1 parent 8526dfe
commit ebba546
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 42 deletions.
diff --git a/js/angular/components/interchange/interchange.js b/js/angular/components/interchange/interchange.js
@@ -1,11 +1,11 @@
 (function() {
   'use strict';
 
-  angular.module('foundation.interchange', ['foundation.core', 'foundation.mediaqueries'])
+  angular.module('foundation.interchange', ['foundation.core', 'foundation.mediaquery'])
     .directive('zfInterchange', zfInterchange)
   ;
 
-  zfInterchange.$inject = [ '$compile', '$http', '$templateCache', '$animate', 'FoundationApi', 'FoundationMQ'];
+  zfInterchange.$inject = [ '$compile', '$http', '$templateCache', 'FoundationApi', 'FoundationMQ'];
 
   function zfInterchange($compile, $http, $templateCache, foundationApi, foundationMQ) {
 
@@ -78,27 +78,11 @@
         return $http.get(templateUrl, {cache: $templateCache});
       }
 
-      function collectInformation(parentElement) {
-        scenarios      = [];
-        innerTemplates = [];
+      function collectInformation(el) {
+        var data = foundationMQ.collectScenariosFromElement(el);
 
-        var elements = parentElement.children();
-        var i        = 0;
-
-        angular.forEach(elements, function(el) {
-          var elem = angular.element(el);
-
-
-          //if no source or no html, capture element itself
-          if (!elem.attr('src') || !elem.attr('src').match(/.html$/)) {
-            innerTemplates[i] = elem;
-            scenarios[i] = { media: elem.attr('media'), templ: i };
-          } else {
-            scenarios[i] = { media: elem.attr('media'), src: elem.attr('src') };
-          }
-
-          i++;
-        });
+        scenarios = data.scenarios;
+        innerTemplates = data.templates;
       }
 
       function checkScenario(scenario) {

diff --git a/js/angular/services/foundation.mediaquery.js b/js/angular/services/foundation.mediaquery.js
@@ -131,10 +131,9 @@
   function FoundationMQ(foundationApi) {
     var service = [];
 
-    var subscribers = [];
-
     service.getMediaQueries = getMediaQueries;
-    service.matched = matched;
+    service.match = match;
+    service.collectScenariosFromElement = collectScenariosFromElement;
 
     return service;
 
@@ -167,29 +166,33 @@
       return matches;
     }
 
-    function registerMediaCallback(media) {
-      window.matchMedia(media, mqListener);
-    }
+    // Collects a scenario object and templates from element
+    function collectScenariosFromElement(parentElement) {
+      var scenarios = [];
+      var templates = [];
 
-    function mqListener(media) {
-      if(media.matches && subscribers[media.matches]) {
-        subscribers.forEach(function(subscriber) {
-          subscriber();
-        });
-      }
+      var elements = parentElement.children();
+      var i        = 0;
 
-    }
+      angular.forEach(elements, function(el) {
+        var elem = angular.element(el);
 
-    function subscribeMedia(media, cb) {
-      if(!subscribers[media]){
-        subscribers[media] = [];
 
-      }
-
-      subscribers[media].push(cb);
+        //if no source or no html, capture element itself
+        if (!elem.attr('src') || !elem.attr('src').match(/.html$/)) {
+          templates[i] = elem;
+          scenarios[i] = { media: elem.attr('media'), templ: i };
+        } else {
+          scenarios[i] = { media: elem.attr('media'), src: elem.attr('src') };
+        }
 
-      registerMediaCallback(media, cb);
+        i++;
+      });
 
+      return {
+        scenarios: scenarios,
+        templates: templates
+      };
     }
   }
 })();