CLOUDSTACK-6852: UI - modules - remove variable drModuleIncluded.

Jessica Wang · Jessica Wang · commit 3acebf230cf5 · 2014-06-13T15:21:16.000-07:00
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
@@ -489,9 +489,6 @@
             };
         }
 
-        document.title = _l('label.app.name');
-               
-        // set value to global variable
-        drModuleIncluded = isModuleIncluded("dr");     
+        document.title = _l('label.app.name');            
     });
 })(cloudStack, jQuery);
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
@@ -49,8 +49,6 @@ var md5HashedLogin = false;
 var pageSize = 20;
 //var pageSize = 1; //for testing only
 
-var drModuleIncluded = false;
-
 //async action
 var pollAsyncJobResult = function(args) {
     $.ajax({
@@ -1176,7 +1174,7 @@ function listViewDataProvider(args, data, options) {
 }
 
 var addExtraPropertiesIfDrModuleIncluded = function(jsonObj, resourceType) {      
-    if (drModuleIncluded) {
+    if (isModuleIncluded("dr")) {
         $.ajax({
             url: createURL("listResourceDetails"),
             data: {
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
@@ -906,7 +906,7 @@
                                                 }
 
                                                 var volumeDrEnabled = false;                                               
-                                                if (drModuleIncluded) {
+                                                if (isModuleIncluded("dr")) {
                                                     volumeDrEnabled = cloudStack.dr.sharedFunctions.isVolumeDrEnabled(args.context.volumes[0]);                                                    
                                                 }    
                                                 
@@ -920,7 +920,7 @@
                                                         success: function(json) {
                                                             var instanceObjs = json.listvirtualmachinesresponse.virtualmachine;
                                                             $(instanceObjs).each(function() {
-                                                                if (drModuleIncluded) {
+                                                                if (isModuleIncluded("dr")) {
                                                                     var vmDrEnabled = cloudStack.dr.sharedFunctions.isVmDrEnabled(this);
                                                                     if (vmDrEnabled == volumeDrEnabled) {
                                                                 items.push({
