Version 6.0.0-rc6

HitkoDev · Dec 20, 2016 · b1b38eb · b1b38eb
1 parent 17a73df
commit b1b38eb
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 32 deletions.
diff --git a/build/libraries/videobox/video-js/video.min.js b/build/libraries/videobox/video-js/video.min.js
diff --git a/build/libraries/videobox/videobox.xml b/build/libraries/videobox/videobox.xml
@@ -10,7 +10,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>6.0.0-rc5</version>
+    <version>6.0.0-rc6</version>
 
     <files>
         <filename>adapter.php</filename>

diff --git a/build/plugins/html5/html5.xml b/build/plugins/html5/html5.xml
@@ -9,7 +9,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>6.0.0-rc5</version>
+    <version>6.0.0-rc6</version>
 
     <files>
         <filename plugin="html5">html5.php</filename>
@@ -23,7 +23,7 @@
                     <option value="0">JOFF</option>
                 </field>
 
-                <field name="playerTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="Player template" description="Full HTML template for the player" default="&lt;!DOCTYPE html>&#10;&lt;html class=&quot;vb-html5-player&quot;>&#10;&lt;head>&#10;    &lt;meta charset=&quot;utf-8&quot; />&#10;    &lt;title>[[+title]]&lt;/title>&#10;    &lt;meta http-equiv=&quot;X-UA-Compatible&quot; content=&quot;IE=edge&quot;>&#10;    &lt;meta name=&quot;viewport&quot; content=&quot;width=device-width, initial-scale=1&quot;>&#10;    &lt;link href=&quot;[[+assets]]css/videobox.min.css&quot; rel=&quot;stylesheet&quot; type=&quot;text/css&quot;>&#10;    &lt;style>&#10;        [[+style_override]]&#10;    &lt;/style>&#10;&lt;/head>&#10;&lt;body class=&quot;vb-html5-player&quot;>&#10;    &lt;video id=&quot;vb-html5-video&quot; class=&quot;video-js [[+type]] vjs-default-skin&quot; controls=&quot;controls&quot; preload=&quot;auto&quot; poster=&quot;[[+poster]]&quot; data-setup=&quot;{}&quot;>&#10;        [[+sources]]&#10;        &lt;p class=&quot;vjs-no-js&quot;>To view this video please enable JavaScript, and consider upgrading to a web browser that &lt;a href=&quot;http://videojs.com/html5-video-support/&quot;&#10;                target=&quot;_blank&quot;>supports HTML5 video&lt;/a>&lt;/p>&#10;    &lt;/video>&#10;    &lt;script src=&quot;[[+assets]]video-js/video.min.js&quot;>&lt;/script>&#10;    &lt;script>&#10;        var vid = videojs(&quot;vb-html5-video&quot;);&#10;        var start = [&#10;            [+start]&#10;        ];&#10;        vid.on('loadedmetadata', function() {&#10;            if (start > 0) vid.currentTime(start);&#10;            var auto = [&#10;                [+auto]&#10;            ];&#10;            if (auto) vid.play();&#10;        });&#10;        var end = [&#10;            [+end]&#10;        ];&#10;        var onEnd = function() {&#10;            if (vid.currentTime() >= end) {&#10;                vid.pause();&#10;                vid.off('timeupdate', onEnd);&#10;            }&#10;        };&#10;        if (end > 0) vid.on('timeupdate', onEnd);&#10;    &lt;/script>&#10;&lt;/body>&#10;&lt;/html>"
+                <field name="playerTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="Player template" description="Full HTML template for the player" default="&lt;!DOCTYPE html>&#10;&lt;html class=&quot;vb-html5-player&quot;>&#10;&lt;head>&#10;    &lt;meta charset=&quot;utf-8&quot; />&#10;    &lt;title>[[+title]]&lt;/title>&#10;    &lt;meta http-equiv=&quot;X-UA-Compatible&quot; content=&quot;IE=edge&quot;>&#10;    &lt;meta name=&quot;viewport&quot; content=&quot;width=device-width, initial-scale=1&quot;>&#10;    &lt;link href=&quot;[[+assets]]css/videobox.min.css&quot; rel=&quot;stylesheet&quot; type=&quot;text/css&quot;>&#10;    &lt;style>&#10;        [[+style_override]]&#10;    &lt;/style>&#10;&lt;/head>&#10;&lt;body class=&quot;vb-html5-player&quot;>&#10;    &lt;video id=&quot;vb-html5-video&quot; class=&quot;video-js [[+type]] vjs-default-skin&quot; controls=&quot;controls&quot; preload=&quot;auto&quot; poster=&quot;[[+poster]]&quot;>&#10;        [[+sources]]&#10;        &lt;p class=&quot;vjs-no-js&quot;>To view this video please enable JavaScript, and consider upgrading to a web browser that&#10;            &lt;a href=&quot;http://videojs.com/html5-video-support/&quot; target=&quot;_blank&quot;>supports HTML5 video&lt;/a>&#10;        &lt;/p>&#10;    &lt;/video>&#10;    &lt;script src=&quot;[[+assets]]video-js/video.min.js&quot;>&lt;/script>&#10;    &lt;script>&#10;        var auto = !!([[+auto]]);&#10;        var vid = videojs(document.getElementById(&quot;vb-html5-video&quot;), {&#10;            autoplay: auto,&#10;            poster: &quot;[[+poster]]&quot;,&#10;            preload: &quot;auto&quot;,&#10;            controls: true&#10;        });&#10;        var start = [[+start]];&#10;        vid.on('loadedmetadata', function () {&#10;            if (start > 0) vid.currentTime(start);&#10;        });&#10;        var end = [[+end]];&#10;        var onEnd = function () {&#10;            if (vid.currentTime() >= end) {&#10;                vid.pause();&#10;                vid.off('timeupdate', onEnd);&#10;            }&#10;        };&#10;        if (end > 0) vid.on('timeupdate', onEnd);&#10;    &lt;/script>&#10;&lt;/body>&#10;&lt;/html>"
                 />
 
             </fieldset>

