small fix merlin destroy and cleanup in push state

LevKanter · LevKanter · commit c96766479302 · 2013-08-15T18:15:28.000-04:00
diff --git a/lib/Merlin2.js b/lib/Merlin2.js
@@ -290,7 +290,7 @@ define(['jquery', 'NIseed'], function($) {
             },
             destroy: function() {
                 $.each(internal.controls, function(k, control) {
-                    if (handlers[k]) {
+                    if (control && handlers[k]) {
                         if (typeof control === 'string') {
                             control = $(control);
                         }
diff --git a/lib/PushstateHelper.js b/lib/PushstateHelper.js
@@ -87,34 +87,22 @@ define(['jquery'], function($) {
         handlers = {
             doc_click: function(e, d) {
                 var $t, _href, _data;
+                e.preventDefault();
                 $t = $(this);
                 _href = $t.attr('HREF');
-                if(!_href){
-                    return;
-                }
                 _data = $t.data();
                 if($t.hasClass('js-use-pushstate')){
-                    if(e.ctrlKey){
-                        return;
-                    }
-                    e.preventDefault();
-                    e.stopPropagation();
                     e.stopImmediatePropagation();
                     if(o.use_hash){
                         window.location.hash = _href;
-                        fn.statechange(_href, _data);
                     } else {
                         history.pushState(null, null, _href);
-                        fn.statechange(_href, _data);
                     }
+                    fn.statechange(_href, _data);
                 } else if($t.hasClass('js-simulate-pushstate')) {
-                    e.preventDefault();
-                    e.stopPropagation();
                     e.stopImmediatePropagation();
                     fn.statechange(_href, _data);
                 } else if($t.hasClass('js-do-popstate')) {
-                    e.preventDefault();
-                    e.stopPropagation();
                     e.stopImmediatePropagation();
                     history.back();
                 }

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ define(['jquery', 'NIseed'], function($) {`
`290`	`290`	`},`
`291`	`291`	`destroy: function() {`
`292`	`292`	`$.each(internal.controls, function(k, control) {`
`293`		`- if (handlers[k]) {`
	`293`	`+ if (control && handlers[k]) {`
`294`	`294`	`if (typeof control === 'string') {`
`295`	`295`	`control = $(control);`
`296`	`296`	`}`