diff --git a/browser/components/statusbar/Progress.jsm b/browser/components/statusbar/Progress.jsm
index 9d4ee783ec..c03a254501 100644
--- a/browser/components/statusbar/Progress.jsm
+++ b/browser/components/statusbar/Progress.jsm
@@ -37,15 +37,6 @@ S4EProgressService.prototype =
toolbar_progress.value = val;
}
- if(this._service.progressUrlbar)
- {
- let urlbar_progress = this._getters.urlbarProgress;
- if(urlbar_progress)
- {
- urlbar_progress.value = val;
- }
- }
-
let throbber_progress = this._getters.throbberProgress;
if(throbber_progress)
{
@@ -68,15 +59,6 @@ S4EProgressService.prototype =
toolbar_progress.collapsed = val;
}
- if(this._service.progressUrlbar)
- {
- let urlbar_progress = this._getters.urlbarProgress;
- if(urlbar_progress)
- {
- urlbar_progress.collapsed = val;
- }
- }
-
let throbber_progress = this._getters.throbberProgress;
if(throbber_progress)
{
diff --git a/browser/components/statusbar/Status.jsm b/browser/components/statusbar/Status.jsm
index e6fa6282da..3795545a3a 100644
--- a/browser/components/statusbar/Status.jsm
+++ b/browser/components/statusbar/Status.jsm
@@ -102,11 +102,6 @@ S4EStatusService.prototype =
if(statusLinkOver)
{
link = link.replace(/[\u200e\u200f\u202a\u202b\u202c\u202d\u202e]/g, encodeURIComponent);
- if(this._getters.urlbar && this._getters.urlbar._mayTrimURLs)
- {
- link = this._window.trimURL(link);
- }
-
if(status == statusLinkOver)
{
this._overLink = { val: link, type: "overLink", anchor: aAnchor };
@@ -299,11 +294,6 @@ S4EStatusService.prototype =
status_label.value = "";
}
- let urlbar = this._getters.urlbar;
- if(urlbar)
- {
- urlbar.setStatus("");
- }
},
setStatusField: function(location, text, allowTooltip)
@@ -337,12 +327,6 @@ S4EStatusService.prototype =
label = this._getters.statusWidgetLabel;
break;
case 2: // URL Bar
- let urlbar = this._getters.urlbar;
- if(urlbar)
- {
- urlbar.setStatusType(text.type);
- urlbar.setStatus(text.val);
- }
break;
case 3: // Popup
default:
diff --git a/browser/components/statusbar/Status4Evar.jsm b/browser/components/statusbar/Status4Evar.jsm
index 5d41b72f1b..31c598aea0 100644
--- a/browser/components/statusbar/Status4Evar.jsm
+++ b/browser/components/statusbar/Status4Evar.jsm
@@ -195,8 +195,7 @@ S4EWindowGetters.prototype =
["statusWidgetLabel", "status4evar-status-text"],
["strings", "bundle_status4evar"],
["throbberProgress", "status4evar-throbber-widget"],
- ["toolbarProgress", "status4evar-progress-bar"],
- ["urlbarProgress", "urlbar-progress-alt"]
+ ["toolbarProgress", "status4evar-progress-bar"]
],
resetGetters: function()
@@ -214,27 +213,6 @@ S4EWindowGetters.prototype =
});
}, this);
- delete this.urlbar;
- this.__defineGetter__("urlbar", function()
- {
- let ub = document.getElementById("urlbar");
- if(!ub)
- {
- return null;
- }
-
- ["setStatus", "setStatusType", "updateOverLinkLayout"].forEach(function(func)
- {
- if(!(func in ub))
- {
- ub[func] = function() {};
- }
- });
-
- delete this.urlbar;
- return this.urlbar = ub;
- });
-
delete this.statusOverlay;
this.__defineGetter__("statusOverlay", function()
{
@@ -257,7 +235,7 @@ S4EWindowGetters.prototype =
delete this[prop];
}, this);
- ["urlbar", "statusOverlay", "statusOverlay", "_window"].forEach(function(prop)
+ ["statusOverlay", "statusOverlay", "_window"].forEach(function(prop)
{
delete this[prop];
}, this);
diff --git a/browser/components/statusbar/content/overlay.css b/browser/components/statusbar/content/overlay.css
index ed77cb9e06..6375b8ef84 100644
--- a/browser/components/statusbar/content/overlay.css
+++ b/browser/components/statusbar/content/overlay.css
@@ -4,20 +4,6 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-/*
- * Location bar progress
- */
-
-#urlbar
-{
- -moz-binding: url("chrome://browser/content/statusbar/urlbarBindings.xml#urlbar");
-}
-
-#urlbar[s4eforce="true"]
-{
- -moz-binding: url("chrome://browser/content/statusbar/urlbarBindings.xml#urlbar") !important;
-}
-
/*
* Status Popup
*/
diff --git a/browser/components/statusbar/content/overlay.xul b/browser/components/statusbar/content/overlay.xul
index 4884b52b44..f9a61a92ec 100644
--- a/browser/components/statusbar/content/overlay.xul
+++ b/browser/components/statusbar/content/overlay.xul
@@ -77,10 +77,6 @@
removable="true" command="S4E:Options" tooltiptext="&status4evar.options.widget.title;" />
-
-
-
-
diff --git a/browser/components/statusbar/content/prefs.js b/browser/components/statusbar/content/prefs.js
index 0d5793dcb2..4a0e526f27 100644
--- a/browser/components/statusbar/content/prefs.js
+++ b/browser/components/statusbar/content/prefs.js
@@ -148,152 +148,6 @@ var status4evarPrefs =
}
},
-//
-// Location bar status position
-//
- get urlbarAlignPref()
- {
- delete this.urlbarAlignPref;
- return this.urlbarAlignPref = document.getElementById("status4evar-pref-status-urlbar-align");
- },
-
- get urlbarPositionVbox()
- {
- delete this.urlbarPositionVbox;
- return this.urlbarPositionVbox = document.getElementById("status4evar-status-urlbar-position-vbox");
- },
-
- urlbarAlignChanged: function()
- {
- this.urlbarPositionVbox.hidden = (this.urlbarAlignPref.value == 1);
- },
-
- urlbarAlignSync: function()
- {
- this.urlbarAlignChanged();
- return undefined;
- },
-
-//
-// Progress line location management
-//
- get progressUrlbar()
- {
- delete this.progressUrlbar;
- return this.progressUrlbar = document.getElementById("urlbar");
- },
-
- get progressUrlbarProgress()
- {
- delete this.progressUrlbarProgress;
- return this.progressUrlbarProgress = document.getElementById("urlbar-progress-alt");
- },
-
- get progressUrlbarPref()
- {
- delete this.progressUrlbarPref;
- return this.progressUrlbarPref = document.getElementById("status4evar-pref-progress-urlbar");
- },
-
- get progressUrlbarCheckbox()
- {
- delete this.progressUrlbarCheckbox;
- return this.progressUrlbarCheckbox = document.getElementById("status4evar-progress-urlbar-check");
- },
-
- progressUrlbarChanged: function()
- {
- if(this.progressUrlbarPref.value > 0)
- {
- this.progressUrlbarPref.disabled = false;
- this.progressUrlbarCheckbox.checked = true;
- switch(this.progressUrlbarPref.value)
- {
- case 1:
- this.progressUrlbar.setAttribute("pmpack", "end");
- break;
- case 2:
- this.progressUrlbar.setAttribute("pmpack", "begin");
- break;
- case 3:
- this.progressUrlbar.setAttribute("pmpack", "center");
- break;
- }
- this.progressUrlbarProgress.hidden = false;
- }
- else
- {
- this.progressUrlbarPref.disabled = true;
- this.progressUrlbarCheckbox.checked = false;
- this.progressUrlbarProgress.hidden = true;
- }
- },
-
- progressUrlbarSync: function()
- {
- this.progressUrlbarChanged();
- return undefined;
- },
-
- progressUrlbarToggle: function()
- {
- if(this.progressUrlbarPref.disabled == this.progressUrlbarCheckbox.checked)
- {
- if(this.progressUrlbarCheckbox.checked)
- {
- this.progressUrlbarPref.value = 1;
- }
- else
- {
- this.progressUrlbarPref.value = 0;
- }
- }
- },
-
-//
-// Urlbar progress style management
-//
- get progressUrlbarStylePref()
- {
- delete this.progressUrlbarStylePref;
- return this.progressUrlbarStylePref = document.getElementById("status4evar-pref-progress-urlbar-style");
- },
-
- get progressUrlbarCSSPref()
- {
- delete this.progressUrlbarCSSPref;
- return this.progressUrlbarCSSPref = document.getElementById("status4evar-pref-progress-urlbar-css");
- },
-
- progressUrlbarCSSChanged: function()
- {
- if(!this.progressUrlbarCSSPref.value)
- {
- this.progressUrlbarCSSPref.value = "#33FF33";
- }
- this.dynamicProgressStyle.cssRules[1].style.background = this.progressUrlbarCSSPref.value;
- },
-
- progressUrlbarStyleChanged: function()
- {
- this.progressUrlbarCSSChanged();
- this.progressUrlbarCSSPref.disabled = !this.progressUrlbarStylePref.value;
- if(this.progressUrlbarStylePref.value)
- {
- this.progressUrlbar.setAttribute("s4estyle", true);
- }
- else
- {
- this.progressUrlbar.removeAttribute("s4estyle");
- }
- },
-
- progressUrlbarStyleSync: function()
- {
- this.progressUrlbarStyleChanged();
- return undefined;
- },
-
//
// Toolbar progress style management
//
@@ -424,12 +278,6 @@ var status4evarPrefs =
//
// Pref Window load
//
- get statusUrlbarPositionValue()
- {
- delete this.statusUrlbarPositionValue;
- return this.statusUrlbarPositionValue = document.getElementById("status4evar-status-urlbar-position-value");
- },
-
get downloadButtonActionCommandPref()
{
delete this.downloadButtonActionCommandPref;
@@ -451,11 +299,6 @@ var status4evarPrefs =
this.advancedContinueButton.focus();
}
- if(window.getComputedStyle(this.statusUrlbarPositionValue).direction == "ltr")
- {
- this.statusUrlbarPositionValue.setAttribute("dir", "reverse");
- }
-
if(!this.downloadButtonActionCommandPref.value)
{
this.downloadButtonActionThirdPartyItem.disabled = true;
diff --git a/browser/components/statusbar/content/prefs.xul b/browser/components/statusbar/content/prefs.xul
index 8f2c30cab2..e861c3f707 100644
--- a/browser/components/statusbar/content/prefs.xul
+++ b/browser/components/statusbar/content/prefs.xul
@@ -46,10 +46,6 @@
-
-
-
@@ -65,7 +61,6 @@
-
@@ -81,7 +76,6 @@
-
@@ -116,7 +110,6 @@
-
@@ -142,47 +135,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -397,7 +304,6 @@
-
@@ -421,15 +327,6 @@
-
-
-
-
-
-
-
diff --git a/browser/components/statusbar/content/urlbarBindings.xml b/browser/components/statusbar/content/urlbarBindings.xml
deleted file mode 100644
index 602722ecc9..0000000000
--- a/browser/components/statusbar/content/urlbarBindings.xml
+++ /dev/null
@@ -1,338 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- maxWidth)
- {
- overLinkHost.flex = 1;
- overLinkHost.crop = "end";
- }
-
- overLinkBox.maxWidth = maxWidth;
- if(alignMode == "absolute")
- {
- overLinkBox.minWidth = maxWidth;
- }
- ]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/browser/components/statusbar/jar.mn b/browser/components/statusbar/jar.mn
index a381a5534c..db7f278c71 100644
--- a/browser/components/statusbar/jar.mn
+++ b/browser/components/statusbar/jar.mn
@@ -9,7 +9,6 @@ browser.jar:
content/browser/statusbar/prefs.js (content/prefs.js)
content/browser/statusbar/prefs.xml (content/prefs.xml)
content/browser/statusbar/tabbrowser.xml (content/tabbrowser.xml)
- content/browser/statusbar/urlbarBindings.xml (content/urlbarBindings.xml)
content/browser/statusbar/overlay.xul (content/overlay.xul)
content/browser/statusbar/prefs.xul (content/prefs.xul)
content/browser/statusbar/overlay.css (content/overlay.css)
diff --git a/browser/components/statusbar/status4evar.idl b/browser/components/statusbar/status4evar.idl
index c3aff79004..7c08beb8c7 100644
--- a/browser/components/statusbar/status4evar.idl
+++ b/browser/components/statusbar/status4evar.idl
@@ -6,7 +6,7 @@
interface nsIDOMWindow;
-[scriptable, uuid(13b3595e-7bb5-4cfe-bbfa-82c900a4d7bf)]
+[scriptable, uuid(b418cd1b-b172-4ef5-bfc5-fc555c87dbc4)]
interface nsIStatus4Evar : nsISupports
{
readonly attribute boolean addonbarBorderStyle;
@@ -16,7 +16,6 @@ interface nsIStatus4Evar : nsISupports
readonly attribute boolean advancedStatusDetectFullScreen;
readonly attribute boolean advancedStatusDetectVideo;
- readonly attribute boolean advancedUrlbarForceBinding;
readonly attribute long downloadButtonAction;
readonly attribute ACString downloadButtonActionCommand;
@@ -38,11 +37,6 @@ interface nsIStatus4Evar : nsISupports
readonly attribute boolean progressToolbarStyle;
readonly attribute boolean progressToolbarStyleAdvanced;
- readonly attribute ACString progressUrlbar;
- readonly attribute ACString progressUrlbarCSS;
- readonly attribute boolean progressUrlbarStyle;
- readonly attribute boolean progressUrlbarStyleAdvanced;
-
readonly attribute long status;
readonly attribute boolean statusDefault;
readonly attribute boolean statusNetwork;
@@ -54,13 +48,6 @@ interface nsIStatus4Evar : nsISupports
readonly attribute long statusToolbarMaxLength;
- readonly attribute ACString statusUrlbarAlign;
- readonly attribute ACString statusUrlbarColor;
- readonly attribute long statusUrlbarPosition;
-
- readonly attribute boolean statusUrlbarInvertMirror;
- readonly attribute boolean statusUrlbarMouseMirror;
-
void resetPrefs();
void updateWindow(in nsIDOMWindow win);
};
diff --git a/browser/components/statusbar/status4evar.js b/browser/components/statusbar/status4evar.js
index f33d46384e..869ec7d7c5 100644
--- a/browser/components/statusbar/status4evar.js
+++ b/browser/components/statusbar/status4evar.js
@@ -18,7 +18,7 @@ function Status_4_Evar(){}
Status_4_Evar.prototype =
{
- classID: Components.ID("{13b3595e-7bb5-4cfe-bbfa-82c900a4d7bf}"),
+ classID: Components.ID("{b418cd1b-b172-4ef5-bfc5-fc555c87dbc4}"),
QueryInterface: XPCOMUtils.generateQI([
CI.nsISupportsWeakReference,
CI.nsIObserver,
@@ -33,7 +33,6 @@ Status_4_Evar.prototype =
advancedStatusDetectFullScreen: true,
advancedStatusDetectVideo: true,
- advancedUrlbarForceBinding: false,
downloadButtonAction: 1,
downloadButtonActionCommand: "",
@@ -53,10 +52,6 @@ Status_4_Evar.prototype =
progressToolbarForce: false,
progressToolbarStyle: false,
- progressUrlbar: 1,
- progressUrlbarCSS: null,
- progressUrlbarStyle: true,
-
status: 1,
statusDefault: true,
statusNetwork: true,
@@ -67,13 +62,6 @@ Status_4_Evar.prototype =
statusToolbarMaxLength: 0,
- statusUrlbarAlign: null,
- statusUrlbarColor: null,
- statusUrlbarPosition: 33,
-
- statusUrlbarInvertMirror: false,
- statusUrlbarMouseMirror: true,
-
pref_registry:
{
"addonbar.borderStyle":
@@ -136,22 +124,6 @@ Status_4_Evar.prototype =
}
},
- "advanced.urlbar.forceBinding":
- {
- update: function()
- {
- this.advancedUrlbarForceBinding = this.prefs.getBoolPref("advanced.urlbar.forceBinding");
- },
- updateWindow: function(win)
- {
- let urlbar = win.caligon.status4evar.getters.urlbar;
- if(urlbar)
- {
- this.setBoolElementAttribute(urlbar, "s4eforce", this.advancedUrlbarForceBinding);
- }
- }
- },
-
"download.button.action":
{
update: function()
@@ -327,69 +299,6 @@ Status_4_Evar.prototype =
}
},
- "progress.urlbar":
- {
- update: function()
- {
- switch(this.prefs.getIntPref("progress.urlbar"))
- {
- case 0:
- this.progressUrlbar = null;
- break;
- case 1:
- this.progressUrlbar = "end";
- break;
- case 2:
- this.progressUrlbar = "begin";
- break;
- default:
- this.progressUrlbar = "center";
- break;
- }
- },
- updateWindow: function(win)
- {
- let urlbar = win.caligon.status4evar.getters.urlbar;
- let urlbar_progress = win.caligon.status4evar.getters.urlbarProgress;
- if(urlbar && urlbar_progress)
- {
- if(this.progressUrlbar)
- {
- urlbar.pmpack = this.progressUrlbar;
- }
- urlbar_progress.hidden = !this.progressUrlbar;
- }
- }
- },
-
- "progress.urlbar.css":
- {
- update: function()
- {
- this.progressUrlbarCSS = this.prefs.getCharPref("progress.urlbar.css");
- },
- updateDynamicStyle: function(sheet)
- {
- sheet.cssRules[1].style.background = this.progressUrlbarCSS;
- }
- },
-
- "progress.urlbar.style":
- {
- update: function()
- {
- this.progressUrlbarStyle = this.prefs.getBoolPref("progress.urlbar.style");
- },
- updateWindow: function(win)
- {
- let urlbar = win.caligon.status4evar.getters.urlbar;
- if(urlbar)
- {
- this.setBoolElementAttribute(urlbar, "s4estyle", this.progressUrlbarStyle);
- }
- }
- },
-
"status":
{
update: function()
@@ -464,38 +373,6 @@ Status_4_Evar.prototype =
}
},
- "status.popup.invertMirror":
- {
- update: function()
- {
- this.statusUrlbarInvertMirror = this.prefs.getBoolPref("status.popup.invertMirror");
- },
- updateWindow: function(win)
- {
- let statusOverlay = win.caligon.status4evar.getters.statusOverlay;
- if(statusOverlay)
- {
- statusOverlay.invertMirror = this.statusUrlbarInvertMirror;
- }
- }
- },
-
- "status.popup.mouseMirror":
- {
- update: function()
- {
- this.statusUrlbarMouseMirror = this.prefs.getBoolPref("status.popup.mouseMirror");
- },
- updateWindow: function(win)
- {
- let statusOverlay = win.caligon.status4evar.getters.statusOverlay;
- if(statusOverlay)
- {
- statusOverlay.mouseMirror = this.statusUrlbarMouseMirror;
- }
- }
- },
-
"status.timeout":
{
update: function()
@@ -522,73 +399,8 @@ Status_4_Evar.prototype =
status_widget.maxWidth = (this.statusToolbarMaxLength || "");
}
}
- },
-
- "status.urlbar.align":
- {
- update: function()
- {
- switch(this.prefs.getIntPref("status.urlbar.align"))
- {
- case 0:
- this.statusUrlbarAlign = null;
- break;
- case 1:
- this.statusUrlbarAlign = "left";
- break;
- default:
- this.statusUrlbarAlign = "absolute";
- break;
- }
- },
- updateWindow: function(win)
- {
- let urlbar = win.caligon.status4evar.getters.urlbar;
- if(urlbar)
- {
- urlbar.s4esalign = this.statusUrlbarAlign;
- urlbar.updateOverLinkLayout();
- }
- }
- },
-
- "status.urlbar.color":
- {
- update: function()
- {
- this.statusUrlbarColor = this.prefs.getCharPref("status.urlbar.color");
- },
- updateDynamicStyle: function(sheet)
- {
- sheet.cssRules[3].style.color = this.statusUrlbarColor;
- }
- },
-
- "status.urlbar.position":
- {
- update: function()
- {
- this.statusUrlbarPosition = this.prefs.getIntPref("status.urlbar.position");
-
- if(this.statusUrlbarPosition < 10)
- {
- this.statusUrlbarPosition = 10;
- }
- else if(this.statusUrlbarPosition > 90)
- {
- this.statusUrlbarPosition = 90;
- }
- },
- updateWindow: function(win)
- {
- let urlbar = win.caligon.status4evar.getters.urlbar;
- if(urlbar)
- {
- urlbar.s4espos = this.statusUrlbarPosition;
- urlbar.updateOverLinkLayout();
- }
- }
}
+
},
// nsIObserver
diff --git a/browser/components/statusbar/status4evar.manifest b/browser/components/statusbar/status4evar.manifest
index c3a2831250..7d6326f59e 100644
--- a/browser/components/statusbar/status4evar.manifest
+++ b/browser/components/statusbar/status4evar.manifest
@@ -1,3 +1,3 @@
-component {13b3595e-7bb5-4cfe-bbfa-82c900a4d7bf} status4evar.js
-contract @caligonstudios.com/status4evar;1 {13b3595e-7bb5-4cfe-bbfa-82c900a4d7bf}
+component {b418cd1b-b172-4ef5-bfc5-fc555c87dbc4} status4evar.js
+contract @caligonstudios.com/status4evar;1 {b418cd1b-b172-4ef5-bfc5-fc555c87dbc4}
category profile-after-change Status-4-Evar @caligonstudios.com/status4evar;1