Skip to content

Commit

Permalink
moved all ids into the noojeeClick namespace.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bsutton
bsutton committed May 13, 2014
1 parent 6a1bf0e commit abdc1ab
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 54 deletions.
2 changes: 1 addition & 1 deletion firefox/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<property name="build" location="build" />
<property name="dist" location="dist" />

<property name="version" value="2.0.8" />
<property name="version" value="2.0.10" />
<property name="maxMozillaFirefoxVersion" value="32.0" />
<property name="maxLocalFirefoxVersion" value="45.0" />
<property name="maxClientFirefoxVersion" value="45.0" />
Expand Down
42 changes: 21 additions & 21 deletions firefox/src/content/noojeeclick.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,10 @@ noojeeClick.ns(function()
// The user has done a right click on the Noojee
// click to dial icon so show
// the dial differently menu item.
var menuItem = document.getElementById("njClick.njcontextDialDifferently");
var menuItem = document.getElementById("noojeeClick.njcontextDialDifferently");
menuItem.hidden = false;
// and the dial menu item
var menuItem = document.getElementById("njClick.contextDialSelection");
var menuItem = document.getElementById("noojeeClick.contextDialSelection");
menuItem.hidden = false;

// We don't check for 'selected' text if the user
Expand All @@ -202,7 +202,7 @@ noojeeClick.ns(function()
// we don't need the dial different option (the standard
// dial option lets them dial
// differently).
var menuItem = document.getElementById("njClick.njcontextDialDifferently");
var menuItem = document.getElementById("noojeeClick.njcontextDialDifferently");
menuItem.hidden = true;
visibleItems--;
}
Expand All @@ -217,20 +217,20 @@ noojeeClick.ns(function()
// The user has selected some text AND it contains a
// number
theApp.logging.njdebug("noojeeclick", "popup - text selected");
var menuItem = document.getElementById("njClick.contextDialSelection");
var menuItem = document.getElementById("noojeeClick.contextDialSelection");
menuItem.hidden = false;
menuItem = document.getElementById("njClick.contextDialAddPattern");
menuItem = document.getElementById("noojeeClick.contextDialAddPattern");
menuItem.hidden = false;
}
else
{
// either their is no selection or it doesn't
// contain a number so suppress both menus.
theApp.logging.njdebug("noojeeclick", "popup - text not selected");
var menuItem = document.getElementById("njClick.contextDialSelection");
var menuItem = document.getElementById("noojeeClick.contextDialSelection");
menuItem.hidden = true;
visibleItems--;
menuItem = document.getElementById("njClick.contextDialAddPattern");
menuItem = document.getElementById("noojeeClick.contextDialAddPattern");
menuItem.hidden = true;
visibleItems--;
}
Expand All @@ -242,7 +242,7 @@ noojeeClick.ns(function()
// all of the menu items have been suppressed so remove
// the
// separator.
var menuItem = document.getElementById("njClick.contextSeparator");
var menuItem = document.getElementById("noojeeClick.contextSeparator");
menuItem.hidden = true;
}
}
Expand Down Expand Up @@ -289,7 +289,7 @@ noojeeClick.ns(function()
onDialDifferentlyShowing : function(menu)
{
theApp.logging.njdebug("noojeeclick", "onDialDifferentlyShowing");
var menuItem = document.getElementById('njClick.njcontextDialDifferently');
var menuItem = document.getElementById('noojeeClick.njcontextDialDifferently');
menuItem.hidden = false;
},

Expand All @@ -299,7 +299,7 @@ noojeeClick.ns(function()
var selected = theApp.util.getSelectedText();
if (selected == null || selected.length == 0)
{
var menuItem = document.getElementById('njClick.contextDialSelection');
var menuItem = document.getElementById('noojeeClick.contextDialSelection');
menuItem.hidden = true;
}
},
Expand All @@ -309,7 +309,7 @@ noojeeClick.ns(function()
var selected = theApp.util.getSelectedText();
if (selected == null || selected.length == 0)
{
var menuItem = document.getElementById('njClick.contextDialAddPattern');
var menuItem = document.getElementById('noojeeClick.contextDialAddPattern');
menuItem.hidden = true;
}

Expand All @@ -327,7 +327,7 @@ noojeeClick.ns(function()
{
theApp.logging.njdebug("noojeeclick", "onShowClickIconsShowing called");
var showClickIcons = theApp.prefs.getBoolValue("showClickIcons");
var showClickIconsMenu = document.getElementById('njClick.menu_ShowClickIcons');
var showClickIconsMenu = document.getElementById('noojeeClick.menu_ShowClickIcons');
showClickIconsMenu.setAttribute("checked", showClickIcons);
},

Expand All @@ -336,7 +336,7 @@ noojeeClick.ns(function()
{
theApp.logging.njdebug("noojeeclick", "onRedialShowing called");
var lastDialed = theApp.prefs.getValue("lastDialed");
var redialMenu = document.getElementById('njClick.menu_Redial');
var redialMenu = document.getElementById('noojeeClick.menu_Redial');
if (lastDialed != null && lastDialed.length > 0)
{
redialMenu.label = "Redial: " + lastDialed;
Expand Down Expand Up @@ -373,16 +373,16 @@ noojeeClick.ns(function()
renderQuickPickMenu : function ()
{
// Clear the existing menu items.
var element = document.getElementById("njClick.menu_ClidQuickPick");
var element = document.getElementById("noojeeClick.menu_ClidQuickPick");
if (element != null)
element.parentNode.removeChild(element);

// Create the new popup menu
var listMenu = document.createElement("menu");
listMenu.setAttribute("label","Switch CLID");
listMenu.setAttribute("id", "njClick.menu_ClidQuickPick");
listMenu.setAttribute("id", "noojeeClick.menu_ClidQuickPick");

var menuDial = document.getElementById('njClick.menuDial');
var menuDial = document.getElementById('noojeeClick.menuDial');
theApp.logging.njdebug("quickpicks", "retrieved menu: " + menuDial);
menuDial.appendChild(listMenu);

Expand All @@ -408,8 +408,8 @@ noojeeClick.ns(function()

// Create the clid menu item.
var item = listMenu.appendItem(name);
item.id = "njClick.menu_ClidQuickPick.clid-index-" + i;
item.setAttribute("id", "njClick.menu_ClidQuickPick.clid-index-" + i);
item.id = "noojeeClick.menu_ClidQuickPick.clid-index-" + i;
item.setAttribute("id", "noojeeClick.menu_ClidQuickPick.clid-index-" + i);
item.setAttribute("clid-index", i);
item.setAttribute("type", "radio");
item.setAttribute("oncommand", "noojeeClick.noojeeclick.onSelectClidQuickPick(this);");
Expand All @@ -423,7 +423,7 @@ noojeeClick.ns(function()

// add the quick pick to the menu.
//var item = window.document.createElement("menuitem");
//njClick.menu_ClidQuickPick_List_" + name);
//noojeeClick.menu_ClidQuickPick_List_" + name);
//item.addEventListener("onClick", function() {noojeeClick.noojeeclick.onSelectClidQuickPick()}, false);
if (i == activeQuickPick)
{
Expand All @@ -445,7 +445,7 @@ noojeeClick.ns(function()
if (enabled)
{
var reset = theApp.prefs.getBoolValue("clidquickpick.reset");
var quickPickMenu = document.getElementById('njClick.menu_ClidQuickPick');
var quickPickMenu = document.getElementById('noojeeClick.menu_ClidQuickPick');
if (quickPickMenu == null || reset == true)
{
// Flag that the menu has been reset.
Expand All @@ -458,7 +458,7 @@ noojeeClick.ns(function()
}
else
{
var quickPickMenu = document.getElementById('njClick.menu_ClidQuickPick');
var quickPickMenu = document.getElementById('noojeeClick.menu_ClidQuickPick');
if (quickPickMenu != null)
quickPickMenu.hidden = true;
}
Expand Down
64 changes: 32 additions & 32 deletions firefox/src/content/xul/overlay.xul
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@


<popup id="contentAreaContextMenu" popupshowing="noojeeClick.noojeeclick.onDialDifferentlyShowing(this);">
<menuseparator id="njClick.contextSeparator"/>
<menuitem id="njClick.njcontextDialDifferently"
<menuseparator id="noojeeClick.contextSeparator"/>
<menuitem id="noojeeClick.njcontextDialDifferently"
label="Dial Differently..."
observes="Tasks:njClick.dialDifferently"
observes="Tasks:noojeeClick.dialDifferently"
class="menu-iconic-wide"
popupshowing="noojeeClick.noojeeclick.onDialDifferentlyShowing(document.popupNode);"
/>
<menuitem id="njClick.contextDialSelection"
<menuitem id="noojeeClick.contextDialSelection"
label="Dial Selection..."
observes="Tasks:njClick.dialSelection"
observes="Tasks:noojeeClick.dialSelection"
class="menu-iconic-wide"
popupshowing="noojeeClick.noojeeclick.onDialSelectionShowing(document.popupNode);"
/>
<menuitem id="njClick.contextDialAddPattern"
<menuitem id="noojeeClick.contextDialAddPattern"
label="Add Dial Pattern..."
observes="Tasks:njClick.dialAddPattern"
observes="Tasks:noojeeClick.dialAddPattern"
class="menu-iconic-wide"
popupshowing="noojeeClick.noojeeclick.onDialAddPatternShowing(document.popupNode);"
/>
Expand All @@ -35,17 +35,17 @@
commandupdater="true"
events="focus"
oncommandupdate="goUpdateCommand('Task:enable');goUpdateCommand('Task:redail');">
<command id="Tasks:njClick.dial" oncommand="noojeeClick.handlers.dialMenuAction();"/>
<command id="Tasks:njClick.redial" oncommand="noojeeClick.handlers.redialMenuAction();"/>
<command id="Tasks:njClick.switchCLID" oncommand="noojeeClick.handlers.clidQuickPickMenuAction();"/>
<command id="Tasks:njClick.dialFromClipboard" oncommand="noojeeClick.handlers.dialFromClipboardMenuAction();"/>
<command id="Tasks:njClick.dialSelection" oncommand="noojeeClick.handlers.dialSelectionMenuAction();"/>
<command id="Tasks:njClick.dialDifferently" oncommand="noojeeClick.handlers.dialDifferentlyMenuAction();"/>
<command id="Tasks:njClick.configuration" oncommand="noojeeClick.prefs.onConfiguration();"/>
<command id="Tasks:njClick.dialAddPattern" oncommand="noojeeClick.handlers.onAddDialPatternMenuAction();"/>
<command id="Tasks:njClick.refresh" oncommand="noojeeClick.render.onRefresh();"/>
<command id="Tasks:njClick.showClickIcons" oncommand="noojeeClick.handlers.onShowClickIcons();"/>
<command id="Tasks:njClick.hangup" oncommand="noojeeClick.handlers.onHangup();"/>
<command id="Tasks:noojeeClick.dial" oncommand="noojeeClick.handlers.dialMenuAction();"/>
<command id="Tasks:noojeeClick.redial" oncommand="noojeeClick.handlers.redialMenuAction();"/>
<command id="Tasks:noojeeClick.switchCLID" oncommand="noojeeClick.handlers.clidQuickPickMenuAction();"/>
<command id="Tasks:noojeeClick.dialFromClipboard" oncommand="noojeeClick.handlers.dialFromClipboardMenuAction();"/>
<command id="Tasks:noojeeClick.dialSelection" oncommand="noojeeClick.handlers.dialSelectionMenuAction();"/>
<command id="Tasks:noojeeClick.dialDifferently" oncommand="noojeeClick.handlers.dialDifferentlyMenuAction();"/>
<command id="Tasks:noojeeClick.configuration" oncommand="noojeeClick.prefs.onConfiguration();"/>
<command id="Tasks:noojeeClick.dialAddPattern" oncommand="noojeeClick.handlers.onAddDialPatternMenuAction();"/>
<command id="Tasks:noojeeClick.refresh" oncommand="noojeeClick.render.onRefresh();"/>
<command id="Tasks:noojeeClick.showClickIcons" oncommand="noojeeClick.handlers.onShowClickIcons();"/>
<command id="Tasks:noojeeClick.hangup" oncommand="noojeeClick.handlers.onHangup();"/>

</commandset>

Expand All @@ -61,34 +61,34 @@
<statusbarpanel id="noojeeMenu"
class="statusbarpanel-menu-iconic"
src="chrome://noojeeclick/content/images/small.png"
contextmenu="njClick.menuDial">
<menupopup id="njClick.menuDial" onpopupshowing="noojeeClick.noojeeclick.onMenuOpen(this);">
<menuitem id="njClick.menu_Dial"
contextmenu="noojeeClick.menuDial">
<menupopup id="noojeeClick.menuDial" onpopupshowing="noojeeClick.noojeeclick.onMenuOpen(this);">
<menuitem id="noojeeClick.menu_Dial"
label="Dial..."
observes="Tasks:njClick.dial"
observes="Tasks:noojeeClick.dial"
class="menu-iconic-wide"/>
<menuitem id="njClick.menu_Redial"
<menuitem id="noojeeClick.menu_Redial"
label="Redial:"
observes="Tasks:njClick.redial"
observes="Tasks:noojeeClick.redial"
popupshowing="noojeeClick.noojeeclick.onRedialShowing(this);"
class="menu-iconic-wide"/>
<menuitem id="menu_DialClipboard"
<menuitem id="noojeeClick.menu_DialClipboard"
label="Dial from Clipboard..."
observes="Tasks:njClick.dialFromClipboard"
observes="Tasks:noojeeClick.dialFromClipboard"
class="menu-iconic-wide"/>
<menuitem id="njClick.menu_Configuration"
<menuitem id="noojeeClick.menu_Configuration"
label="Configuration..."
observes="Tasks:njClick.configuration"
observes="Tasks:noojeeClick.configuration"
class="menu-iconic-wide"/>
<menuitem id="njClick.menu_ShowClickIcons"
<menuitem id="noojeeClick.menu_ShowClickIcons"
label="Show Click Icons"
type="checkbox"
observes="Tasks:njClick.showClickIcons"
observes="Tasks:noojeeClick.showClickIcons"
popupshowing="noojeeClick.noojeeclick.onShowClickIconsShowing(this);"
class="menu-iconic-wide"/>
<menuitem id="njClick.menu_Refresh"
<menuitem id="noojeeClick.menu_Refresh"
label="Refresh"
observes="Tasks:njClick.refresh"
observes="Tasks:noojeeClick.refresh"
class="menu-iconic-wide"/>
</menupopup>
</statusbarpanel>
Expand Down

0 comments on commit abdc1ab

Please sign in to comment.