ovenplayer 0.10.49 → 0.10.51

package/src/js/utils/resize-sensor.js

@@ -1,168 +1,145 @@
-(function (root, factory) {
-    if (typeof define === 'function' && define.amd) {
-        // AMD. Register as an anonymous module.
-        define([], function () {
-            return (root.returnExportsGlobal = factory());
-        });
-    } else if (typeof exports === 'object') {
-        // Node. Does not work with strict CommonJS, but
-        // only CommonJS-like enviroments that support module.exports,
-        // like Node.
-        module.exports = factory();
-    } else {
-        root['ResizeSensor'] = factory();
-    }
-}(this, function () {
-
-    var ResizeSensor = function () {
-        'use strict';
-        var requestAnimationFrame = window.requestAnimationFrame || window.mozRequestAnimationFrame || window.webkitRequestAnimationFrame || function (fn) {
-            return window.setTimeout(fn, 20);
-        };
-        /**
-         *
-         * @constructor
-         */
-        function EventQueue() {
-            this.q = [];
-            this.add = function (ev) {
-                this.q.push(ev);
-            };
-            var i, j;
-            this.call = function () {
-                for (i = 0, j = this.q.length; i < j; i++) {
-                    this.q[i].call();
-                }
-            };
-        }
-        /**
-         * @param {HTMLElement} element
-         * @param {String}      prop
-         * @returns {String|Number}
-         */
-        function getComputedStyle(element, prop) {
-            if (element.currentStyle) {
-                return element.currentStyle[prop];
-            } else if (window.getComputedStyle) {
-                return window.getComputedStyle(element, null).getPropertyValue(prop);
-            } else {
-                return element.style[prop];
-            }
-        }
-        /**
-         *
-         * @param {HTMLElement} element
-         * @param {Function}    resized
-         */
-        function attachResizeEvent(element, resized) {
-            if (!element.resizedAttached) {
-                element.resizedAttached = new EventQueue();
-                element.resizedAttached.add(resized);
-            } else if (element.resizedAttached) {
-                element.resizedAttached.add(resized);
-                return;
-            }
-            element.resizeSensor = document.createElement('div');
-            element.resizeSensor.className = 'resize-sensor';
-            var style = 'position: absolute; left: 0; top: 0; right: 0; bottom: 0; overflow: hidden; z-index: -1; visibility: hidden; opacity: 0;direction: ltr;';
-            var styleChild = 'position: absolute; left: 0; top: 0; transition: 0s;';
-            element.resizeSensor.style.cssText = style;
-            element.resizeSensor.innerHTML = '<div class="resize-sensor-expand" style="' + style + '">' + '<div style="' + styleChild + '"></div>' + '</div>' + '<div class="resize-sensor-shrink" style="' + style + '">' + '<div style="' + styleChild + ' width: 200%; height: 200%"></div>' + '</div>';
-            element.appendChild(element.resizeSensor);
-            if (getComputedStyle(element, 'position') == 'static') {
-                element.style.position = 'relative';
-            }
-            var expand = element.resizeSensor.childNodes[0];
-            var expandChild = expand.childNodes[0];
-            var shrink = element.resizeSensor.childNodes[1];
-            var reset = function () {
-                expandChild.style.width = 100000 + 'px';
-                expandChild.style.height = 100000 + 'px';
-                expand.scrollLeft = 100000;
-                expand.scrollTop = 100000;
-                shrink.scrollLeft = 100000;
-                shrink.scrollTop = 100000;
-            };
-            reset();
-            var dirty = false;
-            var dirtyChecking = function () {
-                if (!element.resizedAttached)
-                    return;
-                if (dirty) {
-                    element.resizedAttached.call();
-                    dirty = false;
-                }
-                requestAnimationFrame(dirtyChecking);
-            };
-            requestAnimationFrame(dirtyChecking);
-            var lastWidth, lastHeight;
-            var cachedWidth, cachedHeight;
-            //useful to not query offsetWidth twice
-            var onScroll = function () {
-                if ((cachedWidth = element.offsetWidth) != lastWidth || (cachedHeight = element.offsetHeight) != lastHeight) {
-                    dirty = true;
-                    lastWidth = cachedWidth;
-                    lastHeight = cachedHeight;
-                }
-                reset();
-            };
-            var addEvent = function (el, name, cb) {
-                if (el.attachEvent) {
-                    el.attachEvent('on' + name, cb);
-                } else {
-                    el.addEventListener(name, cb);
-                }
-            };
-            addEvent(expand, 'scroll', onScroll);
-            addEvent(shrink, 'scroll', onScroll);
-        }
-        /**
-         * Class for dimension change detection.
-         *
-         * @param {Element|Element[]|Elements|jQuery} element
-         * @param {Function} callback
-         *
-         * @constructor
-         */
-        var ResizeSensor = function (element, callback) {
-            var me = this;
-            var elementType = Object.prototype.toString.call(element);
-            var isCollectionTyped = me._isCollectionTyped = '[object Array]' === elementType || '[object NodeList]' === elementType || '[object HTMLCollection]' === elementType || 'undefined' !== typeof jQuery && element instanceof window.jQuery || 'undefined' !== typeof Elements && element instanceof window.Elements;
-            me._element = element;
-            if (isCollectionTyped) {
-                var i = 0, j = element.length;
-                for (; i < j; i++) {
-                    attachResizeEvent(element[i], callback);
-                }
-            } else {
-                attachResizeEvent(element, callback);
-            }
-        };
-        ResizeSensor.prototype.detach = function () {
-            var me = this;
-            var isCollectionTyped = me._isCollectionTyped;
-            var element = me._element;
-            if (isCollectionTyped) {
-                var i = 0, j = element.length;
-                for (; i < j; i++) {
-                    ResizeSensor.detach(element[i]);
-                }
-            } else {
-                ResizeSensor.detach(element);
-            }
-        };
-        ResizeSensor.detach = function (element) {
-            if (element.resizeSensor) {
-                if (element.hasChildNodes()) {
-                    element.removeChild(element.resizeSensor);
-                }
-                delete element.resizeSensor;
-                delete element.resizedAttached;
-            }
-        };
-        return ResizeSensor;
-    }();
-
-    return ResizeSensor;
-
-}));
+export default (function () {
+    'use strict';
+    /**
+     *
+     * @constructor
+     */
+    function EventQueue() {
+        this.q = [];
+        this.add = function (ev) {
+            this.q.push(ev);
+        };
+        var i, j;
+        this.call = function () {
+            for (i = 0, j = this.q.length; i < j; i++) {
+                this.q[i].call();
+            }
+        };
+    }
+    /**
+     * @param {HTMLElement} element
+     * @param {String}      prop
+     * @returns {String|Number}
+     */
+    function getComputedStyle(element, prop) {
+        if (element.currentStyle) {
+            return element.currentStyle[prop];
+        } else if (window.getComputedStyle) {
+            return window.getComputedStyle(element, null).getPropertyValue(prop);
+        } else {
+            return element.style[prop];
+        }
+    }
+    /**
+     *
+     * @param {HTMLElement} element
+     * @param {Function}    resized
+     */
+    function attachResizeEvent(element, resized) {
+        if (!element.resizedAttached) {
+            element.resizedAttached = new EventQueue();
+            element.resizedAttached.add(resized);
+        } else if (element.resizedAttached) {
+            element.resizedAttached.add(resized);
+            return;
+        }
+        element.resizeSensor = document.createElement('div');
+        element.resizeSensor.className = 'resize-sensor';
+        var style = 'position: absolute; left: 0; top: 0; right: 0; bottom: 0; overflow: hidden; z-index: -1; visibility: hidden; opacity: 0;direction: ltr;';
+        var styleChild = 'position: absolute; left: 0; top: 0; transition: 0s;';
+        element.resizeSensor.style.cssText = style;
+        element.resizeSensor.innerHTML = '<div class="resize-sensor-expand" style="' + style + '">' + '<div style="' + styleChild + '"></div>' + '</div>' + '<div class="resize-sensor-shrink" style="' + style + '">' + '<div style="' + styleChild + ' width: 200%; height: 200%"></div>' + '</div>';
+        element.appendChild(element.resizeSensor);
+        if (getComputedStyle(element, 'position') == 'static') {
+            element.style.position = 'relative';
+        }
+        var expand = element.resizeSensor.childNodes[0];
+        var expandChild = expand.childNodes[0];
+        var shrink = element.resizeSensor.childNodes[1];
+        var reset = function () {
+            expandChild.style.width = 100000 + 'px';
+            expandChild.style.height = 100000 + 'px';
+            expand.scrollLeft = 100000;
+            expand.scrollTop = 100000;
+            shrink.scrollLeft = 100000;
+            shrink.scrollTop = 100000;
+        };
+        reset();
+        var dirty = false;
+        var dirtyChecking = function () {
+            if (!element.resizedAttached)
+                return;
+            if (dirty) {
+                element.resizedAttached.call();
+                dirty = false;
+            }
+            window.requestAnimationFrame(dirtyChecking);
+        };
+        window.requestAnimationFrame(dirtyChecking);
+        var lastWidth, lastHeight;
+        var cachedWidth, cachedHeight;
+        //useful to not query offsetWidth twice
+        var onScroll = function () {
+            if ((cachedWidth = element.offsetWidth) != lastWidth || (cachedHeight = element.offsetHeight) != lastHeight) {
+                dirty = true;
+                lastWidth = cachedWidth;
+                lastHeight = cachedHeight;
+            }
+            reset();
+        };
+        var addEvent = function (el, name, cb) {
+            if (el.attachEvent) {
+                el.attachEvent('on' + name, cb);
+            } else {
+                el.addEventListener(name, cb);
+            }
+        };
+        addEvent(expand, 'scroll', onScroll);
+        addEvent(shrink, 'scroll', onScroll);
+    }
+    /**
+     * Class for dimension change detection.
+     *
+     * @param {Element|Element[]|Elements|jQuery} element
+     * @param {Function} callback
+     *
+     * @constructor
+     */
+    var ResizeSensor = function (element, callback) {
+        var me = this;
+        var elementType = Object.prototype.toString.call(element);
+        var isCollectionTyped = me._isCollectionTyped = '[object Array]' === elementType || '[object NodeList]' === elementType || '[object HTMLCollection]' === elementType || 'undefined' !== typeof jQuery && element instanceof window.jQuery || 'undefined' !== typeof Elements && element instanceof window.Elements;
+        me._element = element;
+        if (isCollectionTyped) {
+            var i = 0, j = element.length;
+            for (; i < j; i++) {
+                attachResizeEvent(element[i], callback);
+            }
+        } else {
+            attachResizeEvent(element, callback);
+        }
+    };
+    ResizeSensor.prototype.detach = function () {
+        var me = this;
+        var isCollectionTyped = me._isCollectionTyped;
+        var element = me._element;
+        if (isCollectionTyped) {
+            var i = 0, j = element.length;
+            for (; i < j; i++) {
+                ResizeSensor.detach(element[i]);
+            }
+        } else {
+            ResizeSensor.detach(element);
+        }
+    };
+    ResizeSensor.detach = function (element) {
+        if (element.resizeSensor) {
+            if (element.hasChildNodes()) {
+                element.removeChild(element.resizeSensor);
+            }
+            delete element.resizeSensor;
+            delete element.resizedAttached;
+        }
+    };
+    return ResizeSensor;
+})();

