Skip to content

Commit

Permalink
bump to 0.2.29
Browse files Browse the repository at this point in the history
  • Loading branch information
towerz committed Dec 21, 2015
1 parent 9789f0e commit 174a185
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 39 deletions.
1 change: 1 addition & 0 deletions bump
Expand Up @@ -4,6 +4,7 @@ update_version() {
current_tag=$(git describe --abbrev=0 --tags)
echo 'bump from '$current_tag' to '$1
sed -i ".bkp" "s/\(version\":[ ]*\"\)$current_tag/\1$1/" package.json
sed -i ".bkp" "s/\(version\":[ ]*\"\)$current_tag/\1$1/" yuidoc.json
}

update_bower() {
Expand Down
40 changes: 29 additions & 11 deletions dist/clappr.js
Expand Up @@ -186,7 +186,7 @@ return /******/ (function(modules) { // webpackBootstrap

var _clapprZepto2 = _interopRequireDefault(_clapprZepto);

var version = ("0.2.28");
var version = ("0.2.29");

exports['default'] = {
Player: _componentsPlayer2['default'],
Expand Down Expand Up @@ -815,7 +815,7 @@ return /******/ (function(modules) { // webpackBootstrap

_get(Object.getPrototypeOf(MergedPlugin.prototype), 'constructor', this).call(this, args);
if (properties.initialize) {
properties.initialize.apply(this, [args]);
properties.initialize.apply(this, Array.prototype.slice.apply(arguments));
}
}

Expand All @@ -830,7 +830,7 @@ return /******/ (function(modules) { // webpackBootstrap
})(parent);

delete properties.name;
_clapprZepto2['default'].extend(MergedPlugin, properties);
_clapprZepto2['default'].extend(MergedPlugin.prototype, properties);
return MergedPlugin;
}

Expand Down Expand Up @@ -8822,21 +8822,44 @@ return /******/ (function(modules) { // webpackBootstrap
this.containerPlugins = [_pluginsSpinner_three_bounce2['default'], _pluginsWatermark2['default'], _pluginsPoster2['default'], _pluginsStats2['default'], _pluginsGoogle_analytics2['default'], _pluginsClick_to_pause2['default']];
this.corePlugins = [_pluginsDvr_controls2['default'], _pluginsFavicon2['default'], _pluginsSeek_time2['default'], _pluginsSources2['default'], _pluginsEnd_video2['default']];
if (externalPlugins) {
this.validateExternalPluginsType(externalPlugins);
if (!Array.isArray(externalPlugins)) {
this.validateExternalPluginsType(externalPlugins);
}
this.addExternalPlugins(externalPlugins);
}
}

/**
* adds all the external plugins that were passed through `options.plugins`
* groups by type the external plugins that were passed through `options.plugins` it they're on a flat array
* @method addExternalPlugins
* @private
* @param {Object} plugins the config object with all plugins
* @param {Object} an config object or an array of plugins
* @return {Object} plugins the config object with the plugins separated by type
*/

_createClass(Loader, [{
key: 'groupPluginsByType',
value: function groupPluginsByType(plugins) {
if (Array.isArray(plugins)) {
plugins = plugins.reduce(function (memo, plugin) {
memo[plugin.type] || (memo[plugin.type] = []);
memo[plugin.type].push(plugin);
return memo;
}, {});
}
return plugins;
}

/**
* adds all the external plugins that were passed through `options.plugins`
* @method addExternalPlugins
* @private
* @param {Object} plugins the config object with all plugins
*/
}, {
key: 'addExternalPlugins',
value: function addExternalPlugins(plugins) {
plugins = this.groupPluginsByType(plugins);
var pluginName = function pluginName(plugin) {
return plugin.prototype.name;
};
Expand Down Expand Up @@ -20268,14 +20291,9 @@ return /******/ (function(modules) { // webpackBootstrap
value: function destroy() {
this.remove();
}

//TODO: this seems never be called and assume template and styler, remove it or add template and styler
}, {
key: 'render',
value: function render() {
this.$el.html(this.template());
this.$el.append(this.styler.getStyleFor(this.name));
this.core.$el.append(this.el);
return this;
}
}]);
Expand Down
14 changes: 7 additions & 7 deletions dist/clappr.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/clappr.min.js.map

Large diffs are not rendered by default.

41 changes: 23 additions & 18 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "clappr",
"version": "0.2.28",
"version": "0.2.29",
"description": "An extensible media player for the web",
"main": "./src/main.js",
"browser": "./dist/clappr.min.js",
Expand Down
2 changes: 1 addition & 1 deletion yuidoc.json
@@ -1,7 +1,7 @@
{
"name": "Clappr",
"description": "An extensible media player for the web",
"version": "0.2.28",
"version": "0.2.29",
"url": "https://github.com/clappr/clappr",
"logo": "https://cloud.githubusercontent.com/assets/244265/6373134/a845eb50-bce7-11e4-80f2-592ba29972ab.png",
"options": {
Expand Down

0 comments on commit 174a185

Please sign in to comment.