Small fixes

- also move Firefox to use addEventListener for MissingEajax event
jcutler · Jul 13, 2011 · 8a417ff · 8a417ff
1 parent 4109a86
commit 8a417ff
Show file tree

Hide file tree

Showing 17 changed files with 93 additions and 81 deletions.
diff --git a/chrome/bookmarker/bookmarker.js b/chrome/bookmarker/bookmarker.js
@@ -264,7 +264,6 @@ function doMarks(item) {
            $('#user_menu_' + post).length === 0)) {
          return false;
       }
-      var lang = $('html').attr('lang');
       var ctrl = $(item).find('div.post_controls:not(.bookmarkAdded)');
       var j;
       var marks = parseMarks(getStorage("MissingE_bookmarker_marks",""));

diff --git a/chrome/replyReplies/replyReplies.js b/chrome/replyReplies/replyReplies.js
@@ -111,6 +111,7 @@ $('div.notification_type_icon').live('mousedown', function(e) {
             });
          }
       }
+      var lang = $('html').attr('lang');
       for (i=arr.length-1; i>=0; i--) {
          var st, en, nm, add;
          $(arr[i]).toggleClass("MissingE_rt",false);
@@ -171,7 +172,6 @@ $('div.notification_type_icon').live('mousedown', function(e) {
          newcode = newcode.replace(/\s*$/,'');
 
          if ($(arr[i]).parent().hasClass('note')) {
-            var lang = $('html').attr('lang');
             var a,b,z,img,user,qt,reblnk,x;
             var main = $(arr[i]).closest('li.post');
             var ans = $(arr[i]).parent();

diff --git a/firefox/missinge/data/askFixes/askFixes.js b/firefox/missinge/data/askFixes/askFixes.js
@@ -160,7 +160,8 @@ function moreAnswerOptions(item, tagAsker, defTags, buttons, tags) {
    if (answer.length === 0) {
       return false;
    }
-   var lang = jQuery('html').attr("lang");
+   var lang = jQuery('html').attr('lang');
+   if (!lang) { lang = 'en'; }
    var id = escapeHTML(jQuery(item).attr('id').match(/[0-9]*$/)[0]);
    if (buttons === 1) {
       var allbtns = "";
@@ -270,6 +271,7 @@ self.on('message', function (message) {
    if (message.askDash === 1) {
       var i;
       var lang = jQuery('html').attr('lang');
+      if (!lang) { lang = 'en'; }
       var askLabel = '<a class="MissingE_askPerson_avatar" href="#"></a>';
       for (i=0; i<locale[lang]["askPerson"].length; i++) {
          if (i>0) { askLabel += " "; }
@@ -336,18 +338,18 @@ self.on('message', function (message) {
                            message.buttons,
                            message.tags);
       });
-      jQuery(document).bind('MissingEajax', function(e) {
-         var type = e.originalEvent.data.match(/^[^:]*/)[0];
-         var list = e.originalEvent.data.match(/(post_[0-9]+)/g);
+      document.addEventListener('MissingEajax', function(e) {
+         var type = e.data.match(/^[^:]*/)[0];
+         var list = e.data.match(/(post_[0-9]+)/g);
          if (type === "messages") {
-            $.each(list, function(i,val) {
+            jQuery.each(list, function(i,val) {
                moreAnswerOptions(jQuery('#'+val).get(0), message.tagAsker,
                                  message.defaultTags,
                                  message.buttons,
                                  message.tags);
             });
          }
-      });
+      }, false);
    }
 });
 

diff --git a/firefox/missinge/data/betterReblogs/betterReblogs_dash.js b/firefox/missinge/data/betterReblogs/betterReblogs_dash.js
@@ -214,6 +214,7 @@ self.on('message', function (message) {
    }
    var extensionURL = message.extensionURL;
    var lang = jQuery('html').attr('lang');
+   if (!lang) { lang = 'en'; }
    if (message.passTags === 1) {
       var selector = '#posts div.post_controls a[href^="/reblog/"]';
       if (message.quickReblog === 1) {
@@ -256,12 +257,12 @@ self.on('message', function (message) {
       jQuery('#posts li.post.regular').each(function() {
          reblogTextFull(this);
       });
-      jQuery(document).bind('MissingEajax', function(e) {
-         var list = e.originalEvent.data.match(/(post_[0-9]+)/g);
+      document.addEventListener('MissingEajax', function(e) {
+         var list = e.data.match(/(post_[0-9]+)/g);
          jQuery.each(list, function(i,val) {
             reblogTextFull(jQuery('#'+val).get(0));
          });
-      });
+      }, false);
       jQuery('#posts div.post_controls a').live('MissingEaddReblog',function() {
          reblogTextFull(this);
       });

diff --git a/firefox/missinge/data/bookmarker/bookmarker.js b/firefox/missinge/data/bookmarker/bookmarker.js
@@ -90,6 +90,7 @@ function addBar(mark, lang, altPost) {
 function generateList() {
    var i;
    var lang = jQuery('html').attr('lang');
+   if (!lang) { lang = 'en'; }
    var marks = parseMarks(getStorage("MissingE_bookmarker_marks",""));
    var marklist = jQuery('#MissingE_marklist');
    if (marks.length === 0) {
@@ -249,14 +250,14 @@ function markClick(e) {
 function doMarks(item) {
    if (item.tagName === 'LI' && jQuery(item).hasClass('post')) {
       var lang = jQuery('html').attr('lang');
+      if (!lang) { lang = 'en'; }
       var post = jQuery(item).attr('id').match(/[0-9]*$/)[0];
       if (/http:\/\/www\.tumblr\.com\/tagged\//.test(location.href) &&
           (jQuery('#user_menu_' + post + ' a[following]')
                 .attr('following') === 'false' ||
            jQuery('#user_menu_' + post).length === 0)) {
          return false;
       }
-      var lang = jQuery('html').attr('lang');
       var ctrl = jQuery(item).find('div.post_controls:not(.bookmarkAdded)');
       var j;
       var marks = parseMarks(getStorage("MissingE_bookmarker_marks",""));
@@ -423,14 +424,14 @@ self.on('message', function (message) {
          jQuery("#posts li.post").each(function(i) {
             doMarks(this);
          });
-         jQuery(document).bind('MissingEajax', function(e) {
-            var type = e.originalEvent.data.match(/^[^:]*/)[0];
-            var list = e.originalEvent.data.match(/(post_[0-9]+)/g);
+         document.addEventListener('MissingEajax', function(e) {
+            var type = e.data.match(/^[^:]*/)[0];
+            var list = e.data.match(/(post_[0-9]+)/g);
             if (type === 'notes') { return; }
             jQuery.each(list, function(i,val) {
                doMarks(jQuery('#'+val).get(0));
             });
-         });
+         }, false);
 
          if (message.addBar === 0) {
             jQuery('head').append('<style type="text/css">' +

diff --git a/firefox/missinge/data/common/zindexFix.js b/firefox/missinge/data/common/zindexFix.js
@@ -40,9 +40,9 @@ jQuery('#posts li.post embed').each(function() {
 jQuery('#posts li.post div.video + input:hidden').each(function() {
    zindexFixFutureEmbed(this);
 });
-jQuery(document).bind('MissingEajax', function(e) {
-   var type = e.originalEvent.data.match(/^[^:]*/)[0];
-   var list = e.originalEvent.data.match(/(post_[0-9]+)/g);
+document.addEventListener('MissingEajax', function(e) {
+   var type = e.data.match(/^[^:]*/)[0];
+   var list = e.data.match(/(post_[0-9]+)/g);
    if (type === 'notes') { return; }
    jQuery.each(list, function(i,val) {
       jQuery('#'+val).find('embed').each(function() {
@@ -52,5 +52,5 @@ jQuery(document).bind('MissingEajax', function(e) {
          zindexFixFutureEmbed(this);
       });
    });
-});
+}, false);
 
diff --git a/firefox/missinge/data/dashboardFixes/dashboardFixes.js b/firefox/missinge/data/dashboardFixes/dashboardFixes.js
@@ -26,6 +26,7 @@ function addPostLinks() {
    var plwrap = '<li class="short_new_post post new_post" id="new_post"></li>';
    var pltxt = '<div class="short_post_labels">';
    var lang = jQuery('html').attr('lang');
+   if (!lang) { lang = 'en'; }
    for (i in locale[lang]["postTypeNames"]) {
       pltxt += '<div class="short_label">' +
                '<a href="/new/' + i + '" class="new_post_label">' +
@@ -51,6 +52,7 @@ function doReplies(item) {
       return;
    }
    var lang = jQuery('html').attr('lang');
+   if (!lang) { lang = 'en'; }
    var id = node.attr('id').match(/[0-9]*$/)[0];
    var notes = jQuery('#show_notes_link_' + id);
    if (notes.length === 0) {
@@ -82,6 +84,7 @@ function doIcons(item) {
    }
 
    var lang = jQuery('html').attr('lang');
+   if (!lang) { lang = 'en'; }
    jQuery(item).find('div.post_controls')
       .addClass('MissingE_post_control_group');
    jQuery(item).find('div.post_controls a').each(function() {
@@ -247,10 +250,13 @@ self.on('message', function(message) {
        message.component !== "dashboardFixes") {
       return false;
    }
+   jQuery(document).bind('MissingEajax', function(e) {
+      console.log('MissingEajax');
+   });
    var extensionURL = message.extensionURL;
-   $(document).bind('MissingEajax', function(e) {
-      var type = e.originalEvent.data.match(/^[^:]*/)[0];
-      var list = e.originalEvent.data.match(/(post_[0-9]+)/g);
+   document.addEventListener('MissingEajax', function(e) {
+      var type = e.data.match(/^[^:]*/)[0];
+      var list = e.data.match(/(post_[0-9]+)/g);
       if (type === 'notes') { return; }
       jQuery.each(list, function (i,val) {
          var node = jQuery('#'+val);
@@ -261,7 +267,7 @@ self.on('message', function(message) {
             }
          }
       });
-   });
+   }, false);
 
 /*
    jQuery('a.like_button').live('click', function(e) {
@@ -313,14 +319,14 @@ self.on('message', function(message) {
    }
    if (message.expandAll === 1) {
       jQuery('#posts .post').each(function(){ addExpandAllHandler(this); });
-      jQuery(document).bind('MissingEajax', function(e) {
-         var type = e.originalEvent.data.match(/^[^:]*/)[0];
-         var list = e.originalEvent.data.match(/(post_[0-9]+)/g);
+      document.addEventListener('MissingEajax', function(e) {
+         var type = e.data.match(/^[^:]*/)[0];
+         var list = e.data.match(/(post_[0-9]+)/g);
          if (type === 'notes') { return; }
          jQuery.each(list, function(i,val) {
             addExpandAllHandler(jQuery('#'+val).get(0));
          });
-      });
+      }, false);
    }
    if (message.widescreen === 1 &&
        !(/http:\/\/www\.tumblr\.com\/tumblelog\/[^\/]*\/settings/
@@ -338,9 +344,9 @@ self.on('message', function(message) {
       jQuery('#content').css('padding-right', (w+20) + 'px');
       jQuery('#left_column').css('min-height',
                                  jQuery('#right_column').height() + 'px');
-      jQuery(document).bind('MissingEajax', function(e) {
-         var type = e.originalEvent.data.match(/^[^:]*/)[0];
-         var list = e.originalEvent.data.match(/(post_[0-9]+)/g);
+      document.addEventListener('MissingEajax', function(e) {
+         var type = e.data.match(/^[^:]*/)[0];
+         var list = e.data.match(/(post_[0-9]+)/g);
          /*
          if (jQuery(e.target).closest('#right_column').length > 0) {
             jQuery('#left_column').css('min-height',
@@ -353,7 +359,7 @@ self.on('message', function(message) {
             realignReplyNipple(jQuery(this).find('div.nipple'));
             });
          });
-      });
+      }, false);
    }
    if (message.postLinks === 1 &&
        /http:\/\/www\.tumblr\.com\/dashboard\//.test(location.href) &&
@@ -409,14 +415,14 @@ self.on('message', function(message) {
       '});' +
       '</script>');
 
-      $(document).bind('MissingEajax', function(e) {
-         var type = e.originalEvent.data.match(/^[^:]*/)[0];
-         var list = e.originalEvent.data.match(/(post_[0-9]+)/g);
+      document.addEventListener('MissingEajax', function(e) {
+         var type = e.data.match(/^[^:]*/)[0];
+         var list = e.data.match(/(post_[0-9]+)/g);
          if (type === 'notes') { return; }
          jQuery.each(list, function (i, val) {
             doReplies(jQuery('#'+val).get(0));
          });
-      });
+      }, false);
       jQuery('#posts li.post').each(function() {
          doReplies(this);
       });
@@ -441,14 +447,14 @@ self.on('message', function(message) {
                                                   'function(e) {' +
                           'update_publish_on_times();' +
                        '}, false);</script>');
-      jQuery(document).bind('MissingEajax', function(e) {
-         var type = e.originalEvent.data.match(/^[^:]*/)[0];
-         var list = e.originalEvent.data.match(/(post_[0-9]+)/g);
+      document.addEventListener('MissingEajax', function(e) {
+         var type = e.data.match(/^[^:]*/)[0];
+         var list = e.data.match(/(post_[0-9]+)/g);
          if (type === 'notes') { return; }
          jQuery.each(list, function(i,val) {
             addQueueArrows(jQuery('#'+val).get(0));
          });
-      });
+      }, false);
       jQuery('#posts li.queued').each(function() {
          addQueueArrows(this);
       });
@@ -457,14 +463,14 @@ self.on('message', function(message) {
    if (message.replaceIcons === 1 &&
        document.body.id !== "tinymce" &&
        document.body.id !== "dashboard_edit_post") {
-      jQuery(document).bind('MissingEajax', function(e) {
-         var type = e.originalEvent.data.match(/^[^:]*/)[0];
-         var list = e.originalEvent.data.match(/(post_[0-9]+)/g);
+      document.addEventListener('MissingEajax', function(e) {
+         var type = e.data.match(/^[^:]*/)[0];
+         var list = e.data.match(/(post_[0-9]+)/g);
          if (type === 'notes') { return; }
          jQuery.each(list, function (i,val) {
             doIcons(jQuery('#'+val).get(0));
          });
-      });
+      }, false);
 
       jQuery("#posts li.post").each(function(i) {
          if (this.id === "new_post") { return true; }

diff --git a/firefox/missinge/data/followChecker/followChecker.js b/firefox/missinge/data/followChecker/followChecker.js
@@ -254,7 +254,7 @@ function doFWGet(followers, followees, show, extensionURL, retries, acct) {
          error: function(xhr, textStatus) {
             this.tryCount++;
             if (!failed && this.tryCount <= this.retryLimit &&
-                $('#facebox').css('display') === 'block') {
+                jQuery('#facebox').css('display') === 'block') {
                jQuery.ajax(this);
                return;
             }
@@ -278,7 +278,7 @@ function doFWGet(followers, followees, show, extensionURL, retries, acct) {
             if (!(/id="dashboard_followers"/.test(data))) {
                this.tryCount++;
                if (!failed && this.tryCount <= this.retryLimit &&
-                   $('#facebox').css('display') === 'block') {
+                   jQuery('#facebox').css('display') === 'block') {
                   jQuery.ajax(this);
                   return;
                }
@@ -318,7 +318,7 @@ function doFWGet(followers, followees, show, extensionURL, retries, acct) {
          error: function(xhr, textStatus) {
             this.tryCount++;
             if (!failed && this.tryCount <= this.retryLimit &&
-                $('#facebox').css('display') === 'block') {
+                jQuery('#facebox').css('display') === 'block') {
                jQuery.ajax(this);
                return;
             }
@@ -342,7 +342,7 @@ function doFWGet(followers, followees, show, extensionURL, retries, acct) {
             if (!(/id="dashboard_following"/.test(data))) {
                this.tryCount++;
                if (!failed && this.tryCount <= this.retryLimit &&
-                   $('#facebox').css('display') === 'block') {
+                   jQuery('#facebox').css('display') === 'block') {
                   jQuery.ajax(this);
                   return;
                }
@@ -376,7 +376,7 @@ function doFWGet(followers, followees, show, extensionURL, retries, acct) {
 
 function followChecker_newTab() {
    if (!formKey) {
-      formKey = $('#form_key').val();
+      formKey = jQuery('#form_key').val();
    }
    if (formKey && (followyou.length > 0 || youfollow.length > 0)) {
       self.postMessage({greeting:"followChecker",
@@ -439,7 +439,7 @@ function tfc_init(extensionURL, retries) {
          error: function(xhr, textStatus) {
             this.tryCount++;
             if (this.tryCount <= this.retryLimit) {
-               $.ajax(this);
+               jQuery.ajax(this);
                return;
             }
             else {
@@ -463,7 +463,7 @@ function tfc_init(extensionURL, retries) {
                      .test(data))) {
                this.tryCount++;
                if (this.tryCount <= this.retryLimit) {
-                  $.ajax(this);
+                  jQuery.ajax(this);
                   return;
                }
                else {