improved modal dialogs, added one for link grabber

2 files changed, 16 insertions, 7 deletions

diff --git a/module/web/static/js/utils/initHB.js b/module/web/static/js/utils/initHB.js
index d3264e4bc..6d9436835 100644
--- a/module/web/static/js/utils/initHB.js
+++ b/module/web/static/js/utils/initHB.js
@@ -1,7 +1,9 @@
 // Loads all helper and set own handlebars rules
-define(['handlebars', 'helpers/formatSize'],
-    function(Handlebars) {
+define(['underscore', 'handlebars', 'helpers/formatSize'],
+    function(_, Handlebars) {
         // TODO: create better lexer rules, these are just hacked
         Handlebars.Parser.lexer.rules = [/^(?:[^\x00]*?(?=(<%)))/, /^(?:[^\x00]+)/, /^(?:[^\x00]{2,}?(?=(<%|$)))/, /^(?:<%>)/, /^(?:<%#)/, /^(?:<%\/)/, /^(?:<%\^)/, /^(?:<%\s*else\b)/, /^(?:<%=)/, /^(?:<%&)/, /^(?:<%![\s\S]*?\}\})/, /^(?:<%)/, /^(?:=)/, /^(?:\.(?=[%> ]))/, /^(?:\.\.)/, /^(?:[\/.])/, /^(?:\s+)/, /^(?:=%>)/, /^(?:%>)/, /^(?:"(\\["]|[^"])*")/, /^(?:'(\\[']|[^'])*')/, /^(?:@[a-zA-Z]+)/, /^(?:true(?=[%>\s]))/, /^(?:false(?=[%>\s]))/, /^(?:[0-9]+(?=[%>\s]))/, /^(?:[a-zA-Z0-9_$-]+(?=[%>=}\s\/.]))/, /^(?:\[[^\]]*\])/, /^(?:.)/, /^(?:$)/];
+        _.compile = Handlebars.compile;
+
         return Handlebars
     });
\ No newline at end of file
diff --git a/module/web/static/js/utils/lazyRequire.js b/module/web/static/js/utils/lazyRequire.js
index d20d78610..b381e0ce6 100644
--- a/module/web/static/js/utils/lazyRequire.js
+++ b/module/web/static/js/utils/lazyRequire.js
@@ -1,9 +1,9 @@
 // Define the module.
 define(
 	[
-		"require"
+		"require", "underscore"
 	],
-	function( require ){
+	function( require, _ ){
 
 
 		// Define the states of loading for a given set of modules
@@ -31,7 +31,7 @@ define(
 			var state = states.unloaded;
             var args;
 
-			var requireOnce = function( dependencies, loadCallback ){
+			var requireOnce = function(dependencies, loadCallback ){
 
 				// Use the module state to determine which method to
 				// invoke (or just to ignore the invocation).
@@ -80,10 +80,17 @@ define(
 		// -------------------------------------------------- //
 		// -------------------------------------------------- //
 
+        // Set up holder for underscore
+        var instances = {};
+        _.requireOnce = function(dependencies, loadCallback) {
+            if (!_.has(instances, dependencies))
+                instances[dependencies] = lazyRequire.once();
 
-		// Return the module definition.
-		return( lazyRequire );
+            return instances[dependencies](dependencies, loadCallback)
+        };
 
 
+		// Return the module definition.
+		return( lazyRequire );
 	}
 );
\ No newline at end of file