Merge branch 'project/architizer' of https://github.com/typecode/typecode-js into project/architizer

LevKanter · LevKanter · commit badfc40773db · 2013-05-28T14:36:24.000-04:00
diff --git a/lib/Merlin2.js b/lib/Merlin2.js
@@ -278,6 +278,12 @@ define(['jquery', 'NIseed'], function($) {
             get_n_step_renders: function(){
                 return internal.n_step_renders;
             },
+            get_step: function(name){
+                if(internal.steps[name]){
+                    return internal.steps[name];
+                }
+                return null;
+            },
             destroy: function() {
                 $.each(internal.controls, function(k, control) {
                     if (handlers[k]) {
@@ -327,6 +333,7 @@ define(['jquery', 'NIseed'], function($) {
         this.get_val = fn.get_val;
         this.get_dom = fn.get_dom;
         this.get_name = fn.get_name;
+        this.get_step = fn.get_step;
         this.get_n_step_renders = fn.get_n_step_renders;
         this.destroy = fn.destroy;
 
diff --git a/lib/PushstateHelper.js b/lib/PushstateHelper.js
@@ -35,27 +35,27 @@ define(['jquery'], function($) {
 
         fn = {
             init: function() {
-                $(document).on('click', '.js-use-pushstate', handlers.doc_click);
-                $(window).on('popstate', handlers.popstate).on('pushstate', handlers.pushstate);
+                $(document).on('click', '.js-use-pushstate, .js-simulate-pushstate', 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);
-                fn.statechange(window.location);
+                if(o.use_hash){
+                    fn.statechange(window.location.hash);
+                } else {
+                    fn.statechange(window.location.pathname);
+                }
             },
-            statechange: function(href){
+            statechange: function(pathname){
                 var i, path_components, position;
 
-                if(o.use_hash && href.hash){
-                    path_components = PushstateHelper.get_path_components(href.hash);
-                } else {
-                    path_components = PushstateHelper.get_path_components(href.pathname);
-                }
+                path_components = PushstateHelper.get_path_components(pathname);
 
                 // push the state change to Google Analytics
                 if(window._gaq){
-                    _gaq.push(['_trackPageview', href]);
+                    _gaq.push(['_trackPageview', pathname]);
                 }
 
                 o.app.events.trigger('navigationEvent:Pushstate', {
-                    location: href,
+                    path: pathname,
                     components: path_components
                 });
             },
@@ -70,31 +70,42 @@ define(['jquery'], function($) {
                 //fn.statechange(window.location);
             },
             doc_click: function(e, d) {
+                var _href;
                 e.preventDefault();
-                if(o.use_hash){
-                    window.location.hash = $(this).attr('HREF');
+                _href = $(this).attr('HREF');
+                if(!$(this).hasClass('js-simulate-pushstate')){
+                    if(o.use_hash){
+                        window.location.hash = _href;
+                        fn.statechange(window.location.hash);
+                    } else {
+                        history.pushState(null, null, _href);
+                        fn.statechange(window.location.pathname);
+                    }
+                    
                 } else {
-                    history.pushState(null, null, $(this).attr('HREF'));
+                    fn.statechange(_href);
                 }
-                fn.statechange(window.location);
             },
             popstate: function(e, d) {
                 fn.statechange(window.location);
             },
             pushstate: function(e, d) {
                 if(o.use_hash){
-                    if(window.location.hash == d.pathname){
-                        return;
+                    if(window.location.hash != d.pathname){
+                        window.location.hash = d.pathname;
                     }
-                    window.location.hash = d.pathname;
                 } else {
-                    if(window.location.pathname == d.pathname){
-                        return;
+                    if(window.location.pathname != d.pathname){
+                        history.pushState(null, null, d.pathname);
                     }
-                    history.pushState(null, null, d.pathname);
                 }
                 if(!d.prevent_propagation){
-                    fn.statechange(d);
+                    fn.statechange(d.pathname);
+                }
+            },
+            simulate_pushstate: function(e, d) {
+                if(!d.prevent_propagation){
+                    fn.statechange(d.pathname);
                 }
             }
         };
