oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove kludge by updating location manually

Browse source
This commit is contained in:
Doug Bell 2010-07-15 21:53:11 -05:00
parent a7cc3696c6
commit 0647287d0e
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
www/extras/admin/admin.js
View file

@ -38,6 +38,10 @@ WebGUI.Admin = function(cfg){
self.newContentBar = new WebGUI.Admin.AdminBar( "newContentBar" ); self.newContentBar = new WebGUI.Admin.AdminBar( "newContentBar" );
self.locationBar = new WebGUI.Admin.LocationBar( self.cfg.locationBarId ); self.locationBar = new WebGUI.Admin.LocationBar( self.cfg.locationBarId );
self.afterNavigate.subscribe( self.locationBar.afterNavigate, self.locationBar ); self.afterNavigate.subscribe( self.locationBar.afterNavigate, self.locationBar );
if ( self.currentAssetDef ) {
self.locationBar.navigate( self.currentAssetDef );
}
self.tree = new WebGUI.Admin.Tree(); self.tree = new WebGUI.Admin.Tree();
self.tabBar = new YAHOO.widget.TabView( self.cfg.tabBarId ); self.tabBar = new YAHOO.widget.TabView( self.cfg.tabBarId );
// Keep track of View and Tree tabs // Keep track of View and Tree tabs
@ -171,12 +175,6 @@ WebGUI.Admin.prototype.makeGotoAsset
*/ */
WebGUI.Admin.prototype.navigate WebGUI.Admin.prototype.navigate
= function ( assetDef ) { = function ( assetDef ) {
// Defer until the locationBar is created
if ( !this.locationBar ) {
var self = this; // Scope correction
return setTimeout( function(){ self.navigate( assetDef ) }, 1000 );
}
// Don't do the same asset twice // Don't do the same asset twice
if ( this.currentAssetDef && this.currentAssetDef.assetId == assetDef.assetId ) { if ( this.currentAssetDef && this.currentAssetDef.assetId == assetDef.assetId ) {
// But still fire the event // But still fire the event