diff --git a/CHANGELOG.md b/CHANGELOG.md index 95f4465..044a08d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ +### 6.0.0 rc 2 - *14. November 2016* + * bug fixes + * bundled the polyfill + ### 6.0.0 rc 1 - *5. November 2016* * remove jQuery dependency * add source maps to the build * fix templates - * varius fixes + * various fixes ### 5.1.1 pl - *13. August 2016* * fix tempfiles location diff --git a/_build/build.transport.php b/_build/build.transport.php index 112e442..f66f154 100644 --- a/_build/build.transport.php +++ b/_build/build.transport.php @@ -9,7 +9,7 @@ define('PKG_NAME','Videobox'); define('PKG_NAME_LOWER','videobox'); define('PKG_VERSION','6.0.0'); -define('PKG_RELEASE','rc1'); +define('PKG_RELEASE','rc2'); /* define build paths */ $root = dirname(dirname(__FILE__)).'/'; @@ -80,15 +80,12 @@ copy($sources['root'] . 'node_modules/videobox/dist/videobox.css.map', $sources['root'] . 'assets/components/videobox/css/videobox.css.map'); copy($sources['root'] . 'node_modules/videobox/dist/overrides.min.css', $sources['root'] . 'assets/components/videobox/css/overrides.min.css'); copy($sources['root'] . 'node_modules/videobox/dist/overrides.css.map', $sources['root'] . 'assets/components/videobox/css/overrides.css.map'); -copy($sources['root'] . 'node_modules/videobox/dist/videobox.min.js', $sources['root'] . 'assets/components/videobox/js/videobox.min.js'); -copy($sources['root'] . 'node_modules/videobox/dist/videobox.js.map', $sources['root'] . 'assets/components/videobox/js/videobox.js.map'); +copy($sources['root'] . 'node_modules/videobox/dist/videobox.bundle.js', $sources['root'] . 'assets/components/videobox/js/videobox.bundle.js'); +copy($sources['root'] . 'node_modules/videobox/dist/videobox.bundle.map', $sources['root'] . 'assets/components/videobox/js/videobox.bundle.map'); // VideoJS copy($sources['root'] . 'node_modules/video.js/dist/video.min.js', $sources['root'] . 'assets/components/videobox/video-js/video.min.js'); -// libs -copy($sources['root'] . 'node_modules/web-animations-js/web-animations.min.js', $sources['root'] . 'assets/components/videobox/js/web-animations.min.js'); - /* create category vehicle */ $vehicle = $builder->createVehicle($adaptersCategory, array( xPDOTransport::UNIQUE_KEY => 'category', @@ -136,7 +133,7 @@ 'source' => $sources['source_assets'], 'target' => "return MODX_ASSETS_PATH . 'components/';", xPDOTransport::FILE_RESOLVE_OPTIONS => array( - 'copy_exclude_patterns' => array('/cache/', '/\.zip/', '/(? array('/cache/', '/\.zip/', '/(?resolve('file',array( diff --git a/core/components/videobox/model/videobox/videobox.class.php b/core/components/videobox/model/videobox/videobox.class.php index e1899c5..93cb7db 100644 --- a/core/components/videobox/model/videobox/videobox.class.php +++ b/core/components/videobox/model/videobox/videobox.class.php @@ -73,8 +73,7 @@ function getVideo(array $props = array()){ function loadAssets(){ $this->modx->regClientCSS($_GET['dev'] ? '/Videobox/videobox.min.css' : $this->config['assets_url'] . 'css/videobox.min.css'); - $this->modx->regClientScript($this->config['assets_url'] . 'js/web-animations.min.js'); - $this->modx->regClientScript($_GET['dev'] ? '/Videobox/videobox.min.js' : $this->config['assets_url'] . 'js/videobox.min.js'); + $this->modx->regClientScript($_GET['dev'] ? '/Videobox/videobox.min.js' : $this->config['assets_url'] . 'js/videobox.bundle.js'); $overrides = file_get_contents($_GET['dev'] ? '/srv/htdocs/Videobox/dist/overrides.css' : $this->config['assets_path'] . 'css/overrides.min.css'); $styleOverride = str_replace(array('#005723', '#84d1a4', '.vb-overrides-wrap'), array('#' . $this->config['tColor'], '#' . $this->config['hColor'], ''), $overrides); diff --git a/package.json b/package.json index 5a17395..48a6f32 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "license": "GPL-3.0", "readme": "README.md", - "version": "6.0.0-rc1", + "version": "6.0.0-rc2", "name": "Videobox-MODX", "copyright": "Hitko", "homepage": "https://hitko.eu/videobox/",