Changeset 4

Timestamp:

06/21/05 16:19:10 (4 years ago)

Author:

t-bone

Message:

Keyboard shortcut

Location:

uppity/trunk/chrome/uppity/content/uppity

Files:

• uppity-overlay.xul (modified) (1 diff)
• uppity.js (modified) (3 diffs)

uppity/trunk/chrome/uppity/content/uppity/uppity-overlay.xul

@@ -1 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://uppity/skin/uppity-overlay.css" type="text/css"?> 
-<overlay id="uppity-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<?xml version='1.0'?>
+<?xml-stylesheet href='chrome://uppity/skin/uppity-overlay.css' type='text/css'?> 
+<overlay id='uppity-overlay' xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>
 
-<script type="application/x-javascript" src="chrome://uppity/content/uppity.js"></script>
+<script type='application/x-javascript' src='chrome://uppity/content/uppity.js'></script>
 
-<toolbarpalette id="BrowserToolbarPalette">
-    <toolbarbutton id="tb-uppity" oncommand="uppity.goUp()" 
-        class="toolbarbutton-1"
-        label="Uppity" tooltiptext="Go Up 1 Level"
+<toolbarpalette id='BrowserToolbarPalette'>
+    <toolbarbutton id='tb-uppity' oncommand='uppity.goUp()' 
+        class='toolbarbutton-1'
+        label='Uppity' tooltiptext='Go Up 1 Level'
     />
 </toolbarpalette>
 
-<statusbar id="status-bar">
-    <statusbarpanel id="status-bar-uppity" insertafter="livemark-button">
-        <image id="status-bar-uppity-image" width="16" height="16"
-            src="chrome://uppity/skin/sb-icon.png"
-            onclick="uppity.goUp();"
+<statusbar id='status-bar'>
+    <statusbarpanel id='status-bar-uppity' insertafter='livemark-button'>
+        <image id='status-bar-uppity-image' width='16' height='16'
+            src='chrome://uppity/skin/sb-icon.png'
+            oncommand='uppity.goUp();'
+            context='status-bar-uppity-context'
         />
     </statusbarpanel>
+
+    <popup id='status-bar-uppity-context'>
+        <menuitem label='Go Up' oncommand='uppity.goUp();' />
+        <menuitem label='Turn off this button' oncommand='uppity.turnOffSBButton();' />
+    </popup>
 </statusbar>
 
-<script type="application/x-javascript">
+<keyset id="mainKeyset">
+    <key id='uppity-key-shortcut'
+        modifiers='alt'
+        keycode='VK_UP'
+        oncommand='uppity.goUp();'
+    />
+</keyset>
+
+<script type='application/x-javascript'>
 <![CDATA[
-window.addEventListener("load", function() {
+window.addEventListener('load', function() {
 uppity.setSBButtonVis();
-}, false); // end window.addEventListener("load"...)
+}, false); // end window.addEventListener('load'...)
 ]]>
 </script>

uppity/trunk/chrome/uppity/content/uppity/uppity.js

@@ -5 +5 @@
 //firefox extension from scratch!
 goUp:function() {
+    try {
     var l=getBrowser().contentWindow.location, 
-        L=false, h=l.href, S='/', s=l.protocol+S+S,
-        d=l.pathname, i=d.indexOf(S), j=d.lastIndexOf(S);
+        L=false, h=l.href, s=l.protocol+'//',
+        d=l.pathname, i=d.indexOf('/'), j=d.lastIndexOf('/');
     if (l.hash) {
         L=h.replace(l.hash, '')
     } else if (l.search) {
         L=h.replace(l.search, '')
-    } else if (S==d) {
+    } else if ('/'==d) {
         if (s.match('http'))i='www.';
         if(s.match('ftp'))i='ftp.';
@@ -21 +22 @@
         L='.'
     }
+    dump('Uppity to: '+L+'\n');
     if (L) l.assign(L);
+    } catch (e) { this.dumpErr(e); }
 },
 
@@ -80 +83 @@
     var sb=document.getElementById('status-bar-uppity');
     sb.style.display=(show?'-moz-box':'none');
-}
+},
+
+turnOffSBButton:function() {
+    dump('buttonoff...\n');
+    this.setPref('bool', 'uppity.sb-icon', false);
+    this.setSBButtonVis();
+},
+
 }//close var uppity