Changeset 5323 for lang/javascript

Timestamp:

01/23/08 03:27:08 (5 years ago)

Author:

noriaki

Message:

lang/javascript/userscripts/niconicodougaanalytics.user.js: fiexed compatibility for the GreaseMonkey?-0.7.20080121.0. supported the flvplayer_wrapper.

Files:

• lang/javascript/userscripts/niconicodougaanalytics.user.js (modified) (12 diffs)

lang/javascript/userscripts/niconicodougaanalytics.user.js

@@ -5 +5 @@
 // @description    Analyzes comments for movie in NicoNicoDouga
 // @license        The MIT License
-// @version        0.1.2
+// @version        0.1.3
 // @released       2008-01-19 14:00:00
-// @updated        2008-01-21 22:00:00
+// @updated        2008-01-23 03:00:00
 // @compatible     Greasemonkey
 // @include        http://www.nicovideo.jp/watch/*
@@ -22 +22 @@
         var waiting = new PE(function() {
                 var flvplayer = unsafeWindow.document.getElementById('flvplayer');
-                var nico = flvplayer.GetVariable('o') || flvplayer.GetVariable('nico.o');
+                var nico = flvplayer.GetVariable('o');
+        if(nico == 'base') nico = flvplayer.GetVariable('nico.o');
                 if(nico && ready.test(nico)) {
                         var memo = nico.split('&');
@@ -77 +78 @@
                 this.comments = new Array();
                 this.__jQuery = unsafeWindow.jQuery;
-                this.max = parseInt(size, 10);
+                //this.max = parseInt(size, 10);
         },
         size: function() { return this.comments.length; },
@@ -133 +134 @@
         get_waybackkey: function() {
                 var self = this;
-                GM_xmlhttpRequest({
+        var endpoint = unsafeWindow.document.getElementById('flvplayer').GetVariable('B') ||
+            unsafeWindow.document.getElementById('flvplayer').GetVariable('nico.B');
+                GM_wrap(GM_xmlhttpRequest)({
                         method: 'GET',
                         headers: {
                                 'User-Agent': 'Mozilla/4.0 (compatible) Greasemonkey (NicoNicoDouga - Analytics)'
                         },
-                        url: unsafeWindow.document.getElementById('flvplayer').GetVariable('B')
-                                + 'getwaybackkey?thread=' + this.thread_id,
+                        url: endpoint + 'getwaybackkey?thread=' + this.thread_id,
                         onload: function(res) {
                                 self.waybackkey = res.responseText.split('=')[1];
@@ -157 +159 @@
                 post_data += '/>';
                 var self = this;
-                GM_xmlhttpRequest({
+                GM_wrap(GM_xmlhttpRequest)({
                         method: 'POST',
                         headers: {
@@ -177 +179 @@
                                 }
                                 comments.video_length = self.video_length;
+                if(!last) comments.max = thread.getAttribute('last_res');
                                 callback(comments, responseXML);
                         },
@@ -190 +193 @@
         var thread_url = video_info.ms;
         var retriever = new Retriever(video_info);
-        var comments = new CommentSet($j('#flvplayer')[0].GetVariable('last_resno'));
+        var comments = new CommentSet(/*$j('#flvplayer')[0].GetVariable('last_resno')*/);
 
         retriever.next(comments, plot);
@@ -530 +533 @@
         }
         #niconicodouga_analytics .gridLabel { font-size: 80%; }
-        .userscript_credit {
+        #niconicodouga_analytics p.userscript_credit {
         background-color: #333;
                 border-top: 2px dotted #ccc;
@@ -537 +540 @@
                 color: #ccc;
                 text-align: center;
-        }
-        .userscript_credit a {
+        margin: 0;
+        }
+        #niconicodouga_analytics p.userscript_credit a {
                 color: #fcc;
         }
@@ -717 +721 @@
 ]]></>);
 
+// Greasemonkey 0.7.20080121.0 compatibility
+//   http://wiki.greasespot.net/0.7.20080121.0_compatibility
+function GM_wrap(f) {
+    return function() {
+        setTimeout.apply(window, [f, 0].concat([].slice.call(arguments)));
+    };
+}
+
 // Auto UserScript Updater
 function UpdateChecker() {};
@@ -722 +734 @@
     script_name: 'NicoNicoDouga Analytics',
     script_url: 'http://blog.fulltext-search.biz/files/niconicodougaanalytics.user.js',
-    current_version: '0.1.2',
+    current_version: '0.1.3',
     more_info_url: 'http://blog.fulltext-search.biz/pages/niconicodouga-analytics',
 
@@ -762 +774 @@
         close_link.setAttribute('href', 'javascript:void(0);');
         close_link.addEventListener('click', function() {
-            GM_setValue('last_check_day', self.beginning_of_day().toString());
+            GM_wrap(GM_setValue)('last_check_day', self.beginning_of_day().toString());
             var update_alert = document.getElementById('gm_update_alert');
             update_alert.parentNode.removeChild(update_alert);