diff --git a/build/plugins/soundcloud/soundcloud.xml b/build/plugins/soundcloud/soundcloud.xml
@@ -9,7 +9,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>6.0.0-rc5</version>
+    <version>6.0.0-rc6</version>
 
     <files>
         <filename plugin="soundcloud">soundcloud.php</filename>

diff --git a/build/plugins/twitch/twitch.xml b/build/plugins/twitch/twitch.xml
@@ -9,7 +9,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>6.0.0-rc5</version>
+    <version>6.0.0-rc6</version>
 
     <files>
         <filename plugin="twitch">twitch.php</filename>

diff --git a/build/plugins/videobox/propset.xml b/build/plugins/videobox/propset.xml
@@ -37,7 +37,7 @@
 
     <fieldset name="vb_templates">
 
-        <field name="boxTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_BOX_TPL" description="PLG_SYSTEM_VIDEOBOX_BOX_TPL_DESC" default="&lt;a href=&quot;[[+link]]&quot; rel=&quot;[[+rel]]&quot; title=&quot;[[+title]]&quot; data-videobox=&quot;[[+vbOptions]]&quot; data-target=&quot;img&quot; class=&quot;vb_video_cont vb_box [[+class]]&quot; style=&quot;[[+style]] max-width: [[+tWidth]]px;&quot;>&#10;    &lt;span class=&quot;vb_thub_wrap&quot;>&lt;img src=&quot;[[++static_path]][[+thumb]]&quot; alt=&quot;[[+title]]&quot; width=&quot;[[+tWidth]]&quot; height=&quot;[[+tHeight]]&quot; />&lt;span class=&quot;vb-icon-play&quot;>&lt;/span>&lt;/span>&#10;    &lt;span class=&quot;vb_video_title&quot;>[[+title]]&lt;/span>&#10;&lt;/a>"
+        <field name="boxTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_BOX_TPL" description="PLG_SYSTEM_VIDEOBOX_BOX_TPL_DESC" default="&lt;a href=&quot;[[+link]]&quot; rel=&quot;[[+rel]]&quot; title=&quot;[[+title]]&quot; data-videobox=&quot;[[+vbOptions]]&quot; data-target=&quot;img&quot; class=&quot;vb_video_cont vb_box [[+class]]&quot; style=&quot;[[+style]] max-width: [[+tWidth]]px;&quot;>&#10;    &lt;span class=&quot;vb_thub_wrap&quot;>&#10;        &lt;img src=&quot;[[++static_path]][[+thumb]]&quot; alt=&quot;[[+title]]&quot; width=&quot;[[+tWidth]]&quot; height=&quot;[[+tHeight]]&quot; />&#10;        &lt;span class=&quot;vb-icon-play&quot;>&lt;/span>&#10;    &lt;/span>&#10;    &lt;span class=&quot;vb_video_title&quot;>[[+title]]&lt;/span>&#10;&lt;/a>"
         />
 
         <field name="galleryItemTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_GALLERY_ITEM_TPL" description="PLG_SYSTEM_VIDEOBOX_GALLERY_ITEM_TPL_DESC" default="&lt;li class=&quot;vb_video_cont vb_gal&quot; style=&quot;flex: [[+ratio]] [[+ratio]] [[+basis]]px&quot;>[[+content]]&lt;/li>"
