IATIIT-142

devgateway · Nov 30, 2015 · d6bb9b6 · d6bb9b6
1 parent 56deaba
commit d6bb9b6
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 22 deletions.
diff --git a/import-core/import-ui/src/main/webapp/bower.json b/import-core/import-ui/src/main/webapp/bower.json
@@ -2,11 +2,12 @@
   "name": "import-ui",
   "version": "0.0.1",
   "dependencies": {
+    "jquery": "jquery#1.9.1",
     "consolelog": "~2.0.1",
     "html5shiv": "~3.7.2",
     "modernizr": "~2.8.1",
     "normalize.css": "~3.0.1",
-    "es5-shim": "~3.4.0",
+    "es5-shim": "~4.3.1",
     "bootstrap": "~3.3.4",
     "bootstrap-fileinput": "~4.2.0",
     "typeahead.js": "~0.10.5",

diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/home.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/home.jsx
@@ -22,7 +22,7 @@ var Home = React.createClass({
      this.listenTo(systemInfoStore, this.updateSystemInfo); 
      appActions.checkBackendStatus.triggerPromise().then(function(data) {                             
 	    this.updateSystemInfo(data);	    
-      }.bind(this)).catch(function(err) {
+      }.bind(this))["catch"](function(err) {
         this.updateSystemInfo({status:"DOWN"});	
       }.bind(this)); 
   },

diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/reports/import-list.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/reports/import-list.jsx
@@ -37,7 +37,7 @@ var ImportList = React.createClass({
      var params = {size:10, page:this.state.activePage - 1, sort: this.state.sort}
      appActions.loadImportListData(params).then(function(data) {                                       
         this.updateImportList(data);                
-      }.bind(this)).catch(function(err) {       
+      }.bind(this))["catch"](function(err) {       
         console.log('Error loading importList');
      }.bind(this));
   },

diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/reports/import-log.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/reports/import-log.jsx
@@ -41,7 +41,7 @@ var PreviousImports = React.createClass({
      var sortParams = {size:10, page:this.state.activePage - 1}  
      appActions.loadImportLog(this.props.params.id,sortParams).then(function(data) {                                      
         this.updateImportLog(data);                
-      }.bind(this)).catch(function(err) {
+      }.bind(this))["catch"](function(err) {
         console.log('Error loading import logs');
      }.bind(this));
   },

diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/reports/workflow-list.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/reports/workflow-list.jsx
@@ -33,7 +33,7 @@ var WorkflowList = React.createClass({
    loadData: function(){    
      appActions.loadWorkflowData().then(function(data) {                                       
         this.updateWorkflowList(data);                
-      }.bind(this)).catch(function(err) {       
+      }.bind(this))["catch"](function(err) {       
         console.log('Error loading workflows');
      }.bind(this));
   },

diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/choose-fields.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/choose-fields.jsx
@@ -76,7 +76,7 @@ var ChooseFields = React.createClass({
 			this.updateDestinationFields(data);
 			this.destDataLoaded = true; 
 			this.hideLoadingIcon();
-		}.bind(this)).catch(function(err) {
+		}.bind(this))["catch"](function(err) {
 			this.destDataLoaded = true; 
 			this.hideLoadingIcon();        
 			this.errorMsg += this.props.i18nLib.t('wizard.map_fields.msg_error_retrieving_destination_fields');
@@ -87,7 +87,7 @@ var ChooseFields = React.createClass({
 			this.updateSourceFields(data);
 			this.sourceDataLoaded = true;
 			this.hideLoadingIcon();
-		}.bind(this)).catch(function(err) {
+		}.bind(this))["catch"](function(err) {
 			this.sourceDataLoaded = true;
 			this.hideLoadingIcon();        
 			this.errorMsg += this.props.i18nLib.t('wizard.map_fields.msg_error_retrieving_source_fields');  
@@ -98,7 +98,7 @@ var ChooseFields = React.createClass({
 			this.updateFieldMappingStore(data); 
 			this.mappingDataLoaded = true;
 			this.hideLoadingIcon();
-		}.bind(this)).catch(function(err) {
+		}.bind(this))["catch"](function(err) {
 			this.mappingDataLoaded = true;
 			this.hideLoadingIcon();       
 			this.errorMsg += this.props.i18nLib.t('wizard.map_fields.msg_error_retrieving_mappings');  
@@ -107,7 +107,7 @@ var ChooseFields = React.createClass({
 
 		appActions.loadFieldMappingsTemplateList.triggerPromise().then(function(data) {                              
 			this.updateMappingTemplatesData(data); 
-		}.bind(this)).catch(function(err) {			     
+		}.bind(this))["catch"](function(err) {			     
 			this.errorMsg += this.props.i18nLib.t('wizard.map_fields.msg_error_retrieving_templates');
 			this.displayError();			
 		}.bind(this));
@@ -216,7 +216,7 @@ var ChooseFields = React.createClass({
 	reloadTemplateData: function(){
 		appActions.loadFieldMappingsTemplateList.triggerPromise().then(function(data) {                              
 			this.updateMappingTemplatesData(data); 
-		}.bind(this)).catch(function(err) { 
+		}.bind(this))["catch"](function(err) { 
 			this.errorMsg += this.props.i18nLib.t('wizard.map_fields.msg_error_retrieving_templates');
 			this.displayError();
 		}.bind(this));

diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/choose-projects.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/choose-projects.jsx
@@ -124,7 +124,7 @@ var ChooseProjects = React.createClass({
     		} else{
     			this.setState({statusMessage:data.documentMappingStatus.message});
     		}   		                
-    	}.bind(this)).catch(function(err) {
+    	}.bind(this))["catch"](function(err) {
     		this.props.eventHandlers.hideLoadingIcon();    		
     		this.props.eventHandlers.displayError(this.props.i18nLib.t('wizard.choose_projects.msg_error_select_project'));
     	}.bind(this)); 

diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/filter-data.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/filter-data.jsx
@@ -41,7 +41,7 @@ var FilterData = React.createClass({
 			this.updateLanguages(data); 
 			this.languageDataLoaded = true;
 			this.hideLoadingIcon();
-		}.bind(this)).catch(function(err) {       
+		}.bind(this))["catch"](function(err) {       
 			this.languageDataLoaded = true;
 			this.hideLoadingIcon(); 
 			this.errorMsg += this.props.i18nLib.t('wizard.filter_data.msg_error_retrieving_languages');
@@ -52,7 +52,7 @@ var FilterData = React.createClass({
 			this.updateFilters(data);
 			this.filterDataLoaded = true; 
 			this.hideLoadingIcon(); 
-		}.bind(this)).catch(function(err) {
+		}.bind(this))["catch"](function(err) {
 			this.filterDataLoaded = true; 
 			this.hideLoadingIcon(); 
 			this.errorMsg += this.props.i18nLib.t('wizard.filter_data.msg_error_retrieving_filters');

diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/index.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/index.jsx
@@ -46,7 +46,7 @@ var Wizard = React.createClass({
 		    Cookies.set("WORKSPACE", data['team']);
 
 			this.initImportSession(sourceProcessor, destinationProcessor); 
-	      }.bind(this)).catch(function(err) {        
+	      }.bind(this))["catch"](function(err) {        
 	      }.bind(this)); 
 
 	},
@@ -121,7 +121,7 @@ var Wizard = React.createClass({
 			}else{
 				this.transitionTo('projects', this.props.params);
 			}			
-		}.bind(this)).catch(function(err) {
+		}.bind(this))["catch"](function(err) {
 			console.log("Error retrieving values");
 		})
 	},

diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/map-values.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/map-values.jsx
@@ -44,7 +44,7 @@ var MapValues = React.createClass({
       appActions.loadValueMappingData.triggerPromise().then(function(data) {      
         this.props.eventHandlers.hideLoadingIcon();                       
         this.updateValueMappingStore(data); 
-      }.bind(this)).catch(function(err) {        
+      }.bind(this))["catch"](function(err) {        
         this.props.eventHandlers.displayError(this.props.i18nLib.t('wizard.map_values.msg_error_retrieving_value_mappings'));
       }.bind(this));
       this.loadTemplateData();
@@ -106,7 +106,7 @@ var MapValues = React.createClass({
 	loadTemplateData: function(){
 		appActions.loadValueMappingsTemplateList.triggerPromise().then(function(data) {                              
 			this.updateMappingTemplatesData(data); 
-		}.bind(this)).catch(function(err) { 
+		}.bind(this))["catch"](function(err) { 
 			this.props.eventHandlers.displayError(this.props.i18nLib.t('wizard.map_values.msg_error_loading_templates'));
 		}.bind(this));
   },

diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/review-import.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/review-import.jsx
@@ -25,7 +25,7 @@ var ReviewImport = React.createClass({
 			appActions.loadImportSummary.triggerPromise().then(function(data) {                            
 				this.updateImportSummary(data); 			
 				this.props.eventHandlers.hideLoadingIcon();
-			}.bind(this)).catch(function(err) {       
+			}.bind(this))["catch"](function(err) {       
 				this.hideLoadingIcon(); 
 				this.props.eventHandlers.hideLoadingIcon();        
 	    		this.props.eventHandlers.displayError(this.props.i18nLib.t('wizard.review_import.msg_error_retrieving_summary'));     

diff --git a/...re/import-ui/src/main/webapp/client/scripts/components/wizard/save-field-mappings-dlg.jsx b/...re/import-ui/src/main/webapp/client/scripts/components/wizard/save-field-mappings-dlg.jsx
@@ -13,7 +13,7 @@ var SaveMappingsDialog = React.createClass({
             this.props.reloadTemplateData();            
             $('#saveMapFields').modal('hide');
         }            
-     }.bind(this)).catch(function(err) {
+     }.bind(this))["catch"](function(err) {
         this.displayError(this.props.i18nLib.t('wizard.save_field_mappings_dlg.msg_error_saving'));        
      }.bind(this));
     },

diff --git a/...re/import-ui/src/main/webapp/client/scripts/components/wizard/save-value-mappings-dlg.jsx b/...re/import-ui/src/main/webapp/client/scripts/components/wizard/save-value-mappings-dlg.jsx
@@ -29,7 +29,7 @@ var SaveMappingsDialog = React.createClass({
             this.props.reloadTemplateData();            
             $('#saveMapValues').modal('hide');
         }            
-     }.bind(this)).catch(function(err) {
+     }.bind(this))["catch"](function(err) {
         this.displayError(this.props.i18nLib.t('wizard.save_value_mappings_dlg.msg_error_saving'));        
      }.bind(this));
     },

diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/upload-file.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/upload-file.jsx
@@ -57,7 +57,7 @@ var UploadFile = React.createClass({
       appActions.loadFileData.triggerPromise().then(function(data) {      
         this.props.eventHandlers.hideLoadingIcon();                       
         this.updateFileData(data); 
-      }.bind(this)).catch(function(err) {       
+      }.bind(this))["catch"](function(err) {       
         this.props.eventHandlers.hideLoadingIcon(); 
         this.props.eventHandlers.displayError(this.props.i18nLib.t('wizard.upload_file.msg_error_retrieving_files'));
       }.bind(this)); 

diff --git a/import-core/import-ui/src/main/webapp/package.json b/import-core/import-ui/src/main/webapp/package.json
@@ -12,7 +12,7 @@
     "object-assign": "~1.0.0",
     "react": "~0.13.0",
     "react-async": "~2.1.0",
-    "react-router": "~0.13.2",
+    "react-router": "~0.13.4",
     "react-bootstrap": "^0.23.7",
     "reflux": "~0.2.7",
     "superagent": "~0.21.0"