Browse Source

HPCC-11587 Remove extra lines and add return statements

Those changes are based on the last review comments for better
coding practice.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
wangkx 11 years ago
parent
commit
3428d83fa6

+ 6 - 2
esp/src/eclwatch/PackageMapDetailsWidget.js

@@ -50,7 +50,6 @@ define([
         xmlWidget: null,
         xmlWidgetLoaded: false,
 
-        initalized: false,
         tabId: "",
         packageMap: "",
         target: "",
@@ -105,7 +104,6 @@ define([
 	    if (this.inherited(arguments))
                 return;
 
-            this.initalized = true;
             this.tabId = params.tabId;
             this.packageMap = params.packageMap;
             this.target = params.target;
@@ -148,8 +146,10 @@ define([
                 domClass.replace(context.id + "StateIdImage", "iconRunning");
                 context.active = true;
                 context.refreshActionState();
+                return response;
             }, function (err) {
                 context.showErrors(err);
+                return err;
             });
         },
         _onDeactivate: function (event) {
@@ -162,8 +162,10 @@ define([
                 domClass.replace(context.id + "StateIdImage", "iconArchived");
                 context.active = false;
                 context.refreshActionState();
+                return response;
             }, function (err) {
                 context.showErrors(err);
+                return err;
             });
         },
         _onDelete: function (event) {
@@ -175,8 +177,10 @@ define([
 
                 WsPackageMaps.deletePackageMap(packageMaps).then(function (response) {
                     topic.publish("packageMapDeleted", context.tabId);
+                    return response;
                 }, function (err) {
                     context.showErrors(err);
+                    return err;
                 });
             }
         }

+ 8 - 1
esp/src/eclwatch/PackageMapQueryWidget.js

@@ -276,8 +276,10 @@ define([
                 WsPackageMaps.deletePackageMap(this.packagesGrid.selection.getSelected()).then(function (response) {
                     context.packagesGrid.rowSelectCell.toggleAllSelection(false);
                     context.refreshGrid(response.DeletePackageResponse);
+                    return response;
                 }, function (err) {
                     context.showErrors(err);
+                    return err;
                 });
             }
         },
@@ -286,8 +288,10 @@ define([
             WsPackageMaps.activatePackageMap(this.packagesGrid.selection.getSelected()).then(function (response) {
                 context.packagesGrid.rowSelectCell.toggleAllSelection(false);
                 context.refreshGrid();
+                return response;
             }, function (err) {
                 context.showErrors(err);
+                return err;
             });
         },
         _onDeactivate: function (event) {
@@ -295,8 +299,10 @@ define([
             WsPackageMaps.deactivatePackageMap(this.packagesGrid.selection.getSelected()).then(function (response) {
                 context.packagesGrid.rowSelectCell.toggleAllSelection(false);
                 context.refreshGrid();
+                return response;
             }, function (err) {
                 context.showErrors(err);
+                return err;
             });
         },
 
@@ -329,8 +335,10 @@ define([
                 }
                 context.initPackagesGrid();
                 context.initTabs();
+                return response;
             }, function (err) {
                 context.showErrors(err);
+                return err;
             });
         },
 
@@ -393,7 +401,6 @@ define([
             if (this.inherited(arguments))
                 return;
 
-            this.initalized = true;
             this.params = params;
             this.getSelections();
         },

+ 5 - 3
esp/src/eclwatch/PackageMapValidateContentWidget.js

@@ -42,7 +42,6 @@ define([
         baseClass: "PackageMapValidateContentWidget",
         i18n: nlsHPCC,
 
-        initalized: false,
         targets: null,
 
         targetSelectControl: null,
@@ -91,7 +90,6 @@ define([
             if (this.inherited(arguments))
                 return;
 
-            this.initalized = true;
             if ((params.targets !== undefined) && (params.targets[0].Name !== undefined))
                 this.initSelections(params.targets);
             else
@@ -124,8 +122,10 @@ define([
                     context.targets = response.GetPackageMapSelectOptionsResponse.Targets.TargetData;
                     context.initSelections(context.targets);
                 }
+                return response;
             }, function (err) {
                 context.showErrors(err);
+                return err;
             });
         },
 
@@ -211,9 +211,11 @@ define([
                     responseText = context.i18n.ValidateResult + responseText;
                     context.resultControl.setText(responseText);
                 }
-                    context.validateButton.set("disabled", false);
+                context.validateButton.set("disabled", false);
+                return response;
             }, function (err) {
                 context.showErrors(err);
+                return err;
             });
         },
 

+ 6 - 2
esp/src/eclwatch/PackageMapValidateWidget.js

@@ -42,7 +42,6 @@ define([
         baseClass: "PackageMapValidateWidget",
         i18n: nlsHPCC,
 
-        initalized: false,
         targets: null,
 
         targetSelectControl: null,
@@ -94,8 +93,10 @@ define([
                     context.targets = response.GetPackageMapSelectOptionsResponse.Targets.TargetData;
                     context.initSelections(context.targets);
                 }
+                return response;
             }, function (err) {
                 context.showErrors(err);
+                return err;
             });
         },
 
@@ -104,7 +105,6 @@ define([
 	    if (this.inherited(arguments))
                 return;
 
-            this.initalized = true;
             if (params.params.targets !== undefined)
                 this.initSelections(params.params.targets);
             else
@@ -196,8 +196,10 @@ define([
                     context.editorControl.setText(i18n.NoContent);
                 else
                     context.editorControl.setText(response.GetPackageResponse.Info);
+                return response;
             }, function (err) {
                 context.showErrors(err);
+                return err;
             });
         },
 
@@ -222,8 +224,10 @@ define([
                     context.resultControl.setText(responseText);
                 }
                 context.validateButton.set("disabled", false);
+                return response;
             }, function (err) {
                 context.showErrors(err);
+                return err;
             });
         },