Merge branch 'new-Dialog'

IPS-LMU · Dec 22, 2014 · c6b20e2 · c6b20e2
2 parents 7546be5 + 456c650
commit c6b20e2
Show file tree

Hide file tree

Showing 83 changed files with 1,676 additions and 1,266 deletions.
diff --git a/app/index.html b/app/index.html
@@ -57,6 +57,7 @@
     <link rel="stylesheet" href="styles/historyActionPopup.css">
     <link rel="stylesheet" href="styles/hierarchy.css">
     <link rel="stylesheet" href="styles/print.css">
+    <link rel="stylesheet" href="styles/modal.css">
     <!-- endbuild -->
 
     <!-- set basedir for angular app change if not running in root of server-->
@@ -136,17 +137,12 @@
     <script src="scripts/services/LevelService.js"></script>
     <script src="scripts/services/LinkService.js"></script>
     <script src="scripts/services/websocketHandler.js"></script>
-    <script src="scripts/controllers/wsConnection.js"></script>
     <script src="scripts/services/binaryDataManipHelper.js"></script>
-    <script src="scripts/services/dialogService.js"></script>
     <script src="scripts/services/appCacheHandler.js"></script>
     <script src="scripts/controllers/spectSettings.js"></script>
-    <script src="scripts/controllers/confirmModal.js"></script>
-    <script src="scripts/controllers/SelectThresholdModalCtrl.js"></script>
-    <script src="scripts/controllers/SelectLabelModalCtrl.js"></script>
     <script src="scripts/filters/regexFilter.js"></script>
     <script src="scripts/filters/levelsFilter.js"></script>
-    <script src="scripts/controllers/modal.js"></script>
+    <script src="scripts/controllers/ModalCtrl.js"></script>
     <script src="scripts/directives/toggleRightSideBar.js"></script>
     <script src="scripts/directives/toggle2dCanvases.js"></script>
     <script src="scripts/directives/splitPaneView.js"></script>
@@ -179,6 +175,8 @@
     <script src="scripts/workers/spectroDrawingWorkerClass.js"></script>
     <script src="scripts/workers/ssffParserWorkerClass.js"></script>
     <script src="scripts/services/mathhelperservice.js"></script>
+    <script src="scripts/directives/modal.js"></script>
+    <script src="scripts/services/modalService.js"></script>
     <!-- endbuild -->
 
 </body>

diff --git a/app/intro.html b/app/intro.html
@@ -58,6 +58,7 @@
     <link rel="stylesheet" href="styles/hierarchy.css">
     <link rel="stylesheet" href="styles/print.css">
     <link rel="stylesheet" href="styles/intro.css">
+    <link rel="stylesheet" href="styles/modal.css">
     <!-- endbuild -->
 
     <!-- set basedir for angular app change if not running in root of server-->
@@ -129,17 +130,13 @@
     <script src="scripts/services/LevelService.js"></script>
     <script src="scripts/services/LinkService.js"></script>
     <script src="scripts/services/websocketHandler.js"></script>
-    <script src="scripts/controllers/wsConnection.js"></script>
     <script src="scripts/services/binaryDataManipHelper.js"></script>
-    <script src="scripts/services/dialogService.js"></script>
+    <script src="scripts/services/modalService.js"></script>
     <script src="scripts/services/appCacheHandler.js"></script>
     <script src="scripts/controllers/spectSettings.js"></script>
-    <script src="scripts/controllers/confirmModal.js"></script>
-    <script src="scripts/controllers/SelectThresholdModalCtrl.js"></script>
-    <script src="scripts/controllers/SelectLabelModalCtrl.js"></script>
     <script src="scripts/filters/regexFilter.js"></script>
     <script src="scripts/filters/levelsFilter.js"></script>
-    <script src="scripts/controllers/modal.js"></script>
+    <script src="scripts/controllers/ModalCtrl.js"></script>
     <script src="scripts/directives/toggleRightSideBar.js"></script>
     <script src="scripts/directives/toggle2dCanvases.js"></script>
     <script src="scripts/directives/splitPaneView.js"></script>
@@ -171,6 +168,7 @@
     <script src="scripts/workers/spectroDrawingWorkerClass.js"></script>
     <script src="scripts/workers/ssffParserWorkerClass.js"></script>
     <script src="scripts/services/mathhelperservice.js"></script>
+    <script src="scripts/directives/modal.js"></script>
     <!-- endbuild -->
 
 </body>

