FCL/sf/app/browserui: comparison ginebra2/chrome/bedrockchrome/statusbar.snippet/statusbar.js

Mercurial Mercurial > oss > FCL > sf > app > browserui / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

ginebra2/chrome/bedrockchrome/statusbar.snippet/statusbar.js

changeset 6	1c3b8676e58c
parent 5	0f2326c2a325

equal deleted inserted replaced

-:0f2326c2a325
+:1c3b8676e58c
 this.handleCurrentViewChange = function()
 {
 if (window.views.WebView.currentPageIsSuperPage()) {
 //alert(window.views.WebView.currentSuperPageName());
 if (window.views.WebView.currentSuperPageName() == "BookmarkTreeView") {
-setTitle(window.localeDelegate.translateText("txt_browser_content_view_menu_nav_bookmarks"), false);
+setTitle(window.localeDelegate.translateText("txt_browser_bookmarks_bookmarks"), false);
 }
 else if (window.views.WebView.currentSuperPageName() == "BookmarkHistoryView") {
-setTitle(window.localeDelegate.translateText("txt_browser_content_view_menu_nav_history"), false);
+setTitle(window.localeDelegate.translateText("txt_browser_history_history"), false);
 }
 else if (window.views.WebView.currentSuperPageName() == "SettingsView") {
 setTitle(window.localeDelegate.translateText("txt_browser_settings_settings"), false);
 }
 }
 else {
 if (window.views.current().type == "webView")  {
+//enable the double click for the content view page
+if (!window.views.WebView.bedrockTiledBackingStoreEnabled())
+window.views.WebView.touchNav.doubleClickEnabled = true;
 /* For new windows, show title as 'New Window' */
 if ((window.pageController.currentDocTitle == "") && (window.pageController.currentRequestedUrl == "")) {
-setTitle(window.localeDelegate.translateText("txt_browser_windows_new_window"), false);
+setTitle(window.localeDelegate.translateText("txt_browser_content_view_new_window"), false);
 }
 else if (window.pageController.currentDocTitle == "") {
 if (window.pageController.currentDocUrl == "")  {
 setTitle(window.pageController.currentPartialReqUrl, false);
 }
 networkName = networkName.substring(0, NetworkStatus.MAX_NAME_LEN);
 // set field width to the appropriate width and change the name
 updateFieldWidth(htmlEncode(networkName));
 document.getElementById('provider').innerHTML = htmlEncode(networkName);
-// repaint if status bar exists (first call to this function, it doesn't)
+// repaint if status bar exists
 if (window.snippets.StatusBarChromeId)
 window.snippets.StatusBarChromeId.repaint();
 }
 //! Gets the appropriate image tag HTML string for the current network
 lastState = currentState; // save former state
 // update current state and network icon
 currentState = state;
 document.getElementById('strength').innerHTML =
 networkIconSrc[currentState];
-window.snippets.StatusBarChromeId.repaint();
 // if we went offline, change the provider name to "offline"
 if (currentState == enumNetworkStrengths.state.Offline)
 changeName(window.localeDelegate.translateText("txt_browser_offline"));
 // if we just came online, get and update provider name
 */
 this.handleLevelChange = function(level)
 {
 document.getElementById('battery').innerHTML =
 batteryIconSrc[convertLevelToState(level)];
-window.snippets.StatusBarChromeId.repaint();
 }
 }
 /*!
 Class to handle updating the download indicator.
 '<td class="centeralign" id="clock">time: &nbsp;</td>' +
 '<td class="rightalign" id="battery">' + sbBatteryStatus.getInitialLevelImgTag() + '</td>'+
 '</tr>'+
 '</table>'+
 // ruler span used for getting the width of network name
-// style included here because style sheet not applied early
+'<span id="sbruler"></span>';
-// enough for sbNetworkStatus.showInitialNetworkName call below
-// which needs text width which depends on font
-'<span id="sbruler" style="font-size:12px;font-weight:bold;visibility:hidden;"></span>';
 document.write(html);
-sbNetworkStatus.showInitialNetworkName();
 }
 // StatusBar Constructor
 _statusbar_write(); // write status bar HTML code to document
 sbClock.showtime(); // display current time on status bar
 // Note that in the slots below the "this" object is never used directly.
 // This is because they don't have access to "this" as they are invoked
 // as functions rather than as methods.
+// On chromeComplete signal, show initial network name.
+window.chrome.chromeComplete.connect(
+function() {sbNetworkStatus.showInitialNetworkName();});
 // Connect page controller signals to slots.
 window.pageController.titleChanged.connect(
 function(title) {sbTitle.handleTitleChange(title);});
 window.pageController.partialUrlChanged.connect(
 function(partialUrl) {sbTitle.handlePartialUrlChange(partialUrl);});
 sbTitle.handleCurrentViewChange();
 sbLockStatus.handleCurrentViewChange();
 }
 );
-window.ViewStack.currentViewChanged.connect(
-function() {
-sbTitle.handleCurrentViewChange();
-sbLockStatus.handleCurrentViewChange();
-}
-);
 // Connect device delegate signals to slots.
 window.deviceDelegate.batteryLevelChanged.connect(
 function(level) {sbBatteryStatus.handleLevelChange(level);});
 window.networkDelegate.networkSignalStrengthChanged.connect(
 function(strength) {sbNetworkStatus.handleSignalStrengthChange(strength);});

FCL/sf/app/browserui