fix reply replies for photo replies

- strip safedash divs - correctly strip all safedash classes
jcutler · Apr 20, 2011 · 1d6a602 · 1d6a602
1 parent 74556d1
commit 1d6a602
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/chrome/manifest.json b/chrome/manifest.json
@@ -1,6 +1,6 @@
 {
    "name":        "Missing e",
-   "version":     "1.0.73",
+   "version":     "1.0.74",
    "description": "Useful features and customizations for Tumblr.",
    "icons":       { "16": "missinge16.png",
                     "48": "missinge48.png",

diff --git a/chrome/replyReplies/replyReplies.js b/chrome/replyReplies/replyReplies.js
@@ -447,9 +447,12 @@ $('div.notification_type_icon').live('mousedown', function(e) {
 
       var code = thecode.join("") + "\n<p><br /></p>";
       if (/nsfwdone/.test(code) || /nsfwed/.test(code)) {
-         code = code.replace(/opacity:\s*[01]\s*;/,'')
-                     .replace(/class="nsfwdone"/,'')
-                     .replace(/class="nsfwed"/,'');
+         code = code.replace(/opacity:\s*[01]\s*;/g,'')
+                     .replace(/class="nsfwdone"/g,'')
+                     .replace(/class="nsfwed"/g,'')
+                     .replace(/class="nsfwed nsfwdone"/g,'')
+                     .replace(/class="nsfwdone nsfwed"/g,'')
+                     .replace(/<\/?div[^>]*>/g,'');
       }
 
       reply_setValue(code);

diff --git a/firefox/missinge/data/replyReplies/replyReplies.js b/firefox/missinge/data/replyReplies/replyReplies.js
@@ -397,8 +397,12 @@ function replyRepliesSettings(message) {
 
    var code = thecode.join("") + "\n<p><br /></p>";
    if (/nsfwdone/.test(code) || /nsfwed/.test(code)) {
-      code = code.replace(/opacity:\s*[01]\s*;/,'')
-                  .replace(/class="nsfwdone"/,'').replace(/class="nsfwed"/,'');
+      code = code.replace(/opacity:\s*[01]\s*;/g,'')
+                  .replace(/class="nsfwdone"/g,'')
+                  .replace(/class="nsfwed"/g,'')
+                  .replace(/class="nsfwed nsfwdone"/g,'')
+                  .replace(/class="nsfwdone nsfwed"/g,'')
+                  .replace(/<\/?div[^>]*>/g,'');
    }
    reply_setValue(code);
    tags_setValue(tags);

diff --git a/firefox/missinge/package.json b/firefox/missinge/package.json
@@ -3,7 +3,7 @@
     "license": "GPL 3.0", 
     "author": "Jeremy Cutler",
     "url": "http://missinge.infraware.ca", 
-    "version": "1.0.73",
+    "version": "1.0.74",
     "fullName": "Missing e", 
     "id": "jid0-0PGffAcVvhUBieFYkRVVc5w6lIU", 
     "description": "Useful features and customizations for Tumblr."

diff --git a/missinge.safariextension/Info.plist b/missinge.safariextension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.73</string>
+	<string>1.0.74</string>
 	<key>CFBundleVersion</key>
-	<string>73</string>
+	<string>74</string>
 	<key>Chrome</key>
 	<dict>
 		<key>Database Quota</key>

diff --git a/missinge.safariextension/replyReplies/replyReplies.js b/missinge.safariextension/replyReplies/replyReplies.js
@@ -397,8 +397,12 @@ function replyRepliesSettings(response) {
 
    var code = thecode.join("") + "\n<p><br /></p>";
    if (/nsfwdone/.test(code) || /nsfwed/.test(code)) {
-      code = code.replace(/opacity:\s*[01]\s*;/,'')
-                  .replace(/class="nsfwdone"/,'').replace(/class="nsfwed"/,'');
+      code = code.replace(/opacity:\s*[01]\s*;/g,'')
+                  .replace(/class="nsfwdone"/g,'')
+                  .replace(/class="nsfwed"/g,'')
+                  .replace(/class="nsfwed nsfwdone"/g,'')
+                  .replace(/class="nsfwdone nsfwed"/g,'')
+                  .replace(/<\/?div[^>]*>/g,'');
    }
 
    reply_setValue(code);