Fixed some bugs in MooEditable.UI.PromptDialog - memory leak on event…

…s attaching
cheeaun · Mar 1, 2009 · e44363e · e44363e
1 parent 47588b7
commit e44363e
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/Source/MooEditable/MooEditable.js b/Source/MooEditable/MooEditable.js
@@ -179,7 +179,8 @@ var MooEditable = new Class({
 							mousedown: stop,
 							keydown: stop
 						});
-						self.selection.setRange(range);
+						self.focus();
+						if (range) self.selection.setRange(range);
 					}
 				});
 			});
@@ -859,8 +860,9 @@ MooEditable.UI.Dialog = new Class({
 		return this;
 	},
 
-	open: function(){
+	open: function(fn){
 		this.el.setStyle('display', '');
+		fn.attempt(null, this);
 		this.fireEvent('open', this);
 		return this;
 	},
@@ -1024,22 +1026,19 @@ MooEditable.Actions = new Hash({
 		},
 		dialogs: {
 			alert: MooEditable.UI.AlertDialog('Please select the text you wish to hyperlink.'),
-			prompt: MooEditable.UI.PromptDialog('Enter URL', 'http://')
+			prompt: MooEditable.UI.PromptDialog('Enter URL', 'http://', function(url){
+				this.execute('createlink', false, url.trim());
+			})
 		},
 		command: function(){
 			if (this.selection.isCollapsed()){
 				this.dialogs.createlink.alert.open();
 			} else {
 				var text = this.selection.getText();
 				var url = /^(https?|ftp|rmtp|mms):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)(:(\d+))?\/?/i;
-				this.dialogs.createlink.prompt.addEvents({
-					open: function(){
-						if (url.test(text)) this.el.getElement('.mooeditable-dialog-input').set('value', text);
-					},
-					clickOK: function(url){
-						this.execute('createlink', false, url.trim());
-					}
-				}).open();
+				this.dialogs.createlink.prompt.open(function(){
+					if (url.test(text)) this.el.getElement('.mooeditable-dialog-input').set('value', text);
+				});
 			}
 		}
 	},