Changeset 1500

Timestamp:

12/15/10 04:19:32 (2 years ago)

Author:

jeroen

Message:

added default dates and inlined the images

Location:

plugins/livestream/js

Files:

• jwplayer.livestream.js (modified) (6 diffs)
• test/index.html (modified) (2 diffs)

plugins/livestream/js/jwplayer.livestream.js

@@ -32 +32 @@
                 /** Constructor stuff. **/
                 jwplayer.utils.extend(_options, options);
-                _setDates();
-                _setElements();
+                _setDates(start,end);
+                _setElements(container);
                 if(_currentDate < _startDate) {
                         _countDown();
@@ -63 +63 @@
                         jwplayer.utils.css(_overlay,{display:'none'});
                         var agent = navigator.userAgent.toLowerCase();
-                        if(agent.match(/i(hone|ad)/i) !== null && _options.manifest) {
+                        if(agent.match(/ip(hone|ad)/i) !== null && _options.manifest) {
                                 _options.provider = undefined;
                                 _options.streamer = undefined;
                                 _options.file = _options.manifest;
-                        }
-                        _options.image = undefined;
+                        } else { 
+                                _options.image = undefined;
+                        }
                         jwplayer(_options.id).setup(_options);
                         jwplayer(_options.id).onError(_reConnect);
@@ -110 +111 @@
 
                 /** Set the dates for the first time. **/
-                function _setDates() {
+                function _setDates(start,end) {
                         _currentDate = new Date().getTime()/1000;
-                        _startDate = new Date(start).getTime()/1000;
-                        _endDate = new Date(end).getTime()/1000;
+                        if(start) {
+                                _startDate = new Date(start).getTime()/1000;
+                        } else { 
+                                _startDate = 0;
+                        }
+                        if(end) { 
+                                _endDate = new Date(end).getTime()/1000;
+                        } else { 
+                                _endDate = new Date().getTime()/1000 + 24 * 3600;
+                        }
                 };
 
 
                 /** Inject and style all elements for the overlay. **/
-                function _setElements() {
+                function _setElements(container) {
                         _container = document.getElementById(container);
                         jwplayer.utils.css(_container,{
@@ -140 +149 @@
                                 height: 140,
                                 width: _options.width,
-                                backgroundImage:'url(../assets/back.png)'
+                                backgroundImage:'url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADtJREFUeNrszgENACAMwLCBf0+3ho2TtAp6qmmx23KCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgr8GnwADAMqOAQ8BbF7NAAAAAElFTkSuQmCC)'
                         });
                         _image = document.createElement("div");
                         _overlay.appendChild(_image);
                         jwplayer.utils.css(_image,{
-                                backgroundImage: 'url(../assets/timer.png)',
+                                backgroundImage: 'url(data:image/png;base64,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%3D%3D)',
                                 backgroundRepeat: 'no-repeat',
                                 backgroundPosition: 'right center',
@@ -160 +169 @@
                                 lineHeight: 24,
                                 fontWeight: 'bold',
-                                fontFace: 'Arial',
+                                fontFamily: 'Arial',
                                 cssFloat: 'left',
                                 width: '55%',
@@ -174 +183 @@
                                 color:'#FFF',
                                 fontSize: 14,
-                                fontFace: 'Arial',
+                                fontFamily: 'Arial',
                                 cssFloat: 'left',
                                 width: '55%',

plugins/livestream/js/test/index.html

@@ -6 +6 @@
 
         <style type="text/css">
-                body { background-color: #fff; padding: 20px; color:#000; font: 13px/18px Arial, sans-serif; }
-                a,h1 { color: #B00; }
-                h1,h3 { padding-top: 20px; }
-                ul { margin:15px 0 15px 16px; padding:0; list-style-type:square; }
-                pre { font-family: monospace; color: #B00; }
+                body { background-color: #eee; padding: 40px; }
         </style>
     <script type="text/javascript" src="jwplayer.js"></script>
@@ -25 +21 @@
             flashplayer: "jwplayer.swf",
             height: 406,
-            image:'http://content.bitsontherun.com/thumbs/nPripu9l-720.jpg',
-            manifest:'http://ec2-79-125-92-61.eu-west-1.compute.amazonaws.com/live/tester.mp4/manifest.m3u8',
-            streamer:'rtmp://ec2-79-125-92-61.eu-west-1.compute.amazonaws.com/live',
+            image:'thumb.png',
+            streamer:'rtmp://ec2-79-125-37-3.eu-west-1.compute.amazonaws.com/live',
             title:'Live testing session of the JW Player LiveStream plugin',
             width: 720
         },
-        '12/15/2010 00:00:00',
-        '12/15/2010 00:30:00'
+        '12/25/2010 10:00:00',
+        '12/25/2010 11:30:00'
     );
 </script>