projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try and get ctrl-enter to add a clear all
[roojs1]
/
Roo
/
History.js
diff --git
a/Roo/History.js
b/Roo/History.js
index
9351940
..
91ae8d2
100644
(file)
--- a/
Roo/History.js
+++ b/
Roo/History.js
@@
-1,18
+1,23
@@
/**
* Originally based of this code... - refactored for Roo...
/**
* 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/>
* 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 = new Roo.util.Observable({
+Roo.History = {
// ====================================================================
// ====================================================================
@@
-208,20
+213,14
@@
Roo.History = new Roo.util.Observable({
Roo.apply(this,options)
Roo.apply(this,options)
- // Check Load Status of Adapter
- //if ( typeof this.Adapter === 'undefined' ) {
- // return false;
- //}
-
+
// Check Load Status of Core
// Check Load Status of Core
- if ( typeof this.initCore !== 'undefined' ) {
- this.initCore();
- }
-
+ this.initCore();
+
// Check Load Status of HTML4 Support
// Check Load Status of HTML4 Support
- if ( typeof this.initHtml4 !== 'undefined' ) {
-
this.initHtml4();
- }
+
//
if ( typeof this.initHtml4 !== 'undefined' ) {
+
//
this.initHtml4();
+
//
}
this.initEmulated();
this.initEmulated();
@@
-241,7
+240,7
@@
Roo.History = new Roo.util.Observable({
-
this.Adapter.bind(window,'popstate',this.onPopState
);
+
Roo.get(window).on('popstate',this.onPopState, this
);
/**
/**
@@
-258,8
+257,8
@@
Roo.History = new Roo.util.Observable({
this.intervalList.push(setInterval(this.onUnload,this.storeInterval));
// For Other Browsers
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;
} else {
this.onUnload = emptyFunction;
@@
-270,7
+269,7
@@
Roo.History = new Roo.util.Observable({
/**
* Clear Intervals on exit to prevent memory leaks
*/
/**
* Clear Intervals on exit to prevent memory leaks
*/
-
this.Adapter.bind(window,"unload",this.clearAllInterval
s);
+
Roo.get(window).on('unload',this.clearAllIntervals, thi
s);
/**
* Create the initial State
/**
* Create the initial State
@@
-304,14
+303,14
@@
Roo.History = new Roo.util.Observable({
*/
// Setup Alias
*/
// Setup Alias
-
this.Adapter.bind(window,
'hashchange',function(){
-
_this.fireEvent(window,
'popstate');
- });
+
Roo.get(window).on(
'hashchange',function(){
+
Roo.get(window).fireEvent(
'popstate');
+ }
, this
);
// Initialise Alias
if ( this.getHash() ) {
Roo.onReady(function(){
// Initialise Alias
if ( this.getHash() ) {
Roo.onReady(function(){
-
_this.Adapter.trigger(window,
'hashchange');
+
Roo.get(window).fireEvent(
'hashchange');
});
}
}
});
}
}
@@
-1636,7
+1635,7
@@
Roo.History = new Roo.util.Observable({
// Apply the New State
//this.debug('this.safariStatePoll: trigger');
// Apply the New State
//this.debug('this.safariStatePoll: trigger');
-
this.Adapter.trigger(window,
'popstate');
+
Roo.get(window).fireEvent(
'popstate');
// Chain
return this;
// Chain
return this;
@@
-1786,7
+1785,7
@@
Roo.History = new Roo.util.Observable({
else {
// Traditional Anchor
//this.debug('this.onPopState: traditional anchor', currentHash);
else {
// Traditional Anchor
//this.debug('this.onPopState: traditional anchor', currentHash);
-
this.Adapter.trigger(window,
'anchorchange');
+
Roo.get(window).fireEvent(
'anchorchange');
this.busy(false);
}
this.busy(false);
}
@@
-1838,7
+1837,7
@@
Roo.History = new Roo.util.Observable({
this.setTitle(newState);
// Fire Our Event
this.setTitle(newState);
// Fire Our Event
-
this.Adapter.trigger(window,
'statechange');
+
Roo.get(window).fireEvent(
'statechange');
this.busy(false);
// Return true
this.busy(false);
// Return true
@@
-1901,7
+1900,7
@@
Roo.History = new Roo.util.Observable({
history.pushState(newState.id,newState.title,newState.url);
// Fire HTML5 Event
history.pushState(newState.id,newState.title,newState.url);
// Fire HTML5 Event
-
this.Adapter.trigger(window,
'popstate');
+
Roo.get(window).fireEvent(
'popstate');
}
// End pushState closure
}
// End pushState closure
@@
-1958,7
+1957,7
@@
Roo.History = new Roo.util.Observable({
history.replaceState(newState.id,newState.title,newState.url);
// Fire HTML5 Event
history.replaceState(newState.id,newState.title,newState.url);
// Fire HTML5 Event
-
this.Adapter.trigger(window,
'popstate');
+
Roo.get(window).fireEvent(
'popstate');
}
// End replaceState closure
}
// End replaceState closure
@@
-2041,6
+2040,4
@@
Roo.History = new Roo.util.Observable({
}
}
}
}
}
}
-});
-
-
\ No newline at end of file
+};
\ No newline at end of file