Changeset 37123 for platform/tdiary

Timestamp:

03/30/10 14:34:32 (3 years ago)

Author:

sho

Message:

moved style to core/theme/base.css.

Location:

platform/tdiary/plugin

Files:

• nicovideo.rb (modified) (3 diffs)
• profile.rb (modified) (1 diff)

platform/tdiary/plugin/nicovideo.rb

@@ -24 +24 @@
 require 'timeout'
 require 'rexml/document'
+
+def nicovideo_player_js
+        <<-HTML
+        <script type="text/javascript"><!--
+        function nicovideoPlayer( video_id ) {
+                document.getElementById( "thumbnail-" + video_id ).style.display = "none";
+                document.getElementById( "player-" + video_id ).style.display = "inline";
+                return false;
+        }
+        function nicovideoThumbnail( video_id ) {
+                document.getElementById( "thumbnail-" + video_id ).style.display = "inline";
+                document.getElementById( "player-" + video_id ).style.display = "none";
+                return false;
+        }
+        //--></script>
+        HTML
+end
+
+add_header_proc do
+        nicovideo_player_js
+end
 
 def nicovideo_call_api( video_id )
@@ -64 +85 @@
 end
 
-def nicovideo( video_id, label = nil, link = nil )
-        begin
-                @conf.to_native( nicovideo_inline( nicovideo_call_api( video_id ).elements, label, link ), 'UTF-8' )
-        rescue ::Errno::ENOENT
-                "<strong>Sorry, #{video_id} was deleted.</strong>"
-        rescue Timeout::Error, OpenURI::HTTPError, SecurityError
-                nicovideo_iframe( video_id )
-        end
-end
-
 def nicovideo_player( video_id, size = [544,384] )
         if feed? or @conf.mobile_agent? or @conf.iphone? then
@@ -85 +96 @@
         end
 end
+
+def nicovideo( video_id, label = nil, link = 'INLINE_PLAYER' )
+        begin
+                r = ''
+                r << %Q|<div id="thumbnail-#{video_id}">|
+                thumb = @conf.to_native( nicovideo_inline( nicovideo_call_api( video_id ).elements, label, link ), 'UTF-8' )
+                thumb.gsub!( /"INLINE_PLAYER"/, %Q|"#" onclick="return nicovideoPlayer( '#{video_id}' );"| )
+                r << thumb
+                r << '</div>'
+                if feed? or @conf.mobile_agent? then
+                        r.gsub!( /<a .*?>/, '' )
+                        r.gsub!( /<\/a>/, '' )
+                else
+                        r << %Q|<div id="player-#{video_id}" style="display:none;background-color:#000;margin-left:2em;">|
+                        r << %Q|<a name="player-#{video_id}">|
+                        r << nicovideo_player( video_id, [544,384] )
+                        r << %Q|</a>|
+                        r << %Q|<div class="nicovideo-player-close"><a href="#" onclick="return nicovideoThumbnail( '#{video_id}' )">Close Player</a></div>|
+                        r << %Q|</div>|
+                end
+                r
+        rescue ::Errno::ENOENT
+                "<strong>Sorry, #{video_id} was deleted.</strong>"
+        rescue Timeout::Error, OpenURI::HTTPError, SecurityError
+                nicovideo_iframe( video_id )
+        end
+end
+
+#def nicovideo( video_id, label = nil, link = nil )
+#       begin
+#               @conf.to_native( nicovideo_inline( nicovideo_call_api( video_id ).elements, label, link ), 'UTF-8' )
+#       rescue ::Errno::ENOENT
+#               "<strong>Sorry, #{video_id} was deleted.</strong>"
+#       rescue Timeout::Error, OpenURI::HTTPError, SecurityError
+#               nicovideo_iframe( video_id )
+#       end
+#end
+

platform/tdiary/plugin/profile.rb

@@ -171 +171 @@
 
 PROFILE_VERSION = '20090909'
-add_header_proc do
-  html = <<-EOS
-  <style type="text/css">
-    div.profile {
-      margin: 1em;
-      text-align: center;
-      border: solid 1px #999;
-    }
-    div.profile img {
-      border: none;
-    }
-    div.profile span {
-      font-size: 0.9em;
-      display: block;
-    }
-  </style>
-  EOS
-end
 
 def profile(id, service = :twitter, options = {})