add current state to elements on init

Guno100 · Jan 8, 2015 · 54ae37a · 54ae37a
1 parent c5d00d4
commit 54ae37a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/angular-gsapify-router.js b/angular-gsapify-router.js
@@ -228,8 +228,22 @@
         ];
     })
 
-    .animation('.gsapify-router', ['$rootScope', 'gsapifyRouter',
-        function($rootScope, gsapifyRouter) {
+    .animation('.gsapify-router', ['$rootScope', '$state', '$document', 'gsapifyRouter',
+        function($rootScope, $state, $document, gsapifyRouter) {
+            var watchInitialState = $rootScope.$watch(function() {
+                return $state.current.name;
+            }, function(name) {
+                if (name !== '') {
+                    watchInitialState();
+
+                    var elements = $document[0].querySelectorAll('.gsapify-router');
+
+                    angular.forEach(elements, function(el) {
+                        el.setAttribute('data-state', name);
+                    });
+                }
+            });
+
             return {
                 enter: function(element, done) {
                     $rootScope.$broadcast('gsapifyRouter:enterStart', element);
@@ -241,7 +255,9 @@
                     });
 
                     return function(cancelled) {
-                        if (cancelled) {}
+                        if (cancelled) {
+                            element.remove();
+                        }
                     };
                 },
                 leave: function(element, done) {

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-gsapify-router",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "Angular UI-Router animation directive allowing configuration of state transitions using GSAP",
   "main": "angular-gsapify-router.js",
   "ignore": [
@@ -9,8 +9,8 @@
     "!README.md"
   ],
   "dependencies": {
-    "angular": "~1.2.0",
-    "angular-animate": "~1.2.0",
+    "angular": ">=1.2.0",
+    "angular-animate": ">=1.2.0",
     "gsap": "~1.13.0",
     "angular-ui-router": "~0.2.11"
   },