#25 select/deselect

gyuque · Feb 4, 2014 · 94008c4 · 94008c4
1 parent db2570c
commit 94008c4
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/inner/js/selection/selection-controller.js b/inner/js/selection/selection-controller.js
@@ -45,8 +45,24 @@ if (!window.mobmap) { window.mobmap={}; }
 			this.fireAfterNewSession();
 		},
 
+		cancelSessionIfType: function(stype, fireAfter) {
+			if (this.currentSelectionSession) {
+				if (this.currentSelectionSession.getType() === stype) {
+					this.disposeCurrentSession();
+
+					if (fireAfter) {
+						this.fireAfterDisposeSession();
+					}
+					return true;
+				}
+			}
+
+			return false;
+		},
+
 		fireSessionDispose: function() { this.callResponders('selWillDisposeCurrentSession'); },
 		fireNewSession: function() { this.callResponders('selWillStartNewSession'); },
+		fireAfterDisposeSession: function() { this.callResponders('selDidDisposeSession'); },
 		fireAfterNewSession: function() { this.callResponders('selDidStartNewSession'); },
 
 		callResponders: function(methodName, arg1, arg2) {
@@ -73,6 +89,7 @@ if (!window.mobmap) { window.mobmap={}; }
 		// name                       | required
 		selWillDisposeCurrentSession  : false,
 		selWillStartNewSession        : false,
+		selDidDisposeSession          : false,
 		selDidStartNewSession         : false
 	};
 

diff --git a/inner/js/ui/edit-toolbar.js b/inner/js/ui/edit-toolbar.js
@@ -86,13 +86,15 @@ if (!window.mobmap) { window.mobmap={}; }
 		onSelectionButtonClick: function(btnObj, e) {
 			switch(btnObj.name) {
 			case 'sel_clear': this.onSelectionClearButtonClick(); break;
+			case 'sel_rect':
+				if (!this.deselectSelectionRectButton()) {
+					this.onSelectionRectButtonDown();
+				}
+				break;
 			}
 		},
 
 		onSelectionButtonMousedown: function(btnObj, e) {
-			switch(btnObj.name) {
-			case 'sel_rect': this.onSelectionRectButtonDown(); break;
-			}
 		},
 
 		onSelectionClearButtonClick: function() {
@@ -108,6 +110,12 @@ if (!window.mobmap) { window.mobmap={}; }
 			}
 		},
 
+		deselectSelectionRectButton: function() {
+			var c = this.getOwnerSelectionController();
+			if (c) { return c.cancelSessionIfType(mobmap.SelectionSessionType.Rect, true); }
+			return false;
+		},
+
 		getOwnerSelectionController: function() {
 			if (!this.ownerApp) {return null;}
 			return this.ownerApp.getSelectionController() || null;
@@ -120,10 +128,14 @@ if (!window.mobmap) { window.mobmap={}; }
 			if (sess) {
 				currentType = sess.getType();
 			}
-			
+
 			this.updateSelectionButtonsState(currentType);
 		},
 
+		selDidDisposeSession: function(selController) {
+			this.updateSelectionButtonsState(mobmap.SelectionSessionType.Unknown);
+		},
+
 		updateSelectionButtonsState: function(currentSessionType) {
 			var sel_name = null;
 			switch(currentSessionType) {
@@ -135,7 +147,6 @@ if (!window.mobmap) { window.mobmap={}; }
 			for (var i = 0;i < len;++i) {
 				var targetName = setButtonNames[i];
 				var btn = this.selectionButtonNameMap[targetName];
-				console.log(targetName , sel_name)
 				btn.setSelectedStyle(targetName === sel_name);
 			}
 		}