X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=Roo%2FHistory.js;h=91ae8d22f71197b3e0a5a4c5f89d7ca2f31ac0da;hp=b58121dca4321baf0157e11a59773eb016f1f231;hb=refs%2Fheads%2Fwip_leon_T7094_logo_image_upload_in_boilerplate;hpb=9ba5d72191b2565d2692a7ede110a01b2743a0bd

diff --git a/Roo/History.js b/Roo/History.js
index b58121dca4..91ae8d22f7 100644
--- a/Roo/History.js
+++ b/Roo/History.js
@@ -1,17 +1,22 @@
 /**
  * Originally based of this code... - refactored for Roo...
- *
+ * https://github.com/browserstate/history.js
+ 
  * History.js Core
  * @author Benjamin Arthur Lupton <contact@balupton.com>
  * @copyright 2010-2011 Benjamin Arthur Lupton <contact@balupton.com>
  * @license New BSD License <http://creativecommons.org/licenses/BSD/>
+ *
+ * Hackily modifyed by alan@roojs.com
+ * 
+ * this is not initialized automatically..
+ * must call Roo.History.init( { ... options... });
+ *
+ *  TOTALLY UNTESTED...
+ *
+ *  Documentation to be done....
  */
 
-
-// this is not initialized automatically..
-// must call Roo.History.init( { ... options... });
-
-
 Roo.History = {
 	 
      
@@ -208,20 +213,14 @@ Roo.History = {
         
         Roo.apply(this,options)
         
-		// Check Load Status of Adapter
-		//if ( typeof this.Adapter === 'undefined' ) {
-		//	return false;
-		//}
-
+		
 		// Check Load Status of Core
-		if ( typeof this.initCore !== 'undefined' ) {
-			this.initCore();
-		}
-
+		this.initCore();
+	
 		// Check Load Status of HTML4 Support
-		if ( typeof this.initHtml4 !== 'undefined' ) {
-			this.initHtml4();
-		}
+		//if ( typeof this.initHtml4 !== 'undefined' ) {
+		//	this.initHtml4();
+		//}
         
         this.initEmulated();
         
@@ -241,7 +240,7 @@ Roo.History = {
         
         
         
-        this.Adapter.bind(window,'popstate',this.onPopState);
+        Roo.get(window).on('popstate',this.onPopState, this);
         
          
 		/**
@@ -258,8 +257,8 @@ Roo.History = {
             this.intervalList.push(setInterval(this.onUnload,this.storeInterval));
 
 			// For Other Browsers
-			this.Adapter.bind(window,'beforeunload',this.onUnload);
-			this.Adapter.bind(window,'unload',this.onUnload);
+			Roo.get(window).on('beforeunload',this.onUnload,this);
+			Roo.get(window).on('unload',this.onUnload, this);
 
 		} else {
             this.onUnload = emptyFunction;
@@ -270,7 +269,7 @@ Roo.History = {
 		/**
 		 * Clear Intervals on exit to prevent memory leaks
 		 */
-		this.Adapter.bind(window,"unload",this.clearAllIntervals);
+		Roo.get(window).on('unload',this.clearAllIntervals, this);
 
 		/**
 		 * Create the initial State
@@ -304,14 +303,14 @@ Roo.History = {
 				 */
 
 				// Setup Alias
-				this.Adapter.bind(window,'hashchange',function(){
-					_this.Adapter.trigger(window,'popstate');
-				});
+				Roo.get(window).on('hashchange',function(){
+					Roo.get(window).fireEvent('popstate');
+				}, this);
 
 				// Initialise Alias
 				if ( this.getHash() ) {
 					Roo.onReady(function(){
-						_this.Adapter.trigger(window,'hashchange');
+						Roo.get(window).fireEvent('hashchange');
 					});
 				}
 			}
@@ -1636,7 +1635,7 @@ Roo.History = {
 
         // Apply the New State
         //this.debug('this.safariStatePoll: trigger');
-        this.Adapter.trigger(window,'popstate');
+        Roo.get(window).fireEvent('popstate');
 
         // Chain
         return this;
@@ -1786,7 +1785,7 @@ Roo.History = {
             else {
                 // Traditional Anchor
                 //this.debug('this.onPopState: traditional anchor', currentHash);
-                this.Adapter.trigger(window,'anchorchange');
+                Roo.get(window).fireEvent('anchorchange');
                 this.busy(false);
             }
 
@@ -1794,10 +1793,10 @@ Roo.History = {
             this.expectedStateId = false;
             return false;
         }
-        var stateId = (event && event.browserEvent && event.browserEvent['state']) || (extra && extra['state']) || undefined;
+        stateId = (event && event.browserEvent && event.browserEvent['state']) || (extra && extra['state']) || undefined;
 
         // Ensure
-        stateId = this.Adapter.extractEventData('state',event,extra) || false;
+        //stateId = this.Adapter.extractEventData('state',event,extra) || false;
 
         // Fetch State
         if ( stateId ) {
@@ -1838,7 +1837,7 @@ Roo.History = {
         this.setTitle(newState);
 
         // Fire Our Event
-        this.Adapter.trigger(window,'statechange');
+        Roo.get(window).fireEvent('statechange');
         this.busy(false);
 
         // Return true
@@ -1901,7 +1900,7 @@ Roo.History = {
             history.pushState(newState.id,newState.title,newState.url);
 
             // Fire HTML5 Event
-            this.Adapter.trigger(window,'popstate');
+            Roo.get(window).fireEvent('popstate');
         }
 
         // End pushState closure
@@ -1958,7 +1957,7 @@ Roo.History = {
             history.replaceState(newState.id,newState.title,newState.url);
 
             // Fire HTML5 Event
-            this.Adapter.trigger(window,'popstate');
+            Roo.get(window).fireEvent('popstate');
         }
 
         // End replaceState closure
@@ -2041,6 +2040,4 @@ Roo.History = {
             }
         }
     }
-};
-
-		  
\ No newline at end of file
+};
\ No newline at end of file