diff --git a/.gitignore b/.gitignore index 1bf2e4967f..9f765346b0 100644 --- a/.gitignore +++ b/.gitignore @@ -35,14 +35,12 @@ projectFilesBackup .sass-cache/ /core/clientold/tpl/hbs-tpl.js -/core/clientold/assets/vendor /core/clientold/assets/css /core/clientold/assets/sass/config.rb /core/clientold/assets/sass/layouts/config.rb /core/clientold/assets/sass/modules/config.rb /core/clientold/assets/sass/modules/bourbon /core/clientold/assets/sass/modules/bourbon/* -/core/client/assets/vendor /core/client/assets/css /core/client/assets/sass/config.rb /core/client/assets/sass/layouts/config.rb diff --git a/Gemfile.lock b/Gemfile.lock index 2e331ff826..52e3df01ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,6 +9,7 @@ GEM PLATFORMS ruby + x86-mingw32 DEPENDENCIES bourbon diff --git a/core/client/assets/vendor/loader.js b/core/client/assets/vendor/loader.js new file mode 100644 index 0000000000..e57b605411 --- /dev/null +++ b/core/client/assets/vendor/loader.js @@ -0,0 +1,75 @@ +var define, requireModule, require, requirejs; + +(function() { + var registry = {}, seen = {}, state = {}; + var FAILED = false; + + define = function(name, deps, callback) { + registry[name] = { + deps: deps, + callback: callback + }; + }; + + requirejs = require = requireModule = function(name) { + if (state[name] !== FAILED && + seen.hasOwnProperty(name)) { + return seen[name]; + } + + if (!registry.hasOwnProperty(name)) { + throw new Error('Could not find module ' + name); + } + + var mod = registry[name]; + var deps = mod.deps; + var callback = mod.callback; + var reified = []; + var exports; + var value; + var loaded = false; + + seen[name] = { }; // enable run-time cycles + + try { + for (var i=0, l=deps.length; i