Do not set up underscore.string globally.

openedx · Mar 31, 2016 · 41adf01 · 41adf01
1 parent a8c2d7d
commit 41adf01
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/cms/static/js/certificates/models/signatory.js b/cms/static/js/certificates/models/signatory.js
@@ -3,8 +3,7 @@
 define([ // jshint ignore:line
     'underscore',
     'backbone',
-    'backbone-relational',
-    'underscore.string'
+    'backbone-relational'
 ],
 function(_, Backbone) {
     'use strict';

diff --git a/lms/static/lms/js/require-config.js b/lms/static/lms/js/require-config.js
@@ -29,11 +29,11 @@
         };
         defineDependency("jQuery", "jquery");
         defineDependency("_", "underscore");
-        defineDependency("s", "underscore.string");
-        // Underscore.string no longer installs itself directly on "_". For compatibility with existing
-        // code, add it to "_" with its previous name.
-        if (window._ && window.s) {
-            window._.str = window.s;
+        if (window._ && window._.str) {
+            define("underscore.string", [], function () {return window._.str;});
+        }
+        else {
+            console.error("Expected _.str (underscore.string) to be on the window object, but not found.");
         }
         defineDependency("gettext", "gettext");
         defineDependency("Logger", "logger");