Changeset 29531

Timestamp:

02/04/09 20:49:59 (4 years ago)

Author:

anekos

Message:

自動フルスクリーン

Files:

• lang/javascript/vimperator-plugins/trunk/stella.js (modified) (17 diffs)

lang/javascript/vimperator-plugins/trunk/stella.js

@@ -114 +114 @@
 TODO
    ・Icons
-   ・Other video hosting websites
    ・auto fullscreen
    ・動的な command の追加削除 (nice rabbit!)
@@ -121 +120 @@
    ・argCount の指定が適当なのを修正 (動的な userCommand と平行でうまくできそう？)
    ・実際のプレイヤーが表示されるまで待機できようにしたい(未表示に時にフルスクリーン化すると…)
-   ・コメント欄でリンクされている動画も関連動画として扱いたい
-      -> "その３=>sm666" みたいなやつ
-      -> リンクはともかくタイトルの取得がムツカシー
    ・isValid とは別にプレイヤーの準備が出来ているか？などをチェックできる関数があるほうがいいかも
       -> isValid ってなまえはどうなの？
       -> isReady とか
    ・パネルなどの要素にクラス名をつける
+
+FIXME
+    ・this.last.fullscreen = value;
 
 MEMO
@@ -352 +351 @@
 
     this.initialize.apply(this, arguments);
+
+    this.last = {
+      fullscreen: false
+    };
 
     function setf (name, value)
@@ -443 +446 @@
     get fileURL () undefined,
 
+    get large () this.fullscreen,
+    set large (value) (this.fullscreen = value),
+
     get maxVolume () 100,
 
     get muted () undefined,
     set muted (value) value,
+
+    get ready () undefined,
 
     get relatedIDs () undefined,
@@ -463 +471 @@
     get repeating () undefined,
     set repeating (value) value,
-
-    get large () this.fullscreen,
-    set large (value) (this.fullscreen = value),
 
     get state () undefined,
@@ -656 +661 @@
           function (id) {
             let (node = U.getElementById(id)) {
-              liberator.log(node)
               node && f(node);
             }
@@ -663 +667 @@
       }
 
+      this.last.fullscreen = value;
       this.storage.fullscreen = value;
 
@@ -690 +695 @@
     get player ()
       U.getElementByIdEx('movie_player'),
+
+    get ready () !!this.player,
 
     get relatedIDs () {
@@ -821 +828 @@
     set comment (value) (this.player.ext_setCommentVisible(value), value),
 
-    get currentTime () parseInt(this.player.ext_getPlayheadTime()),
+    get currentTime () {
+      try {
+      return parseInt(this.player.ext_getPlayheadTime())
+      } catch (e) {
+        liberator.log(e)
+        liberator.log(e.stack)
+      }
+    },
     set currentTime (value) (this.player.ext_setPlayheadTime(U.fromTimeCode(value)), this.currentTime),
 
@@ -896 +910 @@
         ((InVimperator && liberator.mode === modes.COMMAND_LINE) || setTimeout(turnOnMain, 500));
 
+      this.last.fullscreen = value;
+
       // メイン
       value = !!value;
@@ -923 +939 @@
 
     get playerContainer () U.getElementByIdEx('flvplayer_container'),
+
+    get ready () !!(this.player && this.player.ext_getVideoSize),
 
     get relatedIDs () {
@@ -957 +975 @@
                      .filter(function (it) /watch\//.test(it.href))
                      .map(function(v) v.textContent);
-        liberator.log(comment)
         links.forEach(function (link) {
           let r = RegExp('(?:^|[\u3000\\s\\>])([^\u3000\\s\\>]+)\\s*<a href="http:\\/\\/www\\.nicovideo\\.\\w+\\/watch\\/' + link + '" class="video">').exec(comment);
@@ -1424 +1441 @@
     disable: function () {
       this.hidden = true;
-      if (this.timerHandle) {
-        clearInterval(this.timerHandle);
-        this.timerHandle = null;
+      if (this.__updateTimer) {
+        clearInterval(this.__updateTimer);
+        delete this.__updateTimer;
+      }
+      if (this.__autoFullscreenTimer) {
+        clearInterval(this.__autoFullscreenTimer);
       }
     },
@@ -1436 +1456 @@
         this.toggles[name].hidden = !this.player.has(name, 't');
       }
-      if (!this.timerHandle) {
-        this.timerHandle = setInterval(U.bindr(this, this.update), 500);
+      if (!this.__updateTimer) {
+        this.__updateTimer = setInterval(U.bindr(this, this.update), 500);
       }
     },
@@ -1448 +1468 @@
 
     update: function () {
+      if (!(this.isValid && this.player.ready))
+        return;
       this.labels.main.text = this.player.statusText;
       this.labels.volume.text = this.player.volume;
@@ -1480 +1502 @@
         (this.__valid = this.isValid) ? this.enable() : this.disable();
       }
+      if (this.isValid) {
+        clearInterval(this.__onReadyTimer);
+        this.__onReadyTimer = setInterval(
+          U.bindr(this, function () {
+            if (this.player && this.player.ready) {
+              clearInterval(this.__onReadyTimer);
+              delete this.__onReadyTimer;
+              this.onReady();
+            }
+          }),
+          200
+        );
+      }
     },
 
@@ -1499 +1534 @@
 
     onPlayClick: function () this.player.play(),
+
+    onReady: function () {
+      if (this.player.last.fullscreen && !this.__autoFullscreenTimer) {
+        this.__autoFullscreenTimer = setInterval(
+          U.bindr(this, function () {
+            if (!this.player.ready)
+              return;
+            clearInterval(this.__autoFullscreenTimer)
+            setTimeout(U.bindr(this, function () (this.player.fullscreen = true), 1000));
+            delete this.__autoFullscreenTimer;
+          }),
+          200
+        );
+      }
+    },
 
     onRepeatClick: function () this.player.toggle('repeating'),