small changes for architizer

Andrew Mahon (x230) · Andrew Mahon (x230) · commit db20ca30e088 · 2013-03-12T14:07:40.000-04:00
diff --git a/lib/App.js b/lib/App.js
@@ -25,10 +25,13 @@ define(['jquery', 'NIseed'], function($) {
 		this.contexts = {};
 
 		this.invoke_feature_set(this.page._features);
-		
 		this.page.add_feature = function() {
 			self.invoke_feature.apply(self, arguments);
 		};
+
+		this.get_state = function(){
+			console.log('App.get_state');
+		};
 	};
 
 	App.prototype.invoke_feature = function(feature, callback) {
@@ -92,8 +95,8 @@ define(['jquery', 'NIseed'], function($) {
 		var self = this, context_runtime;
 		if(self.contexts[name]){
 			for(context_runtime in self.contexts[name]){
-				if($.isFunction(context_runtime.destroy)){
-					context_runtime.destroy();
+				if($.isFunction(self.contexts[name][context_runtime].destroy)){
+					self.contexts[name][context_runtime].destroy();
 				}
 			}
 		}
diff --git a/lib/Merlin2.js b/lib/Merlin2.js
@@ -115,6 +115,13 @@ define(['jquery', 'NIseed'], function($) {
                     return false;
                 }
 
+                // Provide Default Data
+                if(!data){
+                    data = {
+
+                    };
+                }
+
                 // Special names
 
                 if ($.isFunction(name)) {
@@ -189,7 +196,6 @@ define(['jquery', 'NIseed'], function($) {
 
                 fn.update_controls();
 
-                
                 internal.n_step_renders += 1;
                 if ($.isFunction(internal.current_step.visible)) {
                     internal.current_step.visible.apply(internal.current_step, [self, data]);
diff --git a/lib/PushstateHelper.js b/lib/PushstateHelper.js
@@ -21,14 +21,14 @@ define(['jquery'], function($) {
     NI = window.NI;
 
     function PushstateHelper(options) {
-                
+
         var self = this, o, internal, fn, handlers;
-                
+
         o = $.extend({
             app: null,
             use_hash: false
         }, options);
-                
+
         internal = {
             name: 'mod.PushstateHelper'
         };
@@ -44,16 +44,9 @@ define(['jquery'], function($) {
                 var i, path_components, position;
 
                 if(o.use_hash && href.hash){
-                    path_components = href.hash.split('/');
+                    path_components = PushstateHelper.get_path_components(href.hash);
                 } else {
-                    path_components = href.pathname.split('/');
-                }
-
-                position = path_components.length;
-                while(position--){
-                    if(!path_components[position].length){
-                        path_components.splice(position,1);
-                    }
+                    path_components = PushstateHelper.get_path_components(href.pathname);
                 }
 
                 // push the state change to Google Analytics
@@ -113,8 +106,17 @@ define(['jquery'], function($) {
     }
 
     PushstateHelper.get_path_components = function(path){
-
-    }
+        var components, position;
+        components = [];
+        components = path.split('/');
+        position = components.length;
+        while(position--){
+            if(!components[position].length){
+                components.splice(position,1);
+            }
+        }
+        return components;
+    };
 
     NI.PushstateHelper = PushstateHelper;
 
