use bulk-require tool to bundle all json lang files in config/languag…

…eFiles dir
ooyala · Oct 26, 2016 · 15cb588 · 15cb588
1 parent 329ec3e
commit 15cb588
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -6,6 +6,7 @@ var gulp        = require('gulp'),
     browserify  = require('browserify'),
     watchify    = require('watchify'),
     reactify    = require('reactify'),
+    bulkify     = require('bulkify'),
     source      = require('vinyl-source-stream'),
     buffer      = require('vinyl-buffer'),
     gutil       = require('gulp-util'),
@@ -42,7 +43,7 @@ function buildJS(file, hash, watch, ugly, sourcemap, debug, externalReact) {
   var props ={
     entries: ['./js/controller.js'],
     debug: debug,
-    transform:    [[reactify, {}]],
+    transform:    [reactify, bulkify],
     cache: {},
     packageCache: {}
   };

diff --git a/js/controller.js b/js/controller.js
@@ -8,7 +8,9 @@ var React = require('react'),
     AccessibilityControls = require('./components/accessibilityControls'),
     Fullscreen = require('screenfull'),
     Skin = require('./skin'),
-    SkinJSON = require('../config/skin');
+    SkinJSON = require('../config/skin'),
+    Bulk = require('bulk-require'),
+    Localization = Bulk('./config', ['languageFiles/*.json']);
 
 OO.plugin("Html5Skin", function (OO, _, $, W) {
   //Check if the player is at least v4. If not, the skin cannot load.
@@ -228,20 +230,10 @@ OO.plugin("Html5Skin", function (OO, _, $, W) {
       $.extend(true, SkinJSON, params.skin.inline);
       //override state settings with defaults from skin config and possible local storage settings
       $.extend(true, this.state.closedCaptionOptions, SkinJSON.closedCaptionOptions, settings.closedCaptionOptions);
-
-      //load language jsons
-      var tmpLocalizableStrings = {};
-      SkinJSON.localization.availableLanguageFile.forEach(function(languageObj){
-        $.getJSON(languageObj.languageFile, _.bind(function(data) {
-          tmpLocalizableStrings[languageObj.language] = data;
-          this.renderSkin();
-        }, this));
-      }, this);
-
       this.state.config = SkinJSON;
 
       this.skin = ReactDOM.render(
-        React.createElement(Skin, {skinConfig: SkinJSON, localizableStrings: tmpLocalizableStrings, language: Utils.getLanguageToUse(SkinJSON), controller: this, closedCaptionOptions: this.state.closedCaptionOptions, pauseAnimationDisabled: this.state.pauseAnimationDisabled}), document.querySelector("#" + this.state.elementId + " .oo-player-skin")
+        React.createElement(Skin, {skinConfig: SkinJSON, localizableStrings: Localization.languageFiles, language: Utils.getLanguageToUse(SkinJSON), controller: this, closedCaptionOptions: this.state.closedCaptionOptions, pauseAnimationDisabled: this.state.pauseAnimationDisabled}), document.querySelector("#" + this.state.elementId + " .oo-player-skin")
       );
       var accessibilityControls = new AccessibilityControls(this); //keyboard support
       this.state.configLoaded = true;

diff --git a/package.json b/package.json
@@ -29,6 +29,8 @@
   },
   "devDependencies": {
     "browserify": "13.0.0",
+    "bulk-require": "^1.0.0",
+    "bulkify": "^1.4.2",
     "git-rev": "0.2.1",
     "graceful-fs": "*",
     "gulp": "3.9.1",