@@ -49,7 +49,7 @@
         <field name="linkTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_LINK_TPL" description="PLG_SYSTEM_VIDEOBOX_LINK_TPL_DESC" default="&lt;a href=&quot;[[+link]]&quot; class=&quot;vb_link [[+class]]&quot; style=&quot;[[+style]]&quot; rel=&quot;[[+rel]]&quot; title=&quot;[[+title]]&quot; data-videobox=&quot;[[+vbOptions]]&quot;>[[+linkText]]&lt;/a>"
         />
 
-        <field name="playerTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_PLAYER_TPL" description="PLG_SYSTEM_VIDEOBOX_PLAYER_TPL_DESC" default="&lt;div class=&quot;vb_video_frame [[+class]]&quot; style=&quot;max-width: [[+pWidth]]px; [[+style]]&quot;>&#10;    &lt;div class=&quot;vb_video_sizer&quot; style=&quot;padding-bottom: [[+ratio]]%;&quot;>&lt;iframe src=&quot;[[+link]]&quot; frameborder=&quot;0&quot; allowfullscreen oallowfullscreen msallowfullscreen webkitallowfullscreen mozallowfullscreen>&lt;/iframe>&lt;/div>&lt;span class=&quot;vb_video_title&quot;>[[+title]]&lt;/span>&lt;/div>"
+        <field name="playerTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_PLAYER_TPL" description="PLG_SYSTEM_VIDEOBOX_PLAYER_TPL_DESC" default="&lt;div class=&quot;vb_video_frame [[+class]]&quot; style=&quot;max-width: [[+pWidth]]px; [[+style]]&quot;>&#10;    &lt;div class=&quot;vb_video_sizer&quot; style=&quot;padding-bottom: [[+ratio]]%;&quot;>&#10;        &lt;iframe src=&quot;[[+link]]&quot; frameborder=&quot;0&quot; allowfullscreen oallowfullscreen msallowfullscreen webkitallowfullscreen mozallowfullscreen>&lt;/iframe>&#10;    &lt;/div>&#10;    &lt;span class=&quot;vb_video_title&quot;>[[+title]]&lt;/span>&#10;&lt;/div>"
         />
 
         <field name="sliderItemTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_SLIDER_ITEM_TPL" description="PLG_SYSTEM_VIDEOBOX_SLIDER_ITEM_TPL_DESC" default="&lt;li class=&quot;vb_video_cont vb_gal&quot; style=&quot;flex: [[+ratio]] [[+ratio]] [[+basis]]px&quot;>[[+content]]&lt;/li>"
@@ -58,7 +58,7 @@
         <field name="sliderTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_SLIDER_TPL" description="PLG_SYSTEM_VIDEOBOX_SLIDER_TPL_DESC" default="&lt;ul class=&quot;vb_gallery vb_slider [[+class]]&quot; data-target=&quot;img&quot; data-move=&quot;[[+move]]&quot; data-width=&quot;[[+basis]]&quot; style=&quot;[[+style]]&quot;>[[+content]]&lt;/ul>"
         />
 
-        <field name="thumbTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_THUMBNAIL_TPL" description="PLG_SYSTEM_VIDEOBOX_THUMBNAIL_TPL_DESC" default="&lt;a href=&quot;[[+link]]&quot; rel=&quot;[[+rel]]&quot; title=&quot;[[+title]]&quot; data-videobox=&quot;[[+vbOptions]]&quot; data-target=&quot;img&quot; style=&quot;max-width: [[+tWidth]]px; &quot;>&#10;    &lt;span class=&quot;vb_thub_wrap&quot;>&lt;img src=&quot;[[++static_path]][[+thumb]]&quot; alt=&quot;[[+title]]&quot; width=&quot;[[+tWidth]]&quot; height=&quot;[[+tHeight]]&quot; />&lt;span class=&quot;vb-icon-play&quot;>&lt;/span>&lt;/span>&#10;    &lt;span class=&quot;vb_video_title&quot;>[[+title]]&lt;/span>&#10;&lt;/a>"
+        <field name="thumbTpl" type="textarea" rows="10" cols="75" filter="raw" class="vb-tpl" label="PLG_SYSTEM_VIDEOBOX_THUMBNAIL_TPL" description="PLG_SYSTEM_VIDEOBOX_THUMBNAIL_TPL_DESC" default="&lt;a href=&quot;[[+link]]&quot; rel=&quot;[[+rel]]&quot; title=&quot;[[+title]]&quot; data-videobox=&quot;[[+vbOptions]]&quot; data-target=&quot;img&quot; style=&quot;max-width: [[+tWidth]]px; &quot;>&#10;    &lt;span class=&quot;vb_thub_wrap&quot;>&#10;        &lt;img src=&quot;[[++static_path]][[+thumb]]&quot; alt=&quot;[[+title]]&quot; width=&quot;[[+tWidth]]&quot; height=&quot;[[+tHeight]]&quot; />&#10;        &lt;span class=&quot;vb-icon-play&quot;>&lt;/span>&#10;    &lt;/span>&#10;    &lt;span class=&quot;vb_video_title&quot;>[[+title]]&lt;/span>&#10;&lt;/a>"
         />
 
     </fieldset>

