Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-16 23:42:39 +01:00
Code Issues Releases Wiki Activity

Merge branch 'Fix_#505'

Browse Source
This commit is contained in:
AlexVallat 2015-04-20 07:52:41 +01:00
commit 82b97760db
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
platform/firefox/css/popup-vertical.css Normal file
View File

@ -0,0 +1,23 @@
/* Overrides to popup.css for display in a vertical panel, such as the firefox panel menu */
body {
width: 100%;
}
#panes > div {
display: block;
}
#panes > #dfPane {
width: 100%;
border-right: none;
}
body[dir="ltr"] #panes > #dfPane {
direction: ltr; /* reset scroll bar to the right */
margin-right: 0;
}
body[dir="rtl"] #panes > #dfPane {
direction: rtl; /* reset scroll bar to the left */
margin-left: 0;
}

14
platform/firefox/vapi-background.js
View File

@ -1470,6 +1470,8 @@ vAPI.toolbarButton.init = function() {
return; return;
} }
this.CustomizableUI = CustomizableUI;
this.defaultArea = CustomizableUI.AREA_NAVBAR; this.defaultArea = CustomizableUI.AREA_NAVBAR;
this.styleURI = [ this.styleURI = [
'#' + this.id + '.off {', '#' + this.id + '.off {',
@ -1482,7 +1484,7 @@ vAPI.toolbarButton.init = function() {
vAPI.getURL('img/browsericons/icon16.svg'), vAPI.getURL('img/browsericons/icon16.svg'),
');', ');',
'}', '}',
'#' + this.viewId + ', #' + this.viewId + ' > iframe {', '#' + this.viewId + ' {',
'width: 160px;', 'width: 160px;',
'height: 290px;', 'height: 290px;',
'overflow: hidden !important;', 'overflow: hidden !important;',
@ -1639,6 +1641,9 @@ vAPI.toolbarButton.onBeforeCreated = function(doc) {
delayedResize(); delayedResize();
} }
}; };
var CustomizableUI = this.CustomizableUI;
var widgetId = this.id;
var onPopupReady = function() { var onPopupReady = function() {
var win = this.contentWindow; var win = this.contentWindow;
@ -1646,6 +1651,13 @@ vAPI.toolbarButton.onBeforeCreated = function(doc) {
return; return;
} }
var placement = CustomizableUI.getPlacementOfWidget(widgetId);
if (placement.area === CustomizableUI.AREA_PANEL) {
// Add some overrides for displaying the popup correctly in a panel
win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils)
.loadSheet(Services.io.newURI(vAPI.getURL("css/popup-vertical.css"), null, null), Ci.nsIDOMWindowUtils.AUTHOR_SHEET);
}
new win.MutationObserver(delayedResize).observe(win.document.body, { new win.MutationObserver(delayedResize).observe(win.document.body, {
attributes: true, attributes: true,
characterData: true, characterData: true,

1
tools/make-firefox.sh
View File

@ -21,6 +21,7 @@ cp platform/firefox/vapi-*.js $DES/js/
cp platform/firefox/bootstrap.js $DES/ cp platform/firefox/bootstrap.js $DES/
cp platform/firefox/frame*.js $DES/ cp platform/firefox/frame*.js $DES/
cp -R platform/firefox/img $DES/ cp -R platform/firefox/img $DES/
cp -R platform/firefox/css $DES/
cp platform/firefox/chrome.manifest $DES/ cp platform/firefox/chrome.manifest $DES/
cp platform/firefox/install.rdf $DES/ cp platform/firefox/install.rdf $DES/
cp platform/firefox/*.xul $DES/ cp platform/firefox/*.xul $DES/