From 279908df66be46caba8ab1dec0c4d9f5edb5a1f2 Mon Sep 17 00:00:00 2001
From: Robert Jackson <robert.w.jackson@me.com>
Date: Sun, 8 Jun 2014 19:39:45 -0400
Subject: [PATCH] Use loader.js from bower.

---
 Gruntfile.js                        |  2 +-
 bower.json                          |  3 +-
 core/client/assets/vendor/loader.js | 75 -----------------------------
 3 files changed, 3 insertions(+), 77 deletions(-)
 delete mode 100644 core/client/assets/vendor/loader.js

diff --git a/Gruntfile.js b/Gruntfile.js
index 20c9c1b758..252058467f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -488,7 +488,7 @@ var path           = require('path'),
                 'dev-ember': {
                     files: {
                         'core/built/scripts/vendor-ember.js': [
-                            'core/client/assets/vendor/loader.js',
+                            'bower_components/loader.js/loader.js',
                             'bower_components/jquery/dist/jquery.js',
                             'bower_components/handlebars/handlebars.js',
                             'bower_components/ember/ember.js',
diff --git a/bower.json b/bower.json
index 4c161878ee..eef3301fa2 100644
--- a/bower.json
+++ b/bower.json
@@ -20,7 +20,8 @@
         "moment": "2.4.0",
         "nprogress": "0.1.2",
         "showdown": "https://github.com/ErisDS/showdown.git#v0.3.2-ghost",
-        "validator-js": "3.4.0"
+        "validator-js": "3.4.0",
+        "loader.js": "stefanpenner/loader.js#1.0.0"
     },
     "resolutions": {
       "ember": "~1.4.0"
diff --git a/core/client/assets/vendor/loader.js b/core/client/assets/vendor/loader.js
deleted file mode 100644
index e57b605411..0000000000
--- a/core/client/assets/vendor/loader.js
+++ /dev/null
@@ -1,75 +0,0 @@
-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<l; i++) {
-        if (deps[i] === 'exports') {
-          reified.push(exports = {});
-        } else {
-          reified.push(requireModule(resolve(deps[i], name)));
-        }
-      }
-
-      value = callback.apply(this, reified);
-      loaded = true;
-    } finally {
-      if (!loaded) {
-        state[name] = FAILED;
-      }
-    }
-    return seen[name] = exports || value;
-  };
-
-  function resolve(child, name) {
-    if (child.charAt(0) !== '.') { return child; }
-
-    var parts = child.split('/');
-    var parentBase = name.split('/').slice(0, -1);
-
-    for (var i = 0, l = parts.length; i < l; i++) {
-      var part = parts[i];
-
-      if (part === '..') { parentBase.pop(); }
-      else if (part === '.') { continue; }
-      else { parentBase.push(part); }
-    }
-
-    return parentBase.join('/');
-  }
-
-  requirejs._eak_seen = registry;
-  requirejs.clear = function(){
-    requirejs._eak_seen = registry = {};
-    seen = {};
-  };
-})();
\ No newline at end of file