[Pkg-mozext-commits] [itsalltext] 175/459: Fixed mac os x problem (hopefully) turned off context menu except when needed.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository itsalltext.

commit a9333ca45b81c295c7abcb73df3a0bdd8db7a03b
Author: docwhat at gerf.org <docwhat at gerf.org>
Date:   Mon Mar 26 11:37:22 2007 -0400

    Fixed mac os x problem (hopefully)
    turned off context menu except when needed.
---
 Makefile                      |  5 +++++
 changelog.txt                 | 10 ++++++++++
 chrome/content/itsalltext.js  | 41 +++++++++++++++++++++++++----------------
 chrome/content/itsalltext.xul |  1 -
 install.rdf                   |  2 +-
 5 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index bf0e5a6..08d9280 100644
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,11 @@ docs/.stamp: $(SOURCES_JS)
 	$^
 	$(Q)touch "$@"
 
+.PHONY: lintlog
+lintlog:
+	$(Q)$(MAKE) lint || :
+	$(Q)find -name '*.lint' -print0 | xargs -0 cat
+
 .PHONY: lint
 lint: $(SOURCES_JS_LINT)
 
diff --git a/changelog.txt b/changelog.txt
index 944a9a9..d5fba53 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -10,6 +10,16 @@ Note to Mac OS X users: Most editors come with a component in
 strange, then create a shell script to do an "open -a /path/to/editor
 $*".
 
+****** 0.6.1 ******
+* Fix for MacOSX preferences not having a close button.
+* missing 'var'
+
+****** 0.6.0 ******
+* really fixed gumdrop positioning
+* right clicking the gumdrop lets you choose the file extension
+* if the editor doesn't work, explain to the user what happened.
+* improved refreshing rules!
+
 ****** 0.4.3 ******
 * fixed gumdrop positioning
 * Hide gumdrop/menu when textarea is readonly/disabled.
diff --git a/chrome/content/itsalltext.js b/chrome/content/itsalltext.js
index fe0e577..d7ca3c7 100644
--- a/chrome/content/itsalltext.js
+++ b/chrome/content/itsalltext.js
@@ -362,8 +362,7 @@ var ItsAllText = function() {
          */
         var features;
         try {
-            var prefs = Components.classes["@mozilla.org/preferences-service;1"]
-                .getService(Components.interfaces.nsIPrefBranch);
+            var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
             instantApply = prefs.getBoolPref("browser.preferences.instantApply");
             features = "chrome,titlebar,toolbar,centerscreen" + (instantApply ? ",dialog=no" : ",modal");
         } catch (e) {
@@ -612,20 +611,30 @@ var ItsAllText = function() {
      * @param {Object} event The event passed in by the event handler.
      */
     that.onContextMenu = function(event) {
-        if(event.target &&
-           event.target.id == "itsalltext-context-popup") {
-            var node = document.popupNode;
-            var cobj = that.getCacheObj(node);
-            var tag = node.nodeName.toLowerCase();
-            var is_disabled = (!(tag == 'textarea' || 
-                                 tag == 'textbox') ||
-                               node.style.display == 'none' ||
-                               node.getAttribute('readonly') ||
-                               node.getAttribute('disabled')
-                               );
-            that.rebuildMenu(cobj.uid,
-                             'itsalltext-context-popup',
-                             is_disabled);
+        if(event.target) {
+            var tid = event.target.id;
+            if (tid == "itsalltext-context-popup" ||
+                tid == "contentAreaContextMenu") {
+                var node = document.popupNode;
+                var tag = node.nodeName.toLowerCase();
+                var is_disabled = (!(tag == 'textarea' || 
+                                     tag == 'textbox') ||
+                                   node.style.display == 'none' ||
+                                   node.getAttribute('readonly') ||
+                                   node.getAttribute('disabled')
+                                   );
+                if (tid == "itsalltext-context-popup") {
+                    var cobj = that.getCacheObj(node);
+                    that.rebuildMenu(cobj.uid,
+                                     'itsalltext-context-popup',
+                                     is_disabled);
+                } else {
+                    // tid == "contentAreaContextMenu"
+                    var menu = document.getElementById("itsalltext-contextmenu");
+                    menu.setAttribute('hidden', is_disabled);
+                }
+                    
+            }
         }
         return true;
     };
diff --git a/chrome/content/itsalltext.xul b/chrome/content/itsalltext.xul
index 061864f..5159753 100644
--- a/chrome/content/itsalltext.xul
+++ b/chrome/content/itsalltext.xul
@@ -26,7 +26,6 @@
     </menu>
   </popup>
 
-
   <!-- The merge point is main-window -->
   <window id="main-window">
     <popupset id="itsalltext-optionmenu-set">
diff --git a/install.rdf b/install.rdf
index a7ad403..bd177f8 100644
--- a/install.rdf
+++ b/install.rdf
@@ -12,7 +12,7 @@
                    em:maxVersion="0.8" />
   <RDF:Description RDF:about="urn:mozilla:install-manifest"
                    em:id="itsalltext at docwhat.gerf.org"
-                   em:version="0.6.0"
+                   em:version="0.6.1"
                    em:type="2"
                    em:name="It's All Text!"
                    em:description="Edit text using your favorite editor!"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/itsalltext.git