diff --git a/app/scripts/controllers/Login.js b/app/scripts/controllers/Login.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('emuwebApp')
-	.controller('LoginCtrl', function ($scope, $rootScope, $http, ConfigProviderService, Iohandlerservice, viewState, dialogService) {
+	.controller('LoginCtrl', function ($scope, $rootScope, $http, ConfigProviderService, Iohandlerservice, viewState, modalService) {
 
 		$scope.loginData = {
 			'username': '',
@@ -16,7 +16,7 @@ angular.module('emuwebApp')
 
 			Iohandlerservice.logOnUser($scope.loginData.username, $scope.loginData.password).then(function (res) {
 				if (res === 'LOGGEDON') {
-					dialogService.close(true);
+					modalService.close();
 				} else {
 					$scope.loginData.errorMsg = 'ERROR: ' + res;
 				}
@@ -45,6 +45,6 @@ angular.module('emuwebApp')
 		 *
 		 */
 		$scope.cancel = function () {
-			dialogService.close(false);
+			modalService.close();
 		};
 	});
diff --git a/app/scripts/controllers/modal.js → app/scripts/controllers/ModalCtrl.js b/app/scripts/controllers/modal.js → app/scripts/controllers/ModalCtrl.js
@@ -1,17 +1,12 @@
 'use strict';
 
 angular.module('emuwebApp')
-	.controller('ModalCtrl', function ($scope, dialogService, passedInTxt, viewState, LevelService, HistoryService, ConfigProviderService) {
+	.controller('ModalCtrl', function ($scope, ArrayHelperService, modalService, viewState, LevelService, HistoryService, ConfigProviderService) {
 
 		$scope.cps = ConfigProviderService;
-		$scope.passedInTxt = passedInTxt;
-		$scope.passedOutTxt = {
-			'var': null,
-		};
-
-		$scope.cancel = function () {
-			dialogService.close();
-		};
+		$scope.data = undefined;
+
+		//$scope.myData = ArrayHelperService.convertArrayToXYjsoArray(modalService.dataIn.y);
 
 		/**
 		 *
@@ -33,32 +28,31 @@ angular.module('emuwebApp')
 		 *  Save changes made on SSFF
 		 */
 		$scope.saveChanges = function (name) {
-			dialogService.close('saveChanges');
+			modalService.close('saveChanges');
 		};
 
 
 		/**
 		 *  Save changes made on SSFF
 		 */
 		$scope.discardChanges = function (name) {
-			dialogService.close('discardChanges');
+			modalService.close('discardChanges');
 		};
 
 
 		/**
 		 *  Rename a level
 		 */
 		$scope.renameLevel = function () {
-
-			LevelService.renameLevel($scope.passedInTxt, $scope.passedOutTxt.var, viewState.curPerspectiveIdx);
+			LevelService.renameLevel(modalService.dataIn, $scope.data, viewState.curPerspectiveIdx);
 			HistoryService.addObjToUndoStack({
 				'type': 'ANNOT',
 				'action': 'RENAMELEVEL',
-				'newname': $scope.passedOutTxt.var,
-				'name': $scope.passedInTxt,
+				'newname': $scope.data,
+				'name': modalService.dataIn,
 				'curPerspectiveIdx': viewState.curPerspectiveIdx
 			});
-			dialogService.close();
+			modalService.close();
 		};
 
 		/**
@@ -74,7 +68,7 @@ angular.module('emuwebApp')
 				'id': viewState.getcurClickLevelIndex(),
 				'curPerspectiveIdx': viewState.curPerspectiveIdx
 			});
-			dialogService.close();
+			modalService.close();
 		};
 
 	});
diff --git a/app/scripts/controllers/SelectLabelModalCtrl.js b/app/scripts/controllers/SelectLabelModalCtrl.js
diff --git a/app/scripts/controllers/SelectThresholdModalCtrl.js b/app/scripts/controllers/SelectThresholdModalCtrl.js
diff --git a/app/scripts/controllers/ShowHierarchy.js b/app/scripts/controllers/ShowHierarchy.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('emuwebApp')
-	.controller('ShowhierarchyCtrl', function ($scope, DataService, viewState, dialogService, ConfigProviderService, LevelService, HierarchyLayoutService) {
+	.controller('ShowhierarchyCtrl', function ($scope, DataService, viewState, modalService, ConfigProviderService, LevelService, HierarchyLayoutService) {
 
 		// Scope data
 
@@ -110,7 +110,7 @@ angular.module('emuwebApp')
 
 			traverse (DataService.getData());
 
-			dialogService.close();
+			modalService.close();
 			viewState.showHierarchy();
 		};
 	});
diff --git a/app/scripts/controllers/confirmModal.js b/app/scripts/controllers/confirmModal.js
diff --git a/app/scripts/controllers/export.js b/app/scripts/controllers/export.js
@@ -1,26 +1,17 @@
 'use strict';
 
 angular.module('emuwebApp')
-	.controller('ExportCtrl', function ($scope, dialogService, exportData, exportName, viewState, HistoryService) {
+	.controller('ExportCtrl', function ($scope, modalService, browserDetector, viewState, HistoryService) {
 
-		$scope.exportData = exportData;
-		$scope.exportName = exportName;
-		$scope.firefox = (navigator.userAgent.match(/Firefox/i) ? true: false);
-
-		/**
-		 *
-		 */
-		$scope.cancel = function () {
-			dialogService.close();
-		};
+		$scope.firefox = browserDetector.isBrowser.Firefox();
 
 		/**
 		 *
 		 */
 		$scope.getBlob = function(){
 		    var blob;
 		    try {
-		        blob = new Blob([$scope.exportData], {type: 'text/plain'});
+		        blob = new Blob([modalService.dataExport], {type: 'text/plain'});
 		    } catch (e) { // Backwards-compatibility
 		        window.BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder;
 		        blob = new BlobBuilder();
@@ -63,8 +54,8 @@ angular.module('emuwebApp')
 		    } else {
 		        objURL = URL.createObjectURL($scope.getBlob());
 		    }		
-		    $scope.SaveToDisk(objURL, $scope.exportName);
-		    dialogService.close();
+		    $scope.SaveToDisk(objURL, modalService.dataIn);
+		    modalService.close();
 		};
 
 		/**