diff --git a/build/plugins/videobox/videobox.xml b/build/plugins/videobox/videobox.xml
@@ -9,7 +9,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>6.0.0-rc5</version>
+    <version>6.0.0-rc6</version>
 
     <scriptfile>scripts.php</scriptfile>
 

diff --git a/build/plugins/vimeo/vimeo.xml b/build/plugins/vimeo/vimeo.xml
@@ -9,7 +9,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>6.0.0-rc5</version>
+    <version>6.0.0-rc6</version>
 
     <files>
         <filename plugin="vimeo">vimeo.php</filename>

diff --git a/build/plugins/youtube/youtube.xml b/build/plugins/youtube/youtube.xml
@@ -9,7 +9,7 @@
     <copyright>Copyright (C) 2016 HtikoDev</copyright>
     <authorEmail>development@hitko.si</authorEmail>
     <authorUrl>https://hitko.eu/videobox/</authorUrl>
-    <version>6.0.0-rc5</version>
+    <version>6.0.0-rc6</version>
 
     <files>
         <filename plugin="youtube">youtube.php</filename>

diff --git a/gulpfile.js b/gulpfile.js
@@ -114,6 +114,7 @@ var encodeTemplates = function (options) {
                     indent_level: 0,
                     preserve_newlines: true,
                     wrap_attributes: false,
+                    unformatted: ['script']
                 }).replace(/[\n\r]+/igm, '&#10;')
             }
         })
@@ -377,4 +378,4 @@ gulp.task('html5', () => {
 
     return gulp.src('./src/plugins/html5/**')
         .pipe(gulp.dest('./build/plugins/html5'))
-})
+})
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "license": "GPL-3.0",
   "readme": "README.md",
-  "version": "6.0.0-rc5",
+  "version": "6.0.0-rc6",
   "name": "Videobox-Joomla",
   "copyright": "Hitko",
   "homepage": "https://hitko.eu/videobox/",

diff --git a/src/templates/html5PlayerTpl.html b/src/templates/html5PlayerTpl.html
@@ -7,29 +7,30 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link href="[[+assets]]css/videobox.min.css" rel="stylesheet" type="text/css">
-    <style>
-        [[+style_override]]
-    </style>
+    <style>[[+style_override]]</style>
 </head>
 
 <body class="vb-html5-player">
 
-    <video id="vb-html5-video" class="video-js [[+type]] vjs-default-skin" controls="controls" preload="auto" poster="[[+poster]]"
-        data-setup="{}">
+    <video id="vb-html5-video" class="video-js [[+type]] vjs-default-skin" controls="controls" preload="auto" poster="[[+poster]]">
         [[+sources]]
         <p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/"
                 target="_blank">supports HTML5 video</a></p>
     </video>
 
     <script src="[[+assets]]video-js/video.min.js"></script>
     <script>
-        var vid = videojs("vb-html5-video");
+        var auto = !!([[+auto]]);
+        var vid = videojs(document.getElementById("vb-html5-video"), {
+            autoplay: auto,
+            poster: "[[+poster]]",
+            preload: "auto",
+            controls: true
+        });
 
         var start = [[+start]];
         vid.on('loadedmetadata', function () {
             if (start > 0) vid.currentTime(start);
-            var auto = [[+auto]];
-            if (auto) vid.play();
         });
 
         var end = [[+end]];
@@ -44,4 +45,4 @@
 
 </body>
 
-</html>
+</html>