diff -Nuar omni_old/chrome/browser/content/browser/browser.js omni/chrome/browser/content/browser/browser.js
--- omni_old/chrome/browser/content/browser/browser.js 2010-01-01 00:00:00.000000000 +0800
+++ omni/chrome/browser/content/browser/browser.js 2012-10-16 20:56:30.035616790 +0800
@@ -8114,11 +8114,30 @@
if (aState == "valid") {
gLastValidURLStr = gURLBar.value;
gURLBar.addEventListener("input", UpdatePageProxyState, false);
+
+ PageProxySetIcon(gBrowser.getIcon());
} else if (aState == "invalid") {
gURLBar.removeEventListener("input", UpdatePageProxyState, false);
+ PageProxyClearIcon();
}
}
+function PageProxySetIcon (aURL)
+{
+ if (!gProxyFavIcon)
+ return;
+
+ if (!aURL)
+ PageProxyClearIcon();
+ else if (gProxyFavIcon.getAttribute("src") != aURL)
+ gProxyFavIcon.setAttribute("src", aURL);
+}
+
+function PageProxyClearIcon ()
+{
+ gProxyFavIcon.removeAttribute("src");
+}
+
function PageProxyClickHandler(aEvent)
{
if (aEvent.button == 1 && gPrefService.getBoolPref("middlemouse.paste"))
@@ -9475,6 +9494,12 @@
return "_blank";
},
+ onLinkIconAvailable: function (aIconURL) {
+ console.log('onLinkIconAvailable: ' + aIconURL);
+ if (gProxyFavIcon && gBrowser.userTypedValue === null)
+ PageProxySetIcon(aIconURL); // update the favicon in the URL bar
+ },
+
onProgressChange: function (aWebProgress, aRequest,
aCurSelfProgress, aMaxSelfProgress,
aCurTotalProgress, aMaxTotalProgress) {
@@ -12103,6 +12128,7 @@
switch (newMode) {
case this.IDENTITY_MODE_DOMAIN_VERIFIED: {
let iData = this.getIdentityData();
+ icon_label = this.getEffectiveHost();
// Verifier is either the CA Org, for a normal cert, or a special string
// for certs that are trusted because of a security exception.
diff -Nuar omni_old/chrome/browser/content/browser/browser.xul omni/chrome/browser/content/browser/browser.xul
--- omni_old/chrome/browser/content/browser/browser.xul 2010-01-01 00:00:00.000000000 +0800
+++ omni/chrome/browser/content/browser/browser.xul 2012-10-16 21:20:56.198031666 +0800
@@ -1766,9 +1766,10 @@
onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
ondragstart="gIdentityHandler.onDragStart(event);">
-
+ pageproxystate="invalid"
+ onerror="this.removeAttribute('src');"/>
diff -Nuar omni_old/chrome/browser/content/browser/tabview.js omni/chrome/browser/content/browser/tabview.js
--- omni_old/chrome/browser/content/browser/tabview.js 2010-01-01 00:00:00.000000000 +0800
+++ omni/chrome/browser/content/browser/tabview.js 2012-10-16 20:56:30.042283485 +0800
@@ -1183,7 +1183,7 @@
drag.info.stop();
if (!this.isAGroupItem && !this.parent) {
- new GroupItem([drag.info.$el], {focusTitle: true});
+ new GroupItem([drag.info.$el]);
gTabView.firstUseExperienced = true;
}
@@ -3801,40 +3801,8 @@
let self = this;
let lastMouseDownTarget;
- container.mousedown(function(e) {
- let target = e.target;
- // only set the last mouse down target if it is a left click, not on the
- // close button, not on the expand button, not on the title bar and its
- // elements
- if (Utils.isLeftClick(e) &&
- self.$closeButton[0] != target &&
- self.$titlebar[0] != target &&
- self.$expander[0] != target &&
- !self.$titlebar.contains(target) &&
- !self.$appTabTray.contains(target)) {
- lastMouseDownTarget = target;
- } else {
- lastMouseDownTarget = null;
- }
- });
- container.mouseup(function(e) {
- let same = (e.target == lastMouseDownTarget);
- lastMouseDownTarget = null;
-
- if (same && !self.isDragging) {
- if (gBrowser.selectedTab.pinned &&
- UI.getActiveTab() != self.getActiveTab() &&
- self.getChildren().length > 0) {
- UI.setActive(self, { dontSetActiveTabInGroup: true });
- UI.goToTab(gBrowser.selectedTab);
- } else {
- let tabItem = self.getTopChild();
- if (tabItem)
- tabItem.zoomIn();
- else
- self.newTab();
- }
- }
+ container.dblclick(function(e) {
+ self.newTab();
});
let dropIndex = false;
@@ -9303,7 +9271,7 @@
let box = item.getBounds();
if (box.width > minMinSize && box.height > minMinSize &&
(box.width > minSize || box.height > minSize)) {
- let opts = {bounds: item.getBounds(), focusTitle: true};
+ let opts = {bounds: item.getBounds()};
let groupItem = new GroupItem([], opts);
self.setActive(groupItem);
phantom.remove();
diff -Nuar omni_old/chrome/browser/skin/classic/browser/browser.css omni/chrome/browser/skin/classic/browser/browser.css
--- omni_old/chrome/browser/skin/classic/browser/browser.css 2010-01-01 00:00:00.000000000 +0800
+++ omni/chrome/browser/skin/classic/browser/browser.css 2012-10-16 20:59:32.219610372 +0800
@@ -895,10 +895,6 @@
-moz-box-align: stretch;
}
-.urlbar-input-box {
- -moz-margin-start: 0;
-}
-
.urlbar-history-dropmarker {
-moz-appearance: toolbarbutton-dropdown;
}
@@ -980,29 +976,11 @@
#page-proxy-favicon {
width: 16px;
height: 16px;
- margin-top: 2px;
- margin-bottom: 2px;
- -moz-margin-start: 4px;
- -moz-margin-end: 3px;
- list-style-image: url(chrome://browser/skin/identity-icons-generic.png);
- -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] {
- list-style-image: url(chrome://browser/skin/identity-icons-https.png);
-}
-
-.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] {
- list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png);
-}
-
-#identity-box:hover > #page-proxy-favicon {
- -moz-image-region: rect(0, 32px, 16px, 16px);
+ margin: 2px 4px;
}
-#identity-box:hover:active > #page-proxy-favicon,
-#identity-box[open=true] > #page-proxy-favicon {
- -moz-image-region: rect(0, 48px, 16px, 32px);
+#page-proxy-favicon:not([src]) {
+ list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
}
#page-proxy-favicon[pageproxystate="invalid"] {
@@ -1011,6 +989,9 @@
/* Identity indicator */
#identity-box {
+ background-image: -moz-linear-gradient(hsl(0,0%,98%), hsl(0,0%,92%));
+ box-shadow: 0 1px 0 hsla(0,0%,0%,.05) inset;
+ -moz-border-end: 1px solid rgba(0,0,0,.1);
padding: 1px;
margin: -1px;
-moz-margin-end: 0;
@@ -1032,22 +1013,44 @@
outline-offset: -3px;
}
+#identity-box:hover:active,
+#identity-box[open="true"] {
+ background-image: -moz-linear-gradient(hsl(0,0%,92%), hsl(0,0%,82%));
+ box-shadow: 0 1px 1px hsla(0,0%,0%,.3) inset,
+ 0 1px 3px hsla(0,0%,0%,.3) inset;
+}
+
#identity-icon-labels {
-moz-padding-start: 2px;
-moz-padding-end: 5px;
}
-#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
- background-color: #fff;
+#identity-box.verifiedDomain {
+ background-image: -moz-linear-gradient(hsl(215,60%,92%), hsl(215,58%,88%));
+ box-shadow: 0 1px 0 hsla(215,54%,33%,.05) inset;
+ -moz-border-end-color: hsla(215,54%,33%,.2);
+ color: hsl(215,54%,33%);
+}
+
+#identity-box.verifiedDomain:hover:active,
+#identity-box.verifiedDomain[open="true"] {
+ background-image: -moz-linear-gradient(hsl(215,80%,80%), hsl(215,67%,65%));
+ box-shadow: 0 1px 1px hsla(215,54%,33%,.7) inset,
+ 0 1px 3px 1px hsla(215,54%,33%,.5) inset;
+}
+
+#identity-box.verifiedIdentity {
+ background-image: -moz-linear-gradient(hsl(91,70%,90%), hsl(93,60%,81%));
+ box-shadow: 0 1px 0 hsla(92,81%,16%,.05) inset;
+ -moz-border-end-color: hsla(92,81%,16%,.2);
color: hsl(92,100%,30%);
- -moz-margin-end: 4px;
- background-image: -moz-linear-gradient(hsla(92,81%,16%,0),
- hsla(92,81%,16%,.2) 25%,
- hsla(92,81%,16%,.2) 75%,
- hsla(92,81%,16%,0));
- background-position: right;
- background-size: 1px;
- background-repeat: no-repeat;
+}
+
+#identity-box.verifiedIdentity:hover:active,
+#identity-box.verifiedIdentity[open="true"] {
+ background-image: -moz-linear-gradient(hsl(92,65%,70%), hsl(92,40%,48%));
+ box-shadow: 0 1px 1px hsla(92,81%,16%,.6) inset,
+ 0 1px 3px 1px hsla(92,81%,16%,.5) inset;
}
#identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
diff -Nuar omni_old/defaults/preferences/firefox.js omni/defaults/preferences/firefox.js
--- omni_old/defaults/preferences/firefox.js 2010-01-01 00:00:00.000000000 +0800
+++ omni/defaults/preferences/firefox.js 2012-10-16 20:56:30.042283485 +0800
@@ -796,6 +796,11 @@
// 2 - pre-populate site URL and pre-fetch certificate
pref("browser.ssl_override_behavior", 2);
+// 0 - do not show domain
+// 1 - show effectiveTLD + 1 (e.g. mozilla.org)
+// 2 - show full domain (e.g. bugzilla.mozilla.org)
+pref("browser.identity.ssl_domain_display", 1);
+
// True if the user should be prompted when a web application supports
// offline apps.
pref("browser.offline-apps.notify", true);