typecode
diff --git a/‎lib/PushstateHelper.js
Lines changed: 35 additions & 17 deletions b/‎lib/PushstateHelper.js
Lines changed: 35 additions & 17 deletions
diff --git a/‎requirepaths.js
Lines changed: 6 additions & 0 deletions b/‎requirepaths.js
Lines changed: 6 additions & 0 deletions
diff --git a/‎thirdparty/jquery-migrate-1.2.1.min.js
Lines changed: 2 additions & 0 deletions b/‎thirdparty/jquery-migrate-1.2.1.min.js
Lines changed: 2 additions & 0 deletions
diff --git a/‎thirdparty/jquery.ba-hashchange.min.js
Lines changed: 9 additions & 0 deletions b/‎thirdparty/jquery.ba-hashchange.min.js
Lines changed: 9 additions & 0 deletions
@@ -15,6 +15,11 @@ From 2010 till ∞
 typecode-js v 0.1
 */
 
+// This module uses jQuery Hashchange (http://benalman.com/projects/jquery-hashchange-plugin/)
+// as a fallback to emulate pushstate behavior on browsers that don't support pushstate.
+// The hashchange plugin subsequently requires jQuery Migrate (https://github.com/jquery/jquery-migrate)
+// if being used with jQuery version 1.9 +
+
 define(['jquery'], function($) {
 
     var window = this,
@@ -31,23 +36,34 @@ define(['jquery'], function($) {
 
         internal = {
             name: 'mod.PushstateHelper',
-            previous_path: window.location.pathname
+            previous_path: o.use_hash ?
+                window.location.hash.replace('#', '') : window.location.pathname
         };
 
         fn = {
             init: function() {
                 $(document).on('click', '.js-use-pushstate, .js-simulate-pushstate, .js-do-popstate', handlers.doc_click);
-                $(window).on('popstate', handlers.popstate).on('pushstate', handlers.pushstate).on('simulate-pushstate', handlers.simulate_pushstate);
-                o.app.events.on('app.featuresInitialized', handlers.features_initialized);
-                if(o.use_hash){
-                    fn.statechange(window.location.hash);
+                $(window)
+                    .on('popstate', handlers.popstate)
+                    .on('pushstate', handlers.pushstate)
+                    .on('simulate-pushstate', handlers.simulate_pushstate);
+
+                if (o.use_hash) {
+                    require(['jquery_migrate', 'hashchange'], function() {
+                        $(window).on('hashchange', handlers.hashchange);
+                        fn.statechange(window.location.hash);
+                    });
                 } else {
                     fn.statechange(window.location.pathname);
                 }
             },
             statechange: function(pathname, data){
                 var i, path_components, position, _event_data;
 
+                if (o.use_hash) {
+                    pathname = pathname.replace('#', '');
+                }
+
                 path_components = PushstateHelper.get_path_components(pathname);
 
                 _event_data = {
@@ -69,25 +85,23 @@ define(['jquery'], function($) {
         };
 
         handlers = {
-            features_initialized: function(e,d){
-                //fn.statechange(window.location);
-            },
             doc_click: function(e, d) {
-                var _href, _data;
+                var $t, _href, _data;
                 e.preventDefault();
-                _href = $(this).attr('HREF');
-                _data = $(this).data();
-                if($(this).hasClass('js-use-pushstate')){
+                $t = $(this);
+                _href = $t.attr('HREF');
+                _data = $t.data();
+                if($t.hasClass('js-use-pushstate')){
                     if(o.use_hash){
                         window.location.hash = _href;
                         fn.statechange(window.location.hash, _data);
                     } else {
                         history.pushState(null, null, _href);
                         fn.statechange(window.location.pathname, _data);
                     }
-                } else if($(this).hasClass('js-simulate-pushstate')) {
+                } else if($t.hasClass('js-simulate-pushstate')) {
                     fn.statechange(_href, _data);
-                } else if($(this).hasClass('js-do-popstate')) {
+                } else if($t.hasClass('js-do-popstate')) {
                     history.back();
                 }
             },
@@ -108,14 +122,19 @@ define(['jquery'], function($) {
                         history.pushState(null, null, d.pathname);
                     }
                 }
-                if(!d.prevent_propagation){
+                if(!d || !d.prevent_propagation){
                     fn.statechange(d.pathname, d);
                 }
             },
             simulate_pushstate: function(e, d) {
-                if(!d.prevent_propagation){
+                if(!d || !d.prevent_propagation){
                     fn.statechange(d.pathname, d);
                 }
+            },
+            hashchange: function(e, d) {
+                if (!d || !d.prevent_propagation) {
+                    fn.statechange(window.location.hash);
+                }
             }
         };
 
@@ -127,7 +146,6 @@ define(['jquery'], function($) {
 
     PushstateHelper.get_path_components = function(path){
         var components, position;
-        components = [];
         components = path.split('/');
         position = components.length;
         while(position--){
 
@@ -1,6 +1,8 @@
 require = {
 	paths: {
 		'jquery': 'http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min',
+		'jquery_migrate': 'http://code.jquery.com/jquery-migrate-1.2.1.js',
+		'hashchange': 'thirdparty/jquery-migrate-1.2.1.min',
 
 		'NIanim': 'lib/anim',
 		'NIAnimator': 'lib/Animator',
@@ -38,5 +40,9 @@ require = {
 		'NIvalidation': 'lib/validation',
 
 		'NIPushstateHelper': 'lib/PushstateHelper'
+	},
+	shim: {
+		jquery_migrate: ['jquery'],
+		hashchange: ['jquery', 'jquery_migrate']
 	}
 };