dojo_src 1.4.102 → 1.5.0

data/dojo/dijit/_editor/plugins/FullScreen.js

@@ -1,8 +1,10 @@
 dojo.provide("dijit._editor.plugins.FullScreen");
 
+dojo.require("dojo.window");
+dojo.require("dojo.i18n");
+
 dojo.require("dijit._editor._Plugin");
 dojo.require("dijit.form.Button");
-dojo.require("dojo.i18n");
 
 dojo.requireLocalization("dijit._editor", "commands");
 
@@ -37,15 +39,18 @@ dojo.declare("dijit._editor.plugins.FullScreen",dijit._editor._Plugin,{
 	toggle: function(){
 		// summary:
 		//		Function to allow programmatic toggling of the view.
-		this.button.attr("checked", !this.button.attr("checked"));
+		this.button.set("checked", !this.button.get("checked"));
 	},
 
 	_initButton: function(){
 		// summary:
 		//		Over-ride for creation of the resize button.
-		var strings = dojo.i18n.getLocalization("dijit._editor", "commands");
+		var strings = dojo.i18n.getLocalization("dijit._editor", "commands"),
+			editor = this.editor;
 		this.button = new dijit.form.ToggleButton({
 			label: strings["fullScreen"],
+			dir: editor.dir,
+			lang: editor.lang,
 			showLabel: false,
 			iconClass: this.iconClassPrefix + " " + this.iconClassPrefix + "FullScreen",
 			tabIndex: "-1",
@@ -122,23 +127,26 @@ dojo.declare("dijit._editor.plugins.FullScreen",dijit._editor._Plugin,{
 		//		resizes (window scaled)
 		// tags:
 		//		private
-		var vp = dijit.getViewport();
+		var vp = dojo.window.getBox();
 		dojo.marginBox(this.editor.domNode, {
 			w: vp.w,
 			h: vp.h
 		});
 
 		//Adjust the inernal heights too, as they can be a bit off.
-		var tBox = dojo.marginBox(this.editor.toolbar.domNode);
+		var hHeight = this.editor.getHeaderHeight();
+		var fHeight = this.editor.getFooterHeight();
 		var extents = dojo._getPadBorderExtents(this.editor.domNode);
-
-		//AQdjust it.
-		var cHeight = vp.h - (tBox.h + extents.h);
+		var fcpExtents = dojo._getPadBorderExtents(this.editor.iframe.parentNode);
+		var fcmExtents = dojo._getMarginExtents(this.editor.iframe.parentNode);
+		
+		var cHeight = vp.h - (hHeight + extents.h + fHeight);
 		dojo.marginBox(this.editor.iframe.parentNode, {
-			h: cHeight
+			h: cHeight,
+			w: vp.w
 		});
 		dojo.marginBox(this.editor.iframe, {
-			h: cHeight
+			h: cHeight - (fcpExtents.h + fcmExtents.h)
 		});
 	},
 
@@ -157,7 +165,7 @@ dojo.declare("dijit._editor.plugins.FullScreen",dijit._editor._Plugin,{
 		//		regular view.
 		// tags:
 		//		private
-		var vp = dijit.getViewport();
+		var vp = dojo.window.getBox();
 
 		//Alias this for shorter code.
 		var ed = this.editor;
@@ -196,7 +204,8 @@ dojo.declare("dijit._editor.plugins.FullScreen",dijit._editor._Plugin,{
 				height: domStyle.height || "",
 				top: dojo.style(domNode, "top") || "",
 				left: dojo.style(domNode, "left") || "",
-				position: dojo.style(domNode, "position") || "static"
+				position: dojo.style(domNode, "position") || "static",
+				marginBox: dojo.marginBox(ed.domNode)
 			};
 
 			// Store the iframe state we have to restore later.
@@ -254,7 +263,11 @@ dojo.declare("dijit._editor.plugins.FullScreen",dijit._editor._Plugin,{
 					body.parentNode.style.overflow){
 					this._oldBodyParentOverflow = body.parentNode.style.overflow;
 				}else{
-					this._oldBodyParentOverflow = "scroll";
+					try{
+						this._oldBodyParentOverflow = dojo.style(body.parentNode, "overflow");
+					}catch(e){
+						this._oldBodyParentOverflow = "scroll";
+					}
 				}
 				dojo.style(body.parentNode, "overflow", "hidden");
 			}
@@ -264,7 +277,7 @@ dojo.declare("dijit._editor.plugins.FullScreen",dijit._editor._Plugin,{
 				// function to handle resize events.
 				// Will check current VP and only resize if
 				// different.
-				var vp = dijit.getViewport();
+				var vp = dojo.window.getBox();
 				if("_prevW" in this && "_prevH" in this){
 					// No actual size change, ignore.
 					if(vp.w === this._prevW && vp.h === this._prevH){
@@ -287,45 +300,65 @@ dojo.declare("dijit._editor.plugins.FullScreen",dijit._editor._Plugin,{
 			};
 			this._resizeHandle = dojo.connect(window, "onresize", this, resizer);
 
+			// Also monitor for direct calls to resize and adapt editor.
+			this._resizeHandle2 = dojo.connect(ed, "resize", dojo.hitch(this, function(){
+				if(this._resizer){
+					clearTimeout(this._resizer);
+					delete this._resizer;
+				}
+				this._resizer = setTimeout(dojo.hitch(this, function(){
+					delete this._resizer;
+					this._resizeEditor();
+				}), 10);
+			}));
+
 			// Call it once to work around IE glitchiness.  Safe for other browsers too.
 			this._resizeEditor();
 			var dn = this.editor.toolbar.domNode;
-			setTimeout(function(){dijit.scrollIntoView(dn);}, 250);
+			setTimeout(function(){dojo.window.scrollIntoView(dn);}, 250);
 		}else{
-			// Restore resize function
-			if(this._editorResizeHolder){
-				this.editor.resize = this._editorResizeHolder;
-			}
-
-			if(!this._origState && !this._origiFrameState){
-				// If we actually didn't toggle, then don't do anything.
-				return;
-			}
-			if(ed._fullscreen_oldOnKeyDown){
-				ed.onKeyDown = ed._fullscreen_oldOnKeyDown;
-				delete ed._fullscreen_oldOnKeyDown;
-			}
 			if(this._resizeHandle){
 				// Cleanup resizing listeners
 				dojo.disconnect(this._resizeHandle);
 				this._resizeHandle = null;
 			}
+			if(this._resizeHandle2){
+				// Cleanup resizing listeners
+				dojo.disconnect(this._resizeHandle2);
+				this._resizeHandle2 = null;
+			}
 			if(this._rst){
 				clearTimeout(this._rst);
 				this._rst = null;
 			}
-
+			
 			//Remove all position static class assigns.
 			while(editorParent && editorParent !== dojo.body()){
 				dojo.removeClass(editorParent, "dijitForceStatic");
 				editorParent = editorParent.parentNode;
 			}
+			
+			// Restore resize function
+			if(this._editorResizeHolder){
+				this.editor.resize = this._editorResizeHolder;
+			}
+
+			if(!this._origState && !this._origiFrameState){
+				// If we actually didn't toggle, then don't do anything.
+				return;
+			}
+			if(ed._fullscreen_oldOnKeyDown){
+				ed.onKeyDown = ed._fullscreen_oldOnKeyDown;
+				delete ed._fullscreen_oldOnKeyDown;
+			}
 
 			// Add a timeout to make sure we don't have a resize firing in the
 			// background at the time of minimize.
 			var self = this;
 			setTimeout(function(){
 				// Restore all the editor state.
+				var mb = self._origState.marginBox;
+				var oh = self._origState.height;
 				if(dojo.isIE && !dojo.isQuirks){
 					body.parentNode.style.overflow = self._oldBodyParentOverflow;
 					delete self._oldBodyParentOverflow;
@@ -343,12 +376,18 @@ dojo.declare("dijit._editor.plugins.FullScreen",dijit._editor._Plugin,{
 				delete self._origiFrameState;
 				// In case it is contained in a layout and the layout changed size,
 				// go ahead and call resize.
-				ed.resize();
 				var pWidget = dijit.getEnclosingWidget(ed.domNode.parentNode);
 				if(pWidget && pWidget.resize){
-				    pWidget.resize();
+					pWidget.resize();
+				}else{
+					if(!oh || oh.indexOf("%") < 0){
+						// Resize if the original size wasn't set
+						// or wasn't in percent.  Timeout is to avoid
+						// an IE crash in unit testing.
+						setTimeout(dojo.hitch(this, function(){ed.resize({h: mb.h});}), 0);		
+					}
 				}
-				dijit.scrollIntoView(self.editor.toolbar.domNode);
+				dojo.window.scrollIntoView(self.editor.toolbar.domNode);
 			}, 100);
 		}
 	},
@@ -361,6 +400,11 @@ dojo.declare("dijit._editor.plugins.FullScreen",dijit._editor._Plugin,{
 			dojo.disconnect(this._resizeHandle);
 			this._resizeHandle = null;
 		}
+		if(this._resizeHandle2){
+			// Cleanup resizing listeners
+			dojo.disconnect(this._resizeHandle2);
+			this._resizeHandle2 = null;
+		}
 		if(this._resizer){
 			clearTimeout(this._resizer);
 			this._resizer = null;

data/dojo/dijit/_editor/plugins/LinkDialog.js

@@ -34,6 +34,11 @@ dojo.declare("dijit._editor.plugins.LinkDialog", dijit._editor._Plugin, {
 	//		useful, they are technically valid.
 	urlRegExp: "((https?|ftps?|file)\\://|\./|/|)(/[a-zA-Z]{1,1}:/|)(((?:(?:[\\da-zA-Z](?:[-\\da-zA-Z]{0,61}[\\da-zA-Z])?)\\.)*(?:[a-zA-Z](?:[-\\da-zA-Z]{0,80}[\\da-zA-Z])?)\\.?)|(((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])|(0[xX]0*[\\da-fA-F]?[\\da-fA-F]\\.){3}0[xX]0*[\\da-fA-F]?[\\da-fA-F]|(0+[0-3][0-7][0-7]\\.){3}0+[0-3][0-7][0-7]|(0|[1-9]\\d{0,8}|[1-3]\\d{9}|4[01]\\d{8}|42[0-8]\\d{7}|429[0-3]\\d{6}|4294[0-8]\\d{5}|42949[0-5]\\d{4}|429496[0-6]\\d{3}|4294967[01]\\d{2}|42949672[0-8]\\d|429496729[0-5])|0[xX]0*[\\da-fA-F]{1,8}|([\\da-fA-F]{1,4}\\:){7}[\\da-fA-F]{1,4}|([\\da-fA-F]{1,4}\\:){6}((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])))(\\:\\d+)?(/(?:[^?#\\s/]+/)*(?:[^?#\\s/]+(?:\\?[^?#\\s/]*)?(?:#.*)?)?)?",
 
+	// emailRegExp: [protected] String
+	//		Used for validating input as correct email address.  Taken from dojox.validate
+	emailRegExp:  "<?(mailto\\:)([!#-'*+\\-\\/-9=?A-Z^-~]+[.])*[!#-'*+\\-\\/-9=?A-Z^-~]+" /*username*/ + "@" +  
+        "((?:(?:[\\da-zA-Z](?:[-\\da-zA-Z]{0,61}[\\da-zA-Z])?)\\.)+(?:[a-zA-Z](?:[-\\da-zA-Z]{0,6}[\\da-zA-Z])?)\\.?)|localhost|^[^-][a-zA-Z0-9_-]*>?",	// host.
+
 	// htmlTemplate: [protected] String
 	//		String used for templating the HTML to insert at the desired point.
 	htmlTemplate: "<a href=\"${urlInput}\" _djrealurl=\"${urlInput}\"" +
@@ -48,13 +53,17 @@ dojo.declare("dijit._editor.plugins.LinkDialog", dijit._editor._Plugin, {
 	//		Regular expression used to validate url fragments (ip address, hostname, etc)
 	_hostRxp:  new RegExp("^((([^\\[:]+):)?([^@]+)@)?(\\[([^\\]]+)\\]|([^\\[:]*))(:([0-9]+))?$"),
 
+	// _userAtRxp [private] RegExp
+	//		Regular expression used to validate e-mail address fragment.
+	_userAtRxp: new RegExp("^([!#-'*+\\-\\/-9=?A-Z^-~]+[.])*[!#-'*+\\-\\/-9=?A-Z^-~]+@", "i"),
+
 	// linkDialogTemplate: [protected] String
 	//		Template for contents of TooltipDialog to pick URL
 	linkDialogTemplate: [
 		"<table><tr><td>",
 		"<label for='${id}_urlInput'>${url}</label>",
 		"</td><td>",
-		"<input dojoType='dijit.form.ValidationTextBox' regExp='${urlRegExp}' required='true' " +
+		"<input dojoType='dijit.form.ValidationTextBox' required='true' " +
 		"id='${id}_urlInput' name='urlInput' intermediateChanges='true'>",
 		"</td></tr><tr><td>",
 		"<label for='${id}_textInput'>${text}</label>",
@@ -112,6 +121,16 @@ dojo.declare("dijit._editor.plugins.LinkDialog", dijit._editor._Plugin, {
 		if(this._textInput){
 			this.connect(this._textInput, "onChange", "_checkAndFixInput");
 		}
+
+		// Build up the dual check for http/https/file:, and mailto formats.
+		this._urlRegExp = new RegExp("^" + this.urlRegExp + "$", "i");
+		this._emailRegExp = new RegExp("^" + this.emailRegExp + "$", "i");
+		this._urlInput.isValid = dojo.hitch(this, function(){
+			// Function over-ride of isValid to test if the input matches a url or a mailto style link.
+			var value = this._urlInput.get("value");
+			return this._urlRegExp.test(value) || this._emailRegExp.test(value);
+		});
+
 		this._connectTagEvents();
 		this.inherited(arguments);
 	},
@@ -124,27 +143,36 @@ dojo.declare("dijit._editor.plugins.LinkDialog", dijit._editor._Plugin, {
 		//		not, append http:// to it.  Also validates other fields as determined by
 		//		the internal _isValid function.
 		var self = this;
-		var url = this._urlInput.attr("value");
+		var url = this._urlInput.get("value");
 		var fixupUrl = function(url){
 			var appendHttp = false;
-			if(url && url.length > 7){
+			var appendMailto = false;
+			if(url && url.length > 1){
 				url = dojo.trim(url);
-				if(url.indexOf("/") > 0){
-					if(url.indexOf("://") === -1){
-						// Check that it doesn't start with / or ./, which would
-						// imply 'target server relativeness'
-						if(url.charAt(0) !== '/' && url.indexOf("./") !== 0){
-							if(self._hostRxp.test(url)){
-								appendHttp = true;
+				if(url.indexOf("mailto:") !== 0){
+					if(url.indexOf("/") > 0){
+						if(url.indexOf("://") === -1){
+							// Check that it doesn't start with / or ./, which would
+							// imply 'target server relativeness'
+							if(url.charAt(0) !== '/' && url.indexOf("./") !== 0){
+								if(self._hostRxp.test(url)){
+									appendHttp = true;
+								}
 							}
 						}
+					}else if(self._userAtRxp.test(url)){
+						// If it looks like a foo@, append a mailto.
+						appendMailto = true;
 					}
 				}
 			}
 			if(appendHttp){
-				self._urlInput.attr("value", "http://" + url);
+				self._urlInput.set("value", "http://" + url);
 			}
-			self._setButton.attr("disabled", !self._isValid());
+			if(appendMailto){
+				self._urlInput.set("value", "mailto:" + url);
+			}
+			self._setButton.set("disabled", !self._isValid());
 		};
 		if(this._delayedCheck){
 			clearTimeout(this._delayedCheck);
@@ -175,7 +203,7 @@ dojo.declare("dijit._editor.plugins.LinkDialog", dijit._editor._Plugin, {
 	_setContent: function(staticPanel){
 		// summary:
 		//		Helper for _initButton above.   Not sure why it's a separate method.
-		this.dropDown.attr('content', staticPanel);
+		this.dropDown.set('content', staticPanel);
 	},
 
 	_checkValues: function(args){
@@ -249,7 +277,7 @@ dojo.declare("dijit._editor.plugins.LinkDialog", dijit._editor._Plugin, {
 		//		protected
 		var url, text, target;
 		if(a && a.tagName.toLowerCase() === this.tag){
-			url = a.getAttribute('_djrealurl');
+			url = a.getAttribute('_djrealurl') || a.getAttribute('href');
 			target = a.getAttribute('target') || "_self";
 			text = a.textContent || a.innerText;
 			dojo.withGlobal(this.editor.window, "selectElement", dijit._editor.selection, [a, true]);
@@ -287,8 +315,8 @@ dojo.declare("dijit._editor.plugins.LinkDialog", dijit._editor._Plugin, {
 				"getAncestorElement", dijit._editor.selection, [this.tag]);
 		}
 		this.dropDown.reset();
-		this._setButton.attr("disabled", true);
-		this.dropDown.attr("value", this._getCurrentValues(a));
+		this._setButton.set("disabled", true);
+		this.dropDown.set("value", this._getCurrentValues(a));
 	},
 
 	_onDblClick: function(e){
@@ -303,15 +331,15 @@ dojo.declare("dijit._editor.plugins.LinkDialog", dijit._editor._Plugin, {
 		if(e && e.target){
 			var t = e.target;
 			var tg = t.tagName? t.tagName.toLowerCase() : "";
-			if(tg === this.tag){
-				this.editor.onDisplayChanged();
+			if(tg === this.tag && dojo.attr(t,"href")){
 				dojo.withGlobal(this.editor.window,
 					 "selectElement",
 					 dijit._editor.selection, [t]);
+				this.editor.onDisplayChanged();
 				setTimeout(dojo.hitch(this, function(){
 					// Focus shift outside the event handler.
 					// IE doesn't like focus changes in event handles.
-					this.button.attr("disabled", false);
+					this.button.set("disabled", false);
 					this.button.openDropDown();
 				}), 10);
 			}
@@ -366,7 +394,7 @@ dojo.declare("dijit._editor.plugins.ImgLinkDialog", [dijit._editor.plugins.LinkD
 		//		protected
 		var url, text;
 		if(img && img.tagName.toLowerCase() === this.tag){
-			url = img.getAttribute('_djrealurl');
+			url = img.getAttribute('_djrealurl') || img.getAttribute('src');
 			text = img.getAttribute('alt');
 			dojo.withGlobal(this.editor.window,
 				"selectElement", dijit._editor.selection, [img, true]);
@@ -389,7 +417,9 @@ dojo.declare("dijit._editor.plugins.ImgLinkDialog", [dijit._editor.plugins.LinkD
 		//		Over-ridable function that connects tag specific events.
 		this.inherited(arguments);
 		this.editor.onLoadDeferred.addCallback(dojo.hitch(this, function(){
-			this.connect(this.editor.editNode, "onclick", this._selectTag);
+			// Use onmousedown instead of onclick.  Seems that IE eats the first onclick
+			// to wrap it in a selector box, then the second one acts as onclick.  See #10420
+			this.connect(this.editor.editNode, "onmousedown", this._selectTag);
 		}));
 	},
 
@@ -399,7 +429,7 @@ dojo.declare("dijit._editor.plugins.ImgLinkDialog", [dijit._editor.plugins.LinkD
 		//		makes it easier to select images in a standard way across browsers.  Otherwise
 		//		selecting an image for edit becomes difficult.
 		// e: Event
-		//		The click event.
+		//		The mousedown event.
 		// tags:
 		//		private
 		if(e && e.target){
@@ -428,6 +458,33 @@ dojo.declare("dijit._editor.plugins.ImgLinkDialog", [dijit._editor.plugins.LinkD
 			args.textInput = args.textInput.replace(/"/g, "&quot;");
 		}
 		return args;
+	},
+
+	_onDblClick: function(e){
+		// summary:
+		// 		Function to define a behavior on double clicks on the element
+		//		type this dialog edits to select it and pop up the editor
+		//		dialog.
+		// e: Object
+		//		The double-click event.
+		// tags:
+		//		protected.
+		if(e && e.target){
+			var t = e.target;
+			var tg = t.tagName? t.tagName.toLowerCase() : "";
+			if(tg === this.tag && dojo.attr(t,"src")){
+				dojo.withGlobal(this.editor.window,
+					 "selectElement",
+					 dijit._editor.selection, [t]);
+				this.editor.onDisplayChanged();
+				setTimeout(dojo.hitch(this, function(){
+					// Focus shift outside the event handler.
+					// IE doesn't like focus changes in event handles.
+					this.button.set("disabled", false);
+					this.button.openDropDown();
+				}), 10);
+			}
+		}
 	}
 });
 

data/dojo/dijit/_editor/plugins/NewPage.js

@@ -19,9 +19,12 @@ dojo.declare("dijit._editor.plugins.NewPage",dijit._editor._Plugin,{
 	_initButton: function(){
 		// summary:
 		//		Over-ride for creation of the Print button.
-		var strings = dojo.i18n.getLocalization("dijit._editor", "commands");
+		var strings = dojo.i18n.getLocalization("dijit._editor", "commands"),
+			editor = this.editor;
 		this.button = new dijit.form.Button({
 			label: strings["newPage"],
+			dir: editor.dir,
+			lang: editor.lang,
 			showLabel: false,
 			iconClass: this.iconClassPrefix + " " + this.iconClassPrefix + "NewPage",
 			tabIndex: "-1",
@@ -43,7 +46,9 @@ dojo.declare("dijit._editor.plugins.NewPage",dijit._editor._Plugin,{
 		//		Function to set the content to blank.
 		// tags:
 		//		private
-		this.editor.attr("value", this.content);
+		this.editor.beginEditing();
+		this.editor.set("value", this.content);
+		this.editor.endEditing();
 		this.editor.focus();
 	}
 });

data/dojo/dijit/_editor/plugins/Print.js

@@ -14,9 +14,12 @@ dojo.declare("dijit._editor.plugins.Print",dijit._editor._Plugin,{
 	_initButton: function(){
 		// summary:
 		//		Over-ride for creation of the Print button.
-		var strings = dojo.i18n.getLocalization("dijit._editor", "commands");
+		var strings = dojo.i18n.getLocalization("dijit._editor", "commands"),
+			editor = this.editor;
 		this.button = new dijit.form.Button({
 			label: strings["print"],
+			dir: editor.dir,
+			lang: editor.lang,
 			showLabel: false,
 			iconClass: this.iconClassPrefix + " " + this.iconClassPrefix + "Print",
 			tabIndex: "-1",
@@ -37,7 +40,7 @@ dojo.declare("dijit._editor.plugins.Print",dijit._editor._Plugin,{
 		this.editor.onLoadDeferred.addCallback(
 			dojo.hitch(this, function(){
 				if(!this.editor.iframe.contentWindow["print"]){
-					this.button.attr("disabled", true);
+					this.button.set("disabled", true);
 				}
 			})
 		);
@@ -61,7 +64,7 @@ dojo.declare("dijit._editor.plugins.Print",dijit._editor._Plugin,{
 				// So, open a new 'window', print it, and close it.
 				// Also, can't use size 0x0, have to use 1x1
 				var edDoc = this.editor.document;
-				var content = this.editor.attr("value");
+				var content = this.editor.get("value");
 				content = "<html><head><meta http-equiv='Content-Type' " +
 					"content='text/html; charset='UTF-8'></head><body>" +
 					content + "</body></html>";