fixed massiveart#566 to avoid missing util functions

niklasnatter · Nov 5, 2015 · 05c1c68 · 05c1c68
1 parent 7773f67
commit 05c1c68
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 99 deletions.
diff --git a/dist/husky.js b/dist/husky.js
@@ -52223,63 +52223,19 @@ define('husky_extensions/template',['underscore', 'jquery'], function(_, $) {
  */
 
 /**
- * @deprecated use util-service instead
+ * Provides the util function into a sandbox.
  */
-define('husky_extensions/util',['services/husky/util'], function(Util) {
+define('husky_extensions/util',['services/husky/util'], function(util) {
 
     'use strict';
 
     return {
         name: 'Util',
 
         initialize: function(app) {
-            app.core.util.compare = Util.compare;
-
-            app.core.util.typeOf = Util.typeOf;
-
-            app.core.util.isEqual = Util.isEqual;
-
-            app.core.util.isEmpty = Util.isEmpty;
-
-            app.core.util.foreach = Util.foreach;
-
-            app.core.util.load = Util.load;
-
-            app.core.util.save = Util.save;
-
-            app.core.util.cropMiddle = Util.cropMiddle;
-
-            app.core.util.cropFront = Util.cropFront;
-
-            app.core.util.cropTail = Util.cropTail;
-
-            app.core.util.contains = Util.contains;
-
-            app.core.util.isAlphaNumeric = Util.isAlphaNumeric;
-
-            app.core.util.uniqueId = Util.uniqueId;
-
-            app.core.util.delay = Util.delay;
-
-            app.core.util.union = Util.union;
-
-            app.core.util.deepCopy = Util.deepCopy;
-
-            app.core.util.getParameterByName =  Util.getParameterByName;
-
-			app.core.util.template = Util.template;
-
-            app.core.util.escapeHtml = Util.escapeHtml;
-
-            app.core.util.arrayGetColumn = Util.arrayGetColumn;
-
-            app.core.util.removeFromArray = Util.removeFromArray;
-
-            app.core.util.capitalizeFirstLetter = Util.capitalizeFirstLetter;
-
-            app.core.util.arrayMap = Util.arrayMap;
-
-            app.core.util.object = Util.object;
+            for (var key in util) {
+                app.core.util[key] = util[key];
+            }
         }
     };
 });

diff --git a/dist/husky.min.js b/dist/husky.min.js
diff --git a/husky_extensions/util.js b/husky_extensions/util.js
@@ -9,63 +9,19 @@
  */
 
 /**
- * @deprecated use util-service instead
+ * Provides the util function into a sandbox.
  */
-define(['services/husky/util'], function(Util) {
+define(['services/husky/util'], function(util) {
 
     'use strict';
 
     return {
         name: 'Util',
 
         initialize: function(app) {
-            app.core.util.compare = Util.compare;
-
-            app.core.util.typeOf = Util.typeOf;
-
-            app.core.util.isEqual = Util.isEqual;
-
-            app.core.util.isEmpty = Util.isEmpty;
-
-            app.core.util.foreach = Util.foreach;
-
-            app.core.util.load = Util.load;
-
-            app.core.util.save = Util.save;
-
-            app.core.util.cropMiddle = Util.cropMiddle;
-
-            app.core.util.cropFront = Util.cropFront;
-
-            app.core.util.cropTail = Util.cropTail;
-
-            app.core.util.contains = Util.contains;
-
-            app.core.util.isAlphaNumeric = Util.isAlphaNumeric;
-
-            app.core.util.uniqueId = Util.uniqueId;
-
-            app.core.util.delay = Util.delay;
-
-            app.core.util.union = Util.union;
-
-            app.core.util.deepCopy = Util.deepCopy;
-
-            app.core.util.getParameterByName =  Util.getParameterByName;
-
-			app.core.util.template = Util.template;
-
-            app.core.util.escapeHtml = Util.escapeHtml;
-
-            app.core.util.arrayGetColumn = Util.arrayGetColumn;
-
-            app.core.util.removeFromArray = Util.removeFromArray;
-
-            app.core.util.capitalizeFirstLetter = Util.capitalizeFirstLetter;
-
-            app.core.util.arrayMap = Util.arrayMap;
-
-            app.core.util.object = Util.object;
+            for (var key in util) {
+                app.core.util[key] = util[key];
+            }
         }
     };
 });