hanez/leo-search
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

just cleanups

Browse source
This commit is contained in:
Johannes Findeisen 2015-07-24 02:30:44 +02:00
commit e25703a111
2 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
chrome/content/options.xul
View file

@ -32,19 +32,19 @@
</hbox> </hbox>
</vbox> </vbox>
<vbox> <vbox>
<hbox> <hbox>
<checkbox id="checkbool_chde" preference="bool_chde" label="&checkboolchde.label;"/> <checkbox id="checkbool_chde" preference="bool_chde" label="&checkboolchde.label;"/>
</hbox>
<hbox>
<checkbox id="checkbool_itde" preference="bool_itde" label="&checkboolitde.label;"/>
</hbox>
<hbox>
<checkbox id="checkbool_rude" preference="bool_rude" label="&checkboolrude.label;"/>
</hbox>
<hbox>
<checkbox id="checkbool_ptde" preference="bool_ptde" label="&checkboolptde.label;"/>
</hbox> </hbox>
<hbox> </vbox>
<checkbox id="checkbool_itde" preference="bool_itde" label="&checkboolitde.label;"/>
</hbox>
<hbox>
<checkbox id="checkbool_rude" preference="bool_rude" label="&checkboolrude.label;"/>
</hbox>
<hbox>
<checkbox id="checkbool_ptde" preference="bool_ptde" label="&checkboolptde.label;"/>
</hbox>
</vbox>
</groupbox> </groupbox>
</prefpane> </prefpane>
</prefwindow> </prefwindow>

11
chrome/content/overlay.js
View file

@ -86,38 +86,27 @@ var leo_search = {
index < tabbrowser.tabContainer.childNodes.length && !found; index < tabbrowser.tabContainer.childNodes.length && !found;
index++) { index++) {
// Get the next tab
var currentTab = tabbrowser.tabContainer.childNodes[index]; var currentTab = tabbrowser.tabContainer.childNodes[index];
// Does this tab contain our custom attribute?
if (currentTab.hasAttribute(attrName)) { if (currentTab.hasAttribute(attrName)) {
// Yes
found = true; found = true;
gBrowser.getBrowserAtIndex(index).loadURI(url); gBrowser.getBrowserAtIndex(index).loadURI(url);
if (foregroundTab) { if (foregroundTab) {
// select and focus it.
tabbrowser.selectedTab = currentTab; tabbrowser.selectedTab = currentTab;
// Focus *this* browser window in case another one is currently focused
tabbrowser.ownerDocument.defaultView.focus(); tabbrowser.ownerDocument.defaultView.focus();
} }
} }
} }
if (!found) { if (!found) {
// Our tab isn't open. Open it now.
var browserEnumerator = wm.getEnumerator("navigator:browser"); var browserEnumerator = wm.getEnumerator("navigator:browser");
var tabbrowser = browserEnumerator.getNext().gBrowser; var tabbrowser = browserEnumerator.getNext().gBrowser;
// Create tab
var newTab = tabbrowser.addTab(url); var newTab = tabbrowser.addTab(url);
newTab.setAttribute(attrName, "leoOrg"); newTab.setAttribute(attrName, "leoOrg");
if (foregroundTab) { if (foregroundTab) {
// Focus tab
tabbrowser.selectedTab = newTab; tabbrowser.selectedTab = newTab;
// Focus *this* browser window in case another one is currently focused
tabbrowser.ownerDocument.defaultView.focus(); tabbrowser.ownerDocument.defaultView.focus();
} }
} }