Fixed event misfiring

mpyw · mpyw · commit d42c039d70d8 · 2015-04-15T10:48:20.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.DS_store
diff --git a/contents/content.js b/contents/content.js
@@ -21,8 +21,6 @@
                             return resolve(element);
                         });
                     }, delay);
-                } else {
-                    alert('twitter-cutomized-muting extension error: Failed to select element: ' + id);
                 }
             });
         };
@@ -133,12 +131,12 @@
         RetryableGetElementById('stream-items-id', 5, 500).then(function (streamItems) {
             PreObserver.observe(streamItems);
             MuteObserver.observe(streamItems);
-            RefreshObserver.observe(document);
         });
+        RefreshObserver.observe(document);
 
         /* Insert mute button */
         document.styleSheets[0].insertRule('.Icon--volume-off:before { content: "\\f056"}', 0);
-        (function (topbar) {
+        RetryableGetElementById('global-actions', 0, 0).then(function (topbar) {
             var icon = document.createElement('span');
                 icon.className = 'Icon Icon--volume-off Icon--large';
             var text = document.createElement('span');
@@ -177,7 +175,7 @@
                 li.id = 'mute-nav-id';
                 li.appendChild(a);
             topbar.appendChild(li);
-        })(document.getElementById('global-actions'));
+        });
 
     };
     iframe.setAttribute('src', chrome.extension.getURL('sandbox.html'));
diff --git a/icons/icon128.png b/icons/icon128.png
diff --git a/manifest.json b/manifest.json
@@ -1,15 +1,18 @@
 {
-    "name": "twitter-customized-muting",
-    "version": "0.3.0",
+    "name": "Twitter Customized Muting",
+    "version": "1.0.0",
     "manifest_version": 2,
     "description": "カスタマイズ可能なミュート機能をTwitter公式Web版に提供",
     "content_scripts": [{
-        "js": ["content.js"],
+        "js": ["contents/content.js"],
         "matches": ["https://twitter.com/*"],
         "run_at": "document_end"
     }],
     "sandbox": {
-        "pages": ["sandbox.html"]
+        "pages": ["sandboxes/sandbox.html"]
     },
-    "web_accessible_resources": ["sandbox.html"]
+    "icons": {
+        "128": "icons/icon128.png"
+    },
+    "web_accessible_resources": ["sandboxes/sandbox.html"]
 }
diff --git a/sandboxes/sandbox.html b/sandboxes/sandbox.html
@@ -1,8 +1,8 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <script src="sandbox.js"></script>
-    </head>
-    <body>
-    </body>
+<!DOCTYPE html>
+<html>
+    <head>
+        <script src="sandbox.js"></script>
+    </head>
+    <body>
+    </body>
 </html>
diff --git a/sandboxes/sandbox.js b/sandboxes/sandbox.js
@@ -1,33 +1,33 @@
-(function () {
-    
-    var callback = function () { return false; };
-    
-    window.addEventListener('message', function (e) {
-        switch (e.data.actionType) {
-            case 'set-callback':
-                callback = new Function(
-                    'user_id_str',
-                    'screen_name',
-                    'name',
-                    'text',
-                    'is_in_notification_area',
-                    'is_promotion',
-                    'is_retweet',
-                    'retweeter_user_id_str',
-                    'retweeter_screen_name',
-                    'retweeter_name',
-                    e.data.code
-                );
-                break;
-            case 'go-callback':
-                if (callback.apply({}, e.data.params)) {
-                    e.source.postMessage({
-                        actionType: 'tcm-remove-tweet',
-                        itemId: e.data.itemId,
-                    }, e.origin);
-                }
-                break;
-        }
-    });
-    
+(function () {
+    
+    var callback = function () { return false; };
+    
+    window.addEventListener('message', function (e) {
+        switch (e.data.actionType) {
+            case 'set-callback':
+                callback = new Function(
+                    'user_id_str',
+                    'screen_name',
+                    'name',
+                    'text',
+                    'is_in_notification_area',
+                    'is_promotion',
+                    'is_retweet',
+                    'retweeter_user_id_str',
+                    'retweeter_screen_name',
+                    'retweeter_name',
+                    e.data.code
+                );
+                break;
+            case 'go-callback':
+                if (callback.apply({}, e.data.params)) {
+                    e.source.postMessage({
+                        actionType: 'tcm-remove-tweet',
+                        itemId: e.data.itemId,
+                    }, e.origin);
+                }
+                break;
+        }
+    });
+    
 })();