package/src/js/utils/strings.js

@@ -1,104 +1,104 @@
-import _ from 'utils/underscore';
-
-export function trim(string) {
-    return string ? string.replace(/^\s+|\s+$/g, '') : "";
-}
-
-/**
- * extractExtension
- *
- * @param      {string} path for url
- * @return     {string}  Extension
- */
-export const extractExtension = function(path) {
-    if(!path || path.substr(0,4)=='rtmp') {
-        return "";
-    }
-    function getAzureFileFormat(path) {
-        let extension = "";
-        if ((/[(,]format=mpd-/i).test(path)) {
-            extension = 'mpd';
-        }else if ((/[(,]format=m3u8-/i).test(path)) {
-            extension = 'm3u8';
-        }
-        return extension;
-    }
-
-    let azuredFormat = getAzureFileFormat(path);
-    if(azuredFormat) {
-        return azuredFormat;
-    }
-    path = path.split('?')[0].split('#')[0];
-    if(path.lastIndexOf('.') > -1) {
-        return path.substr(path.lastIndexOf('.') + 1, path.length).toLowerCase();
-    }else{
-        return "";
-    }
-};
-
-
-/**
- * naturalHms
- *
- * @param      {number | string}  second  The second
- * @return     {string}  formatted String
- */
-export function naturalHms(second) {
-    let secNum = parseInt(second, 10);
-    if(!second){
-        return "00:00";
-    }
-    let hours   = Math.floor(secNum / 3600);
-    let minutes = Math.floor((secNum - (hours * 3600)) / 60);
-    let seconds = secNum - (hours * 3600) - (minutes * 60);
-
-    //if (hours > 0) {minutes = "0"+minutes;}
-    if (minutes < 10) {minutes = "0"+minutes;}
-    if (seconds < 10) {seconds = "0"+seconds;}
-
-    if (hours > 0) {
-        return hours+':'+minutes+':'+seconds;
-    } else {
-        return minutes+':'+seconds;
-    }
-}
-
-
-export function hmsToSecond(str, frameRate) {
-    if(!str) {
-        return 0;
-    }
-    if(_.isNumber(str) && !_.isNaN(str)){
-        return str;
-    }
-    str = str.replace(',', '.');
-    let arr = str.split(':');
-    let arrLength = arr.length;
-    let sec = 0;
-    if (str.slice(-1) === 's'){
-        sec = parseFloat(str);
-    }else if (str.slice(-1) === 'm'){
-        sec = parseFloat(str) * 60;
-    }else if (str.slice(-1) === 'h'){
-        sec = parseFloat(str) * 3600;
-    }else if (arrLength > 1) {
-        var secIndex = arrLength - 1;
-        if (arrLength === 4) {
-            if (frameRate) {
-                sec = parseFloat(arr[secIndex]) / frameRate;
-            }
-            secIndex -= 1;
-        }
-        sec += parseFloat(arr[secIndex]);
-        sec += parseFloat(arr[secIndex - 1]) * 60;
-        if (arrLength >= 3) {
-            sec += parseFloat(arr[secIndex - 2]) * 3600;
-        }
-    } else {
-        sec = parseFloat(str);
-    }
-    if (_.isNaN(sec)) {
-        return 0;
-    }
-    return sec;
-}
+import _ from 'underscore';
+
+export function trim(string) {
+    return string ? string.replace(/^\s+|\s+$/g, '') : "";
+}
+
+/**
+ * extractExtension
+ *
+ * @param      {string} path for url
+ * @return     {string}  Extension
+ */
+export const extractExtension = function(path) {
+    if(!path || path.substr(0,4)=='rtmp') {
+        return "";
+    }
+    function getAzureFileFormat(path) {
+        let extension = "";
+        if ((/[(,]format=mpd-/i).test(path)) {
+            extension = 'mpd';
+        }else if ((/[(,]format=m3u8-/i).test(path)) {
+            extension = 'm3u8';
+        }
+        return extension;
+    }
+
+    let azuredFormat = getAzureFileFormat(path);
+    if(azuredFormat) {
+        return azuredFormat;
+    }
+    path = path.split('?')[0].split('#')[0];
+    if(path.lastIndexOf('.') > -1) {
+        return path.substr(path.lastIndexOf('.') + 1, path.length).toLowerCase();
+    }else{
+        return "";
+    }
+};
+
+
+/**
+ * naturalHms
+ *
+ * @param      {number | string}  second  The second
+ * @return     {string}  formatted String
+ */
+export function naturalHms(second) {
+    let secNum = parseInt(second, 10);
+    if(!second){
+        return "00:00";
+    }
+    let hours   = Math.floor(secNum / 3600);
+    let minutes = Math.floor((secNum - (hours * 3600)) / 60);
+    let seconds = secNum - (hours * 3600) - (minutes * 60);
+
+    //if (hours > 0) {minutes = "0"+minutes;}
+    if (minutes < 10) {minutes = "0"+minutes;}
+    if (seconds < 10) {seconds = "0"+seconds;}
+
+    if (hours > 0) {
+        return hours+':'+minutes+':'+seconds;
+    } else {
+        return minutes+':'+seconds;
+    }
+}
+
+
+export function hmsToSecond(str, frameRate) {
+    if(!str) {
+        return 0;
+    }
+    if(_.isNumber(str) && !_.isNaN(str)){
+        return str;
+    }
+    str = str.replace(',', '.');
+    let arr = str.split(':');
+    let arrLength = arr.length;
+    let sec = 0;
+    if (str.slice(-1) === 's'){
+        sec = parseFloat(str);
+    }else if (str.slice(-1) === 'm'){
+        sec = parseFloat(str) * 60;
+    }else if (str.slice(-1) === 'h'){
+        sec = parseFloat(str) * 3600;
+    }else if (arrLength > 1) {
+        var secIndex = arrLength - 1;
+        if (arrLength === 4) {
+            if (frameRate) {
+                sec = parseFloat(arr[secIndex]) / frameRate;
+            }
+            secIndex -= 1;
+        }
+        sec += parseFloat(arr[secIndex]);
+        sec += parseFloat(arr[secIndex - 1]) * 60;
+        if (arrLength >= 3) {
+            sec += parseFloat(arr[secIndex - 2]) * 3600;
+        }
+    } else {
+        sec = parseFloat(str);
+    }
+    if (_.isNaN(sec)) {
+        return 0;
+    }
+    return sec;
+}

package/src/js/view/components/controls/settingPanel/audioTrackPanel.js

@@ -1,57 +1,57 @@
-/**
- * Created by hoho on 2018. 7. 26..
- */
-import OvenTemplate from 'view/engine/OvenTemplate';
-import PanelManager from "view/global/PanelManager";
-import LA$ from 'utils/likeA$';
-import {
-    AUDIO_TRACK_CHANGED
-} from "api/constants";
-import _ from "utils/underscore";
-
-const AudioTrackPanel = function ($container, api, data) {
-    const $root = LA$(api.getContainerElement());
-    let panelManager = PanelManager();
-
-    data.setFront = function (isFront) {
-        if (isFront) {
-            $root.find("#" + data.id).removeClass("background");
-        } else {
-            $root.find("#" + data.id).addClass("background");
-        }
-    };
-    const onRendered = function ($current, template) {
-        api.on(AUDIO_TRACK_CHANGED, function (data) {
-            _.forEach($root.find("#" + template.data.id).find(".op-setting-item").get(), function (panel) {
-                let $panel = LA$(panel);
-
-                if ($panel.find(".op-setting-item-checked").hasClass("op-show")) {
-                    $panel.find(".op-setting-item-checked").removeClass("op-show");
-                }
-                if (data.currentAudioTrack === parseInt($panel.attr("op-data-value"))) {
-                    $panel.find(".op-setting-item-checked").addClass("op-show");
-                }
-            });
-        }, template);
-    };
-    const onDestroyed = function (template) {
-        api.off(AUDIO_TRACK_CHANGED, null, template);
-    };
-    const events = {
-        "click .op-setting-item": function (event, $current, template) {
-            event.preventDefault();
-            let value = LA$(event.currentTarget).attr("op-data-value");
-            api.setCurrentAudioTrack(parseInt(value));
-            panelManager.clear();
-        },
-        "click .op-setting-title": function (event, $current, template) {
-            event.preventDefault();
-            panelManager.removeLastItem();
-        }
-    };
-
-    return OvenTemplate($container, "AudioTrackPanel", api.getConfig(), data, events, onRendered, onDestroyed);
-
-};
-
-export default AudioTrackPanel;
+/**
+ * Created by hoho on 2018. 7. 26..
+ */
+import OvenTemplate from 'view/engine/OvenTemplate';
+import PanelManager from "view/global/PanelManager";
+import LA$ from 'utils/likeA$';
+import {
+    AUDIO_TRACK_CHANGED
+} from "api/constants";
+import _ from "underscore";
+
+const AudioTrackPanel = function ($container, api, data) {
+    const $root = LA$(api.getContainerElement());
+    let panelManager = PanelManager();
+
+    data.setFront = function (isFront) {
+        if (isFront) {
+            $root.find("#" + data.id).removeClass("background");
+        } else {
+            $root.find("#" + data.id).addClass("background");
+        }
+    };
+    const onRendered = function ($current, template) {
+        api.on(AUDIO_TRACK_CHANGED, function (data) {
+            _.forEach($root.find("#" + template.data.id).find(".op-setting-item").get(), function (panel) {
+                let $panel = LA$(panel);
+
+                if ($panel.find(".op-setting-item-checked").hasClass("op-show")) {
+                    $panel.find(".op-setting-item-checked").removeClass("op-show");
+                }
+                if (data.currentAudioTrack === parseInt($panel.attr("op-data-value"))) {
+                    $panel.find(".op-setting-item-checked").addClass("op-show");
+                }
+            });
+        }, template);
+    };
+    const onDestroyed = function (template) {
+        api.off(AUDIO_TRACK_CHANGED, null, template);
+    };
+    const events = {
+        "click .op-setting-item": function (event, $current, template) {
+            event.preventDefault();
+            let value = LA$(event.currentTarget).attr("op-data-value");
+            api.setCurrentAudioTrack(parseInt(value));
+            panelManager.clear();
+        },
+        "click .op-setting-title": function (event, $current, template) {
+            event.preventDefault();
+            panelManager.removeLastItem();
+        }
+    };
+
+    return OvenTemplate($container, "AudioTrackPanel", api.getConfig(), data, events, onRendered, onDestroyed);
+
+};
+
+export default AudioTrackPanel;

package/src/js/view/components/controls/settingPanel/main.js

@@ -4,7 +4,7 @@
 import OvenTemplate from 'view/engine/OvenTemplate';
 import PanelManager from "view/global/PanelManager";
 import LA$ from 'utils/likeA$';
-import _ from "utils/underscore";
+import _ from "underscore";
 import sizeHumanizer from "utils/sizeHumanizer";
 import SpeedPanel from "view/components/controls/settingPanel/speedPanel";
 import ZoomPanel from "view/components/controls/settingPanel/zoomPanel";