dojo_src 1.4.102 → 1.5.0

data/dojo/dojox/lang/utils.js

@@ -1,20 +1,25 @@
 dojo.provide("dojox.lang.utils");
 
 (function(){
-	var empty = {}, du = dojox.lang.utils;
+	var empty = {}, du = dojox.lang.utils, opts = Object.prototype.toString;
 
 	var clone = function(o){
-		if(dojo.isArray(o)){
-			return dojo._toArray(o);
-		}
-		if(!dojo.isObject(o) || dojo.isFunction(o)){
-			return o;
+		if(o){
+			switch(opts.call(o)){
+				case "[object Array]":
+					return o.slice(0);
+				case "[object Object]":
+					return dojo.delegate(o);
+			}
 		}
-		return dojo.delegate(o);
+		return o;
 	}
 	
 	dojo.mixin(du, {
 		coerceType: function(target, source){
+			// summary: Coerces one object to the type of another.
+			// target: Object: object, which typeof result is used to coerce "source" object.
+			// source: Object: object, which will be forced to change type.
 			switch(typeof target){
 				case "number":	return Number(eval("(" + source + ")"));
 				case "string":	return String(source);
@@ -24,7 +29,7 @@ dojo.provide("dojox.lang.utils");
 		},
 		
 		updateWithObject: function(target, source, conv){
-			// summary: updates an existing object in place with properties from an "source" object.
+			// summary: Updates an existing object in place with properties from an "source" object.
 			// target: Object: the "target" object to be updated
 			// source: Object: the "source" object, whose properties will be used to source the existed object.
 			// conv: Boolean?: force conversion to the original type
@@ -43,7 +48,7 @@ dojo.provide("dojox.lang.utils");
 		},
 	
 		updateWithPattern: function(target, source, pattern, conv){
-			// summary: updates an existing object in place with properties from an "source" object.
+			// summary: Updates an existing object in place with properties from an "source" object.
 			// target: Object: the "target" object to be updated
 			// source: Object: the "source" object, whose properties will be used to source the existed object.
 			// pattern: Array: an array of properties to be copied
@@ -55,6 +60,44 @@ dojo.provide("dojox.lang.utils");
 				}
 			}
 			return target;	// Object
+		},
+		
+		merge: function(object, mixin){
+			// summary: Merge two objects structurally, mixin properties will override object's properties.
+			// object: Object: original object.
+			// mixin: Object: additional object, which properties will override object's properties.
+			if(mixin){
+				var otype = opts.call(object), mtype = opts.call(mixin), t, i, l, m;
+				switch(mtype){
+					case "[object Array]":
+						if(mtype == otype){
+							t = new Array(Math.max(object.length, mixin.length));
+							for(i = 0, l = t.length; i < l; ++i){
+								t[i] = du.merge(object[i], mixin[i]);
+							}
+							return t;
+						}
+						return mixin.slice(0);
+					case "[object Object]":
+						if(mtype == otype && object){
+							t = dojo.delegate(object);
+							for(i in mixin){
+								if(i in object){
+									l = object[i];
+									m = mixin[i];
+									if(m !== l){
+										t[i] = du.merge(l, m);
+									}
+								}else{
+									t[i] = dojo.clone(mixin[i]);
+								}
+							}
+							return t;
+						}
+						return dojo.clone(mixin);
+				}
+			}
+			return mixin;
 		}
 	});
 })();

data/dojo/dojox/layout/ExpandoPane.js

@@ -6,7 +6,7 @@ dojo.require("dijit._Templated");
 dojo.require("dijit._Contained");
 
 dojo.declare("dojox.layout.ExpandoPane",
-	[dijit.layout.ContentPane, dijit._Templated, dijit._Contained],
+	[dijit.layout.ContentPane, dijit._Templated, dijit._Contained, dijit._Container],
 	{
 	// summary: An experimental collapsing-pane for dijit.layout.BorderContainer
 	//
@@ -15,9 +15,9 @@ dojo.declare("dojox.layout.ExpandoPane",
 	//		command, and supports having Layout Children as direct descendants
 	//	
 
-	maxHeight: "",
-	maxWidth: "",
-	splitter: false,
+	//maxHeight: "",
+	//maxWidth: "",
+	//splitter: false,
 	
 	templateString: dojo.cache("dojox.layout","resources/ExpandoPane.html"),
 
@@ -37,6 +37,16 @@ dojo.declare("dojox.layout.ExpandoPane",
 	//		Does this widget start in an open (true) or closed (false) state
 	startExpanded: true, 
 
+	// previewOpacity: Float
+	//		A value from 0 .. 1 indicating the opacity to use on the container
+	//		when only showing a preview
+	previewOpacity: 0.75,
+	
+	// previewOnDblClick: Boolean
+	//		If true, will override the default behavior of a double-click calling a full toggle.
+	//		If false, a double-click will cause the preview to popup
+	previewOnDblClick: false,
+
 	baseClass: "dijitExpandoPane",
 
 	postCreate: function(){
@@ -78,6 +88,15 @@ dojo.declare("dojox.layout.ExpandoPane",
 			overflow: "hidden",
 			padding:0
 		});
+		
+		this.connect(this.domNode, "ondblclick", this.previewOnDblClick ? "preview" : "toggle");
+		
+		if(this.previewOnDblClick){
+			this.connect(this.getParent(), "_layoutChildren", dojo.hitch(this, function(){
+				this._isonlypreview = false;
+			}));
+		}
+		
 	},
 	
 	_startupSizes: function(){
@@ -166,6 +185,15 @@ dojo.declare("dojox.layout.ExpandoPane",
 		];
 	},
 	
+	preview: function(){
+		// summary: Expand this pane in preview mode (does not affect surrounding layout)
+
+		if(!this._showing){
+			this._isonlypreview = !this._isonlypreview;
+		}
+		this.toggle();
+	},
+
 	toggle: function(){
 		// summary: Toggle this pane's visibility
 		if(this._showing){
@@ -192,34 +220,56 @@ dojo.declare("dojox.layout.ExpandoPane",
 	
 	_showEnd: function(){
 		// summary: Common animation onEnd code - "unclose"
-		dojo.style(this.cwrapper, { opacity: 0, visibility:"visible" });
-		dojo.fadeIn({ node:this.cwrapper, duration:227 }).play(1);
+		dojo.style(this.cwrapper, { 
+			opacity: 0,
+			visibility:"visible" 
+		});
+		dojo.anim(this.cwrapper, {
+			opacity: this._isonlypreview ? this.previewOpacity : 1
+		}, 227);
 		dojo.removeClass(this.domNode, "dojoxExpandoClosed");
-		setTimeout(dojo.hitch(this._container, "layout"), 15);
+		if(!this._isonlypreview){
+			setTimeout(dojo.hitch(this._container, "layout"), 15);
+		}else{
+			this._previewShowing = true;
+			this.resize();
+		}
 	},
 	
 	_hideEnd: function(){
 		// summary: Callback for the hide animation - "close"
-		setTimeout(dojo.hitch(this._container, "layout"), 15);
+
+		// every time we hide, reset the "only preview" state
+		if(!this._isonlypreview){
+			setTimeout(dojo.hitch(this._container, "layout"), 25);
+		}else{
+			this._previewShowing = false;
+		}
+		this._isonlypreview = false;
+		
 	},
 	
-	resize: function(/* Object? */psize){
-		// summary: we aren't a layout widget, but need to act like one:
-		//
-		// psize: Object
-		//		The size object optionally passed to us by our parent. 
-		
-		if(!this._hasSizes){ this._startupSizes(psize); }
+	resize: function(/* Object? */newSize, /*Object?*/ currentSize){
+		// summary:
+		//		we aren't a layout widget, but need to act like one:
+		// newSize: Object
+		//		The size object to resize to
+		// currentSize: Object
+		//		The size of my domNode that has already been set (by BorderContainer)
 
+		if(!this._hasSizes){ this._startupSizes(newSize); }
+		
 		// compute size of container (ie, size left over after title bar)
-		// it looks like two marginBox calls, but sometimes psize comes in with only one member
-		var	size = (psize && psize.h) ? psize : dojo.marginBox(this.domNode);
 		this._contentBox = {
-			w: size.w || dojo.marginBox(this.domNode).w,
-			h: size.h - this._titleHeight
-		};
-					
+			w: newSize && "w" in newSize ? newSize.w : currentSize.w,
+			h: (newSize && "h" in newSize ? newSize.h : currentSize.h) - this._titleHeight
+		};	
 		dojo.style(this.containerNode, "height", this._contentBox.h + "px");
+
+		if(newSize){
+			dojo.marginBox(this.domNode, newSize);
+		}
+
 		this._layoutChildren();
 	},
 	

data/dojo/dojox/layout/FloatingPane.js

@@ -1,10 +1,13 @@
 dojo.provide("dojox.layout.FloatingPane");
 dojo.experimental("dojox.layout.FloatingPane"); 
 
-dojo.require("dojox.layout.ContentPane");
+dojo.require("dojo.window");
+
 dojo.require("dijit._Templated"); 
 dojo.require("dijit._Widget"); 
 dojo.require("dojo.dnd.Moveable");
+
+dojo.require("dojox.layout.ContentPane");
 dojo.require("dojox.layout.ResizeHandle"); 
 
 dojo.declare("dojox.layout.FloatingPane", 
@@ -167,7 +170,7 @@ dojo.declare("dojox.layout.FloatingPane",
 	setTitle: function(/* String */ title){
 		// summary: Update the Title bar with a new string
 		dojo.deprecated("pane.setTitle", "Use pane.attr('title', someTitle)", "2.0");
-		this.attr("title", title);
+		this.set("title", title);
 		// this.setTitle = dojo.hitch(this, "setTitle") ?? 
 	},
 		
@@ -230,7 +233,7 @@ dojo.declare("dojox.layout.FloatingPane",
 			setTimeout(dojo.hitch(this,"maximize"),this.duration);
 		}
 		dojo.addClass(this.focusNode,"floatingPaneMaximized");
-		this.resize(dijit.getViewport());
+		this.resize(dojo.window.getBox());
 		this._maximized = true;
 	},
 
@@ -354,7 +357,7 @@ dojo.declare("dojox.layout.Dock",
 				// Give some time for scrollbars to appear/disappear
 				setTimeout(dojo.hitch(this, function() {
 					this._inPositiononing = true;
-					var viewport = dijit.getViewport();
+					var viewport = dojo.window.getBox();
 					var s = this.domNode.style;
 					s.left = viewport.l + "px";
 					s.width = (viewport.w-2) + "px";

data/dojo/dojox/layout/GridContainer.js

@@ -1,1088 +1,621 @@
 dojo.provide("dojox.layout.GridContainer");
-dojo.experimental("dojox.layout.GridContainer");
-
-dojo.require("dijit._base.focus");
-dojo.require("dijit._Templated");
-dojo.require("dijit._Container");
-dojo.require("dijit._Contained");
-dojo.require("dojo.dnd.move");
-dojo.require("dojox.layout.dnd.PlottedDnd");
-
-dojo.declare("dojox.layout.GridContainer",
-	[dijit._Widget, dijit._Templated, dijit._Container, dijit._Contained],
-	{
+
+dojo.require("dojox.layout.GridContainerLite");
+
+dojo.declare(
+	"dojox.layout.GridContainer",
+	dojox.layout.GridContainerLite,
+{
 	// summary:
-	//		The Grid Container is a container of child elements that are placed in a kind of grid.
+	//		A grid containing any kind of objects and acting like web portals.
 	//
 	// description:
-	// 		It displays the child elements by column (ie: the childs widths are fixed by the column width of the grid but the childs heights are free).
-	//		Each child is movable by drag and drop inside the Grid Container.
-	//		The position of other children is automatically calculated when a child is moved
+	//		This component inherits of all features of gridContainerLite plus :
+	//			- Resize colums
+	//			- Add / remove columns
+	//			- Fix columns at left or at right.
+	// example:
+	// 	|	<div dojoType="dojox.layout.GridContainer" nbZones="3" isAutoOrganized="true">
+	// 	|		<div dojoType="dijit.layout.ContentPane">Content Pane 1 : Drag Me !</div>
+	// 	|		<div dojoType="dijit.layout.ContentPane">Content Pane 2 : Drag Me !</div>
+	// 	|		<div dojoType="dijit.layout.ContentPane">Content Pane 3 : Drag Me !</div>
+	// 	|	</div>
 	//
-
-	templateString: dojo.cache("dojox.layout", "resources/GridContainer.html"),
-	isContainer: true,
-
-	//isAutoOrganized: Boolean:
-	//	Define auto organisation of children into the grid container.
-	isAutoOrganized : true,
-
-	//isRightFixed: Boolean
-	//	Define if the right border has a fixed size.
-	isRightFixed:false,
-
-	//isLeftFixed: Boolean
-	//	Define if the left border has a fixed size.
-	isLeftFixed:false,
+	// example:
+	// 	|	dojo.ready(function(){
+	// 	|		var cpane1 = new dijit.layout.ContentPane({ title:"cpane1", content: "Content Pane 1 : Drag Me !" }),
+	// 	|			cpane2 = new dijit.layout.ContentPane({ title:"cpane2", content: "Content Pane 2 : Drag Me !" }),
+	// 	|			cpane3 = new dijit.layout.ContentPane({ title:"cpane3", content: "Content Pane 3 : Drag Me !" });
+	// 	|
+	// 	|		var widget = new dojox.layout.GridContainer({
+	// 	|			nbZones: 3,
+	// 	|			isAutoOrganized: true
+	// 	|		}, dojo.byId("idNode"));
+	// 	|		widget.addChild(cpane1, 0, 0);
+	// 	|		widget.addChild(cpane2, 1, 0);
+	// 	|		widget.addChild(cpane3, 2, 1);
+	// 	|		widget.startup();
+	// 	|	});
 
 	// hasResizableColumns: Boolean
-	//	Allow or not resizing of columns by a grip handle.
-	hasResizableColumns:true,
-
-	// nbZones: Integer
-	//		The number of dropped zones.
-	nbZones:1,
-
-	//opacity: Integer
-	//		Define the opacity of the DnD Avatar.
-	opacity:1,
+	//		Allow or not resizing of columns by a grip handle.
+	hasResizableColumns: true,
 
-	// colWidths: Array
-	//		The percentage widths of columns. If not set, then each column is the same percentage width.
-	colWidths: [],
+	// liveResizeColumns: Boolean
+	//		Specifies whether columns resize as you drag (true) or only upon mouseup (false)
+	liveResizeColumns : false,
 
 	// minColWidth: Integer
 	//		Minimum column width in percentage.
 	minColWidth: 20,
 
 	// minChildWidth: Integer
-	// 		Minimun children with in pixel (only used for IE6 that doesn't handle min-width css property */
-	minChildWidth : 150,
+	// 		Minimum children width in pixel (only used for IE6 which doesn't handle min-width css property)
+	minChildWidth: 150,
 
-	// acceptTypes: Array
-	//		The gridcontainer will only accept the children that fit to the types.
-	//		In order to do that, the child must have a widgetType or a dndType attribute corresponding to the accepted type.*/
-	acceptTypes: [],
-
-	//mode: String
-	// 		location to add columns, must be set to left or right(default)
+	// mode: String
+	//		Location to add/remove columns, must be set to 'left' or 'right' (default).
 	mode: "right",
 
-	//allowAutoScroll: Boolean
-	//	auto-scrolling enable inside the GridContainer
-	allowAutoScroll: false,
-
-	//timeDisplayPopup: Integer
-	// 	display time of popup in miliseconds
-	timeDisplayPopup: 1500,
-
-	//isOffset: Boolean
-	// 	if true : Let the mouse to its original location when moving (allow to specify it proper offset)
-	// 	if false : Current behavior, mouse in the upper left corner of the widget
-	isOffset: false,
-
-	//offsetDrag: Object
-	//	 Allow to specify its own offset (x and y) only when Parameter isOffset is true
-	offsetDrag : {}, //
-
-	//withHandles: Boolean
-	//	Specify if there is a specific drag handle on widgets
-	withHandles: false,
-
-	// handleClasses: Array
-	//	Array of classes of nodes that will act as drag handles
-	handleClasses : [],
-
-	//Contains the DnD widget
-	_draggedWidget: null,
-
-	//_isResized: Boolean
-	//	Determine if user can resizing the widget with the mouse.
-	_isResized: false,
+	// isRightFixed: Boolean
+	//		Define if the last right column is fixed.
+	//		Used when you add or remove columns by calling setColumns method.
+	isRightFixed: false,
 
-	//Contains the node grip to resize widget.
-	_activeGrip: null,
+	// isLeftFixed: Boolean
+	//		Define if the last left column is fixed.
+	//		Used when you add or remove columns by calling setColumns method.
+	isLeftFixed: false,
 
-	// a11y with keyboard is On/Off
-	_a11yOn : false,
-
-	// can display a popup
-	_canDisplayPopup : true,
+	startup: function(){
+		// summary:
+		//		Call the startup of GridContainerLite and place grips
+		//		if user has chosen the hasResizableColumns attribute to true.
 
-	constructor: function(props, node){
-		// FIXME: does this need a "scopeName"
-		props = props || {};
-		this.acceptTypes = props.acceptTypes || ["dijit.layout.ContentPane"];
-		this.offsetDrag = props.offsetDrag || props.dragOffset || { x:0, y:0 };
-	},
-	postCreate: function(){
-		//build columns
+		//console.log("dojox.layout.GridContainer ::: startup");
 		this.inherited(arguments);
-
-		if(this.nbZones === 0){ this.nbZones = 1; }
-
-		// What is this for?
-		if(dojo.isIE && dojo.marginBox(this.gridNode).height){
-			var space = document.createTextNode(" ");
-			this.gridNode.appendChild(space);
-		}
-
-		for(var i = 0; i < this.nbZones; i++){
-			var node = dojo.create("td", {
-				id: this.id + "_dz" + i,
-				className: "gridContainerZone",
-				style: {
-					width: this._getColWidth(i) + "%"
-				}
-			}, this.gridNode);
+		if(this.hasResizableColumns){
+			for(var i = 0; i < this._grid.length - 1; i++){
+				this._createGrip(i);
+			}
+			// If widget has a container parent, grips will be placed
+			// by method onShow.
+			if(!this.getParent()){
+				// Fix IE7 :
+				//		The CSS property height:100% for the grip
+				//		doesn't work anytime. It's necessary to wait
+				//		the end of loading before to place grips.
+				dojo.ready(dojo.hitch(this, "_placeGrips"));
+			}
 		}
 	},
-	startup:function(){
-		this.grid = this._createGrid();
-
-		this.connect(dojo.global, "onresize", "onResized");
-		this.connect(this, "onDndDrop", "_placeGrips");
-		this.dropHandler= dojo.subscribe("/dnd/drop", this, "_placeGrips");
 
-		this._oldwidth = this.domNode.offsetWidth;
-		if(this.hasResizableColumns){
-			this._initPlaceGrips();
+	resizeChildAfterDrop : function(/*Node*/node, /*Object*/targetArea, /*Integer*/indexChild){
+		// summary:
+		//		Call when a child is dropped.
+		// description:
+		//		Allow to resize and put grips
+		// node:
+		//		domNode of dropped widget.
+		// targetArea:
+		//		AreaManager Object containing information of targetArea
+		// indexChild:
+		// 		Index where the dropped widget has been placed
+
+		if(this.inherited(arguments)){
 			this._placeGrips();
 		}
-
-		if(this.usepref !== true){
-			this[(this.isAutoOrganized ? "_organizeServices" : "_organizeServicesManually")]();
-		}
-
-		for(var j = 0; j < this.grid.length; j++){
-			var dz = this.grid[j];
-			dojo.forEach(dz.node.childNodes, function(child){
-				dz.setItem(child.id, {data: child, type: [child.getAttribute("dndType")]});
-			});
-		}
-
-		this.inherited(arguments);
 	},
 
-	destroy: function(){
-		// summary: destroy GridContainer Component.
-		for(var i = 0; i < this.handleDndStart; i++){
-			dojo.disconnect(this.handleDndStart[i]);
-		}
-		dojo.unsubscribe(this.dropHandler);
+	onShow: function(){
+		// summary:
+		//		Place grips in the right place when the GridContainer becomes visible.
+
+		//console.log("dojox.layout.GridContainer ::: onShow");
 		this.inherited(arguments);
+		this._placeGrips();
 	},
 
 	resize: function(){
-		dojo.forEach(this.getChildren(), function(child){
-			child.resize && child.resize();
-		});
-	},
-	getZones: function(){
-		// summary:
-		//   return array of zone (domNode) 
-		return dojo.query(".gridContainerZone",  this.containerNode);
-	},
-	getNewChildren: function(){
-		//TODO call Container getChildren()
-		return dojo.query("> [widgetId]",  this.containerNode).map(dijit.byNode);
-	},
-
-	getChildren: function(){
 		// summary:
-		//      Returns array of children widgets.
-		// description:
-		//      Returns the widgets that are directly under columns.
-		var children = dojo.query(".gridContainerZone > [widgetId]", this.containerNode).map(dijit.byNode); // Widget[]
-		return children;
-	},
+		//		Resize the GridContainer widget and columns.
+		//		Replace grips if it's necessary.
+		// tags:
+		//		callback
 
-	onResized: function(){
-		// summary: Callback method to resize the GridContainer widget and columns
-		if(this.hasResizableColumns){
+		//console.log("dojox.layout.GridContainer ::: resize");
+		this.inherited(arguments);
+		// Fix IE6 :
+		//		IE6 calls method resize itself.
+		//		If the GridContainer is not visible at this time,
+		//		the method _placeGrips can return a negative value with
+		// 		contentBox method. (see method _placeGrip() with Fix Ie6 for the height)
+		if(this._isShown() && this.hasResizableColumns){
 			this._placeGrips();
 		}
 	},
 
-	/***********services methods******************/
-	_organizeServices : function(){
-		//summary: List all zones and insert service into columns.
-		var nbz = this.nbZones,
-			childs = this.getNewChildren(),
-			nbs = childs.length,
-			res = Math.floor(nbs / nbz),
-			mod = nbs % nbz,
-			i = 0;
-		
-		for(var z = 0; z < nbz; z++){
-			for(var r = 0; r < res; r++){
-				this._insertService(z, i, childs[i], true);
-				i++;
-			}
-			if(mod>0){
-				try{
-					this._insertService(z, i, childs[i], true);
-					i++;
+	_createGrip: function(/*Integer*/ index){
+		// summary:
+		//		Create a grip for a specific zone.
+		// index:
+		//		index where the grip has to be created.
+		// tags:
+		//		protected
+
+		//console.log("dojox.layout.GridContainer ::: _createGrip");
+		var dropZone = this._grid[index],
+			grip = dojo.create("div", { 'class': "gridContainerGrip" }, this.domNode);
+		dropZone.grip = grip;
+		dropZone.gripHandler = [
+			this.connect(grip, "onmouseover", function(e){
+				var gridContainerGripShow = false;
+				for(var i = 0; i < this._grid.length - 1; i++){
+					if(dojo.hasClass(this._grid[i].grip, "gridContainerGripShow")){
+						gridContainerGripShow = true;
+						break;
+					}
 				}
-				catch(e){
-					console.error("Unable to insert service in grid container", e, childs);
+				if(!gridContainerGripShow){
+					dojo.removeClass(e.target, "gridContainerGrip");
+					dojo.addClass(e.target, "gridContainerGripShow");
 				}
-				mod--;
-			}else if(res === 0){ break; }
-		}
+			})[0],
+			this.connect(grip, "onmouseout", function(e){
+				if(!this._isResized){
+					dojo.removeClass(e.target, "gridContainerGripShow");
+					dojo.addClass(e.target, "gridContainerGrip");
+				}
+			})[0],
+			this.connect(grip, "onmousedown", "_resizeColumnOn")[0],
+			this.connect(grip, "ondblclick", "_onGripDbClick")[0]
+		];
 	},
 
-	_organizeServicesManually : function (){
-		//summary: Organize Services by column property of widget.
-		var children = this.getNewChildren();
-		for(var i = 0; i < children.length; i++){
-			try{
-				this._insertService(children[i].column - 1, i, children[i], true);
-			}catch(e){
-				console.error("Unable to insert service in grid container", e, children[i]);
+	_placeGrips: function(){
+		// summary:
+		//		Define the position of a grip and place it on page.
+		// tags:
+		//		protected
+
+		//console.log("dojox.layout.GridContainer ::: _placeGrips");
+		var gripWidth, height, left = 0, grip;
+		var scroll = this.domNode.style.overflowY;
+
+		dojo.forEach(this._grid, function(dropZone){
+			if(dropZone.grip){
+				grip = dropZone.grip;
+				if(!gripWidth){
+					gripWidth = grip.offsetWidth / 2;
+				}
+
+				left += dojo.marginBox(dropZone.node).w;
+
+				dojo.style(grip, "left", (left - gripWidth) + "px");
+				//if(dojo.isIE == 6){ do it fot all navigators
+				if(!height){
+					height = dojo.contentBox(this.gridNode).h;
+				}
+				if(height > 0){
+					dojo.style(grip, "height", height + "px");
+				}
+				//}
 			}
-		}
+		}, this);
+	},
 
+	_onGripDbClick: function(){
+		// summary:
+		//		Called when a double click is catch. Resize all columns with the same width.
+		//		The method resize of children have to be called.
+		// tags:
+		//		callback protected
+
+		//console.log("dojox.layout.GridContainer ::: _onGripDbClick");
+		this._updateColumnsWidth(this._dragManager);
+		this.resize();
 	},
 
-	_insertService : function(/*Integer*/z, /*Integer*/p, /*Widget*/service, /*Boolean*/first){
-		//summary: Insert a service in a specific column of the GridContainer widget.
-		// z: zone Index (Column)
-		// p: rowIndex
-		// service: child to insert
-		// first:
+	_resizeColumnOn: function(/*Event*/e){
+		// summary:
+		//		Connect events to listen the resize action.
+		//		Change the type of width columns (% to px).
+		//		Calculate the minwidth according to the children.
+		// tags:
+		//		callback
 
-		if(service === undefined){ return; }
-		var zone = this.getZones()[z];
+		//console.log("dojox.layout.GridContainer ::: _resizeColumnOn", e);
+		this._activeGrip = e.target;
+		this._initX = e.pageX;
+		e.preventDefault();
 
-		var kidsZone = zone.childNodes.length;
-		if(p === undefined || p > kidsZone){ p = kidsZone; }
+		dojo.body().style.cursor = "ew-resize";
 
-		var toto = dojo.place(service.domNode, zone, p);
-		service.domNode.setAttribute("tabIndex", 0);
-		if(!service.dragRestriction){
-			dojo.addClass(service.domNode, "dojoDndItem");
-		}
-		if(!service.domNode.getAttribute("dndType")){
-			service.domNode.setAttribute("dndType", service.declaredClass);
-		}
-		dojox.layout.dnd._setGcDndHandle(service, this.withHandles, this.handleClasses, first);
-		if(this.hasResizableColumns){
-			if(service.onLoad){
-				this.connect(service, "onLoad", "_placeGrips");
-			}
-			if(service.onExecError){
-				this.connect(service, "onExecError", "_placeGrips");
-			}
-			if(service.onUnLoad){
-				this.connect(service, "onUnLoad", "_placeGrips");
-			}
-		}
-		// why calling this eachTime ??
-		this._placeGrips();
-		return service.id; // String
-	},
+		this._isResized = true;
 
-	// FIXME: API change, rename to addChild
-	addService : function(/*Object*/service, /*Integer*/z, /*Integer*/p){
-		return this.addChild(service, z, p);
-	},
-	addChild : function(/*Object*/service, /*Integer*/z, /*Integer*/p){
-		// summary: Add a service (child widget) in a specific column of the GridContainer widget.
-		// service:
-		//  widget to insert
-		// z:
-		//  zone number (column)
-		// p:
-		//  place in the zone (first = 0)
-		
-		service.domNode.id = service.id;
-		// avoid to call dojo.place twice:
-		//this.addChild(service);
-		if(z <= 0){ z = 0; }
-		var column = z || 0;
-		if(p <= 0){ p = 0; }
-		var row = p || 0;
-		var result = this._insertService(column, row, service);
-
-		if(this._started && !service._started){
-			// Check if it work; if add call before started
-			this.grid[z].setItem(service.id, {data: service.domNode, type: [service.domNode.getAttribute("dndType")]});
-			service.startup();
-		}
-		return result; //Object
-	},
+		var tabSize = [];
+		var grid;
+		var i;
 
-	/***********grid methods******************/
-	_createGrid : function(){
-		// summary:
-		//		Create all grid (zones and grip)
-		var grid = [];
-		var i = 0;
-		while(i < this.nbZones){
-			var plottedZone = this._createZone(this.getZones()[i]);
-			if(this.hasResizableColumns && i != (this.nbZones-1)){
-				this._createGrip(plottedZone);
-			}
-			grid.push(plottedZone);
-			i++;
-		}
-		if(this.hasResizableColumns){
-			this.handleDndStart = [];
-			for(var j = 0; j < grid.length; j++){
-				var dz = grid[j];
-				var self = this;
-				this.handleDndStart.push(dojo.connect(dz, "onDndStart", dz, function(source){
-					if(source == this){
-						self.handleDndInsertNodes = [];
-						for(i = 0; i < self.grid.length; i++){
-							self.handleDndInsertNodes.push(dojo.connect(self.grid[i], "insertNodes", self, function(){
-								self._disconnectDnd();
-							}));
-						}
-						self.handleDndInsertNodes.push(dojo.connect(dz, "onDndCancel", self, self._disconnectDnd));
-						self.onResized();
-					}
-				}));
-			}
+		for(i = 0; i < this._grid.length; i++){
+			tabSize[i] = dojo.contentBox(this._grid[i].node).w;
 		}
-		return grid; // Object
-	},
 
-	_disconnectDnd: function(){
-		//summary: disconnect all events on insertNodes
+		this._oldTabSize = tabSize;
 
-		dojo.forEach(this.handleDndInsertNodes, dojo.disconnect);
-		setTimeout(dojo.hitch(this, "onResized"), 0);
-	},
+		for(i = 0; i < this._grid.length; i++){
+			grid = this._grid[i];
+			if(this._activeGrip == grid.grip){
+				this._currentColumn = grid.node;
+				this._currentColumnWidth = tabSize[i];
+				this._nextColumn = this._grid[i + 1].node;
+				this._nextColumnWidth = tabSize[i + 1];
+			}
+			grid.node.style.width = tabSize[i] + "px";
+		}
 
-	_createZone: function(/*Object*/zone){
-		//summary: Create a DnD column.
-		var dz = new dojox.layout.dnd.PlottedDnd(zone.id, {
-			accept:this.acceptTypes,
-			withHandles:this.withHandles,
-			handleClasses: this.handleClasses,
-			singular: true,
-			hideSource:true,
-			opacity: this.opacity,
-			dom: this.domNode,
-			allowAutoScroll: this.allowAutoScroll,
-			isOffset:this.isOffset,
-			offsetDrag : this.offsetDrag
-		});
-		this.connect(dz, "insertDashedZone", "_placeGrips");
-		this.connect(dz, "deleteDashedZone", "_placeGrips");
-		return dz; //plottedDnd Object
-	},
+		// calculate the minWidh of all children for current and next column
+		var calculateChildMinWidth = function(childNodes, minChild){
+			var width = 0;
+			var childMinWidth = 0;
 
-	/************	grips methods***************/
+			dojo.forEach(childNodes, function(child){
+				if(child.nodeType == 1){
+					var objectStyle = dojo.getComputedStyle(child);
+					var minWidth = (dojo.isIE) ? minChild : parseInt(objectStyle.minWidth);
 
-	_createGrip: function(/*Object*/dz){
-		// summary: Create a grip for a specific zone
-		var grip = document.createElement("div");
-		grip.className = "gridContainerGrip";
-		grip.setAttribute("tabIndex", "0");
+					childMinWidth = minWidth +
+								parseInt(objectStyle.marginLeft) +
+								parseInt(objectStyle.marginRight);
 
-		var _this= this;
-		this.onMouseOver = this.connect(grip, "onmouseover", function(e){
-				var gridContainerGripShow = false;
-				for(var i = 0; i < _this.grid.length - 1; i++){
-					if(dojo.hasClass(_this.grid[i].grip, "gridContainerGripShow")){
-						gridContainerGripShow = true;
-						break;
+					if(width < childMinWidth){
+						width = childMinWidth;
 					}
 				}
-				if(!gridContainerGripShow){
-					dojo.removeClass(e.target, "gridContainerGrip");
-					dojo.addClass(e.target, "gridContainerGripShow");
-				}
-			}
-		);
+			});
+			return width;
+		}
+		var currentColumnMinWidth = calculateChildMinWidth(this._currentColumn.childNodes, this.minChildWidth);
 
-		this.connect(grip,"onmouseout",function(e){
-				if(!_this._isResized){
-					dojo.removeClass(e.target, "gridContainerGripShow");
-					dojo.addClass(e.target, "gridContainerGrip");
-				}
-			}
-		);
+		var nextColumnMinWidth = calculateChildMinWidth(this._nextColumn.childNodes, this.minChildWidth);
 
-	 	this.connect(grip,"onmousedown",function(e){
-			_this._a11yOn = false;
-			_this._activeGrip = e.target;
-			_this.resizeColumnOn(e);
-		});
+		var minPix = Math.round((dojo.marginBox(this.gridContainerTable).w * this.minColWidth) / 100);
 
-		this.domNode.appendChild(grip);
-		dz.grip = grip;
-	},
+		this._currentMinCol = currentColumnMinWidth;
+		this._nextMinCol = nextColumnMinWidth;
 
-	_initPlaceGrips: function(){
-		//summary: Initialize the position of a grip which will not change (top)
-		var dcs = dojo.getComputedStyle(this.domNode);
-		this._x = parseInt(dcs.paddingLeft);
-		var _topGrip = parseInt(dcs.paddingTop);
-		if(dojo.isIE || dojo.getComputedStyle(this.gridContainerTable).borderCollapse != "collapse"){
-			var ex = dojo._getBorderExtents(this.gridContainerTable);
-			this._x += ex.l;
-			_topGrip += ex.t
+		if(minPix > this._currentMinCol){
+			this._currentMinCol = minPix;
 		}
-		_topGrip += "px";
-		for(var z = 0; z < this.grid.length; z++){
-			var zone = this.grid[z];
-			if(zone.grip){
-				var grip = zone.grip;
-				if(!dojo.isIE){
-					zone.pad = dojo._getPadBorderExtents(zone.node).w;
-				}
-				grip.style.top = _topGrip;
-			}
+		if(minPix > this._nextMinCol){
+			this._nextMinCol = minPix;
 		}
+		this._connectResizeColumnMove = dojo.connect(dojo.doc, "onmousemove", this, "_resizeColumnMove");
+		this._connectOnGripMouseUp = dojo.connect(dojo.doc, "onmouseup", this, "_onGripMouseUp");
 	},
 
-	_placeGrips: function(){
-		//summary: Define the position of a grip and place it on page.
-
-		var height;
-		var size = this._x;
-
-		dojo.forEach(this.grid, function(zone){
-			if(zone.grip){
-				if(height === undefined){
-					if(this.allowAutoScroll){
-						height = this.gridNode.scrollHeight;
-					}else{
-						height = dojo.contentBox(this.gridNode).h;
-					}
-				}
-				var grip = zone.grip;
-				// Bug margin : IE
-				size += dojo[(dojo.isIE ? "marginBox" : "contentBox")](zone.node).w + (dojo.isIE ? 0 : zone.pad);
-				dojo.style(grip,{
-					left: size + "px",
-					height: height + "px"
-				});
-			}
-		}, this);
-	},
+	_onGripMouseUp: function(){
+		// summary:
+		//		Call on the onMouseUp only if the reiszeColumnMove was not called.
+		// tags:
+		//		callback
 
-	_getZoneByIndex : function(/*Integer*/n){
-		//summary: Return a DOM node containing a zone by given a index.
-		return this.grid[(n >= 0 && n < this.grid.length ? n : 0 )]; //number
-	},
+		//console.log(dojox.layout.GridContainer ::: _onGripMouseUp");
+		dojo.body().style.cursor = "default";
 
-	getIndexZone : function(/*Node*/zone){
-		//summary: Return an integer by given a zone
-		for(var z = 0; z < this.grid.length; z++){
-			if(this.grid[z].node.id == zone.id){
-				return z; // number
-			}
+		dojo.disconnect(this._connectResizeColumnMove);
+		dojo.disconnect(this._connectOnGripMouseUp);
+
+		this._connectOnGripMouseUp = this._connectResizeColumnMove = null;
+
+		if(this._activeGrip){
+			dojo.removeClass(this._activeGrip, "gridContainerGripShow");
+			dojo.addClass(this._activeGrip, "gridContainerGrip");
 		}
-		return -1; // number
-	},
 
-	/***********miscellaneous methods******************/
-	resizeColumnOn : function(/*Event*/e){
-		// summary: Connect events to listen the resize action.
-		//		Change the type of width columns (% to px)
-		//		Calculate the minwidth according to the children
-		var k = dojo.keys;
-		var i;
-		if(!(this._a11yOn && e.keyCode != k.LEFT_ARROW && e.keyCode != k.RIGHT_ARROW)){
-			e.preventDefault();
-			dojo.body().style.cursor = "ew-resize";
-			this._isResized = true;
-			this.initX = e.pageX;
-			var tabSize = [];
-			for(i = 0; i < this.grid.length; i++){
-				tabSize[i] = dojo.contentBox(this.grid[i].node).w;
-			}
-			this.oldTabSize = tabSize;
-
-			for(i = 0; i< this.grid.length; i++){
-				if(this._activeGrip == this.grid[i].grip){
-					this.currentColumn = this.grid[i].node;
-					this.currentColumnWidth = tabSize[i];
-					this.nextColumn = this.currentColumn.nextSibling;
-					this.nextColumnWidth = tabSize[i+1];
-				}
-				this.grid[i].node.style.width = tabSize[i] + "px";
-			}
+		this._isResized = false;
+	},
 
-			// calculate the minWidh of all children for current and next column
-			var calculateChildMinWidth = function(childNodes, minChild){
-				var width = 0;
-				var childMinWidth = 0;
-				dojo.forEach(childNodes, function(child){
-					if(child.nodeType == 1){
-						var objectStyle = dojo.getComputedStyle(child);
-						var minWidth = (dojo.isIE ? minChild : parseInt(objectStyle.minWidth));
+	_resizeColumnMove: function(/*Event*/e){
+		// summary:
+		//		Change columns size.
+		// tags:
+		//		callback
 
-						childMinWidth = minWidth + parseInt(objectStyle.marginLeft)
-									+ parseInt(objectStyle.marginRight);
+		//console.log("dojox.layout.GridContainer ::: _resizeColumnMove");
+		e.preventDefault();
+		if(!this._connectResizeColumnOff){
+			dojo.disconnect(this._connectOnGripMouseUp);
+			this._connectOnGripMouseUp = null;
+			this._connectResizeColumnOff = dojo.connect(dojo.doc, "onmouseup", this, "_resizeColumnOff");
+		}
 
-						if(width < childMinWidth){
-							width = childMinWidth;
-						}
-					}
-				});
-				return width;
-			};
+		var d = e.pageX - this._initX;
+		if(d == 0){ return; }
 
-			var currentColumnMinWidth = calculateChildMinWidth(this.currentColumn.childNodes, this.minChildWidth);
-			var nextColumnMinWidth = calculateChildMinWidth(this.nextColumn.childNodes, this.minChildWidth);
+		if(!(this._currentColumnWidth + d < this._currentMinCol || 
+				this._nextColumnWidth - d < this._nextMinCol)){
 
-			var minPix = Math.round((dojo.marginBox(this.gridContainerTable).w * this.minColWidth) / 100);
-			this.currentMinCol = currentColumnMinWidth;
-			this.nextMinCol = nextColumnMinWidth;
+			this._currentColumnWidth += d;
+			this._nextColumnWidth -= d;
+			this._initX = e.pageX;
+			this._activeGrip.style.left = parseInt(this._activeGrip.style.left) + d + "px";
 
-			if(minPix > this.currentMinCol){
-				this.currentMinCol = minPix;
-			}
-			if(minPix > this.nextMinCol){
-				this.nextMinCol = minPix;
-			}
-			if(this._a11yOn){
-				this.connectResizeColumnMove = this.connect(dojo.doc, "onkeypress", "resizeColumnMove");
-			}else{
-				this.connectResizeColumnMove = this.connect(dojo.doc, "onmousemove", "resizeColumnMove");
-				this.connectResizeColumnOff = this.connect(document, "onmouseup", "resizeColumnOff");
+			if(this.liveResizeColumns){
+				this._currentColumn.style["width"] = this._currentColumnWidth + "px";
+				this._nextColumn.style["width"] = this._nextColumnWidth + "px";
+				this.resize();
 			}
 		}
 	},
 
-	resizeColumnMove: function(/*Event*/e){
-		//summary: Change columns size.
-		var d = 0;
-		if(this._a11yOn){
-			var k = dojo.keys;
-			switch(e.keyCode){
-				case k.LEFT_ARROW:
-					d = -10;
-					break;
-				case k.RIGHT_ARROW:
-					d = 10;
-					break;
-			}
-		}else{
-			e.preventDefault();
-			d = e.pageX - this.initX;
-		}
-		if(d == 0){ return; }
-		if(!(this.currentColumnWidth + d < this.currentMinCol || this.nextColumnWidth - d < this.nextMinCol)){
-			this.currentColumnWidth += d;
-			this.nextColumnWidth -= d;
-			this.initX = e.pageX;
-			this.currentColumn.style["width"] = this.currentColumnWidth + "px";
-			this.nextColumn.style["width"] = this.nextColumnWidth + "px";
-			this._activeGrip.style.left = parseInt(this._activeGrip.style.left) + d + "px";
-			this._placeGrips();
-		}
-		if(this._a11yOn){
-			this.resizeColumnOff(e);
-		}
-	},
+	_resizeColumnOff: function(/*Event*/e){
+		// summary:
+		//		Disconnect resize events.
+		//		Change the type of width columns (px to %).
+		// tags:
+		//		callback
 
-	resizeColumnOff : function(/*Event*/e){
-		//summary: Disconnect resize events.
-		//	Change the type of width columns (px to %)
+		//console.log("dojox.layout.GridContainer ::: _resizeColumnOff");
 		dojo.body().style.cursor = "default";
-		if(this._a11yOn){
-			this.disconnect(this.connectResizeColumnMove);
-			this._a11yOn = false;
-		}else{
-			this.disconnect(this.connectResizeColumnMove);
-			this.disconnect(this.connectResizeColumnOff);
+
+		dojo.disconnect(this._connectResizeColumnMove);
+		dojo.disconnect(this._connectResizeColumnOff);
+
+		this._connectResizeColumnOff = this._connectResizeColumnMove = null;
+
+		if(!this.liveResizeColumns){
+			this._currentColumn.style["width"] = this._currentColumnWidth + "px";
+			this._nextColumn.style["width"] = this._nextColumnWidth + "px";
+			//this.resize();
 		}
 
-		var tabSize = [];
-		var testSize = [];
-		var tabWidth = this.gridContainerTable.clientWidth;
-		var i;
+		var tabSize = [],
+			testSize = [],
+			tabWidth = this.gridContainerTable.clientWidth,
+			node,
+			update = false,
+			i;
 
-		for(i = 0; i < this.grid.length; i++){
-			var _cb = dojo.contentBox(this.grid[i].node);
+		for(i = 0; i < this._grid.length; i++){
+			node = this._grid[i].node;
 			if(dojo.isIE){
-				tabSize[i] = dojo.marginBox(this.grid[i].node).w;
-				testSize[i] = _cb.w;
-			}else{
-				tabSize[i] = _cb.w;
+				tabSize[i] = dojo.marginBox(node).w;
+				testSize[i] = dojo.contentBox(node).w;
+			}
+			else{
+				tabSize[i] = dojo.contentBox(node).w;
 				testSize = tabSize;
 			}
 		}
 
-		var update = false;
 		for(i = 0; i < testSize.length; i++){
-			if(testSize[i] != this.oldTabSize[i]){
+			if(testSize[i] != this._oldTabSize[i]){
 				update = true;
 				break;
 			}
 		}
+
 		if(update){
 			var mul = dojo.isIE ? 100 : 10000;
-			for(i = 0; i < this.grid.length; i++){
-				this.grid[i].node.style.width = Math.round((100 * mul * tabSize[i]) / tabWidth) / mul + "%";
+			for(i = 0; i < this._grid.length; i++){
+				this._grid[i].node.style.width = Math.round((100 * mul * tabSize[i]) / tabWidth) / mul + "%";
 			}
-			this._placeGrips();
+			this.resize();
 		}
 
 		if(this._activeGrip){
 			dojo.removeClass(this._activeGrip, "gridContainerGripShow");
 			dojo.addClass(this._activeGrip, "gridContainerGrip");
 		}
-		this._isResized= false;
+
+		this._isResized = false;
 	},
 
-	setColumns : function(/*Integer*/nbColumns){
-		// summary: Set the number of columns
-		var zone;
+	setColumns: function(/*Integer*/nbColumns){
+		// summary:
+		//		Set the number of columns.
+		// nbColumns:
+		//		Number of columns
+
+		//console.log("dojox.layout.GridContainer ::: setColumns");
+		var z, j;
 		if(nbColumns > 0){
-			var delta = this.grid.length-nbColumns;
+			var length = this._grid.length,
+				delta = length - nbColumns;
 			if(delta > 0){
-				var count = [];
-				var start, end, z, nbChildren, j;
-				/*Check if right or left columns are fixed*/
-				/*Columns are not taken in account and can't be deleted*/
+				var count = [], zone, start, end, nbChildren;
+				// Check if right or left columns are fixed
+				// Columns are not taken in account and can't be deleted
 				if(this.mode == "right"){
-					end = (this.isLeftFixed && this.grid.length > 0) ? 1 : 0;
-					start = this.grid.length - (this.isRightFixed ? 2 : 1);
+					end = (this.isLeftFixed && length > 0) ? 1 : 0;
+					start = (this.isRightFixed) ? length - 2 : length - 1
 					for(z = start; z >= end; z--){
 						nbChildren = 0;
-						zone = this.grid[z].node;
-						for(j = 0;j < zone.childNodes.length; j++){
-							if(zone.childNodes[j].nodeType == 1 && !(zone.childNodes[j].id == "")){ //1 = dojo.html.ELEMENT_NODE
+						zone = this._grid[z].node;
+						for(j = 0; j < zone.childNodes.length; j++){
+							if(zone.childNodes[j].nodeType == 1 && !(zone.childNodes[j].id == "")){
 								nbChildren++;
 								break;
 							}
 						}
-						if(nbChildren == 0){
-							count[count.length] = z;
-						}
-						if(count.length>=delta){
+						if(nbChildren == 0){ count[count.length] = z; }
+						if(count.length >= delta){
 							this._deleteColumn(count);
 							break;
 						}
 					}
 					if(count.length < delta){
-						//Not enough empty columns
-						console.error("Move boxes in first columns, in all tabs before changing the organization of the page");
+						dojo.publish("/dojox/layout/gridContainer/noEmptyColumn", [this]);
 					}
-				}else{ // mode="left"
-					start = (this.isLeftFixed && this.grid.length>0) ? 1 : 0;
-					end = this.grid.length;
-					if(this.isRightFixed){
-						end--;
-					}
-					for(z=start;z<end;z++){
+				}
+				else{ // mode = "left"
+					start = (this.isLeftFixed && length > 0) ? 1 : 0;
+					end = (this.isRightFixed) ? length - 1 : length;
+					for(z = start; z < end; z++){
 						nbChildren = 0;
-						zone = this.grid[z].node;
-						for(j = 0;j < zone.childNodes.length;j++){
-							if(zone.childNodes[j].nodeType == 1 && !(zone.childNodes[j].id == "")){ //1 = dojo.html.ELEMENT_NODE
+						zone = this._grid[z].node;
+						for(j = 0; j < zone.childNodes.length; j++){
+							if(zone.childNodes[j].nodeType == 1 && !(zone.childNodes[j].id == "")){
 								nbChildren++;
 								break;
 							}
 						}
-						if(nbChildren == 0){
-							count[count.length] = z;
-						}
-						if(count.length>=delta){
+						if(nbChildren == 0){ count[count.length] = z; }
+						if(count.length >= delta){
 							this._deleteColumn(count);
 							break;
 						}
 					}
-
-					if(count.length<delta){
+					if(count.length < delta){
 						//Not enough empty columns
-						console.warn("Move boxes in last columns, in all tabs before changing the organization of the page");
+						dojo.publish("/dojox/layout/gridContainer/noEmptyColumn", [this]);
 					}
 				}
-			}else{
-				if(delta<0){ this._addColumn(Math.abs(delta)); }
 			}
-			this._initPlaceGrips();
-			this._placeGrips();
+			else{
+				if(delta < 0){ this._addColumn(Math.abs(delta)); }
+			}
+			if(this.hasResizableColumns){ this._placeGrips(); }
 		}
 	},
 
 	_addColumn: function(/*Integer*/nbColumns){
-		//summary: Add some columns
-		var node;
+		// summary:
+		//		Add some columns.
+		// nbColumns:
+		//		Number of column to added
+		// tags:
+		//		private
+
+		//console.log("dojox.layout.GridContainer ::: _addColumn");
+		var grid = this._grid,
+			dropZone,
+			node,
+			index,
+			length,
+			isRightMode = (this.mode == "right"),
+			accept = this.acceptTypes.join(","),
+			m = this._dragManager;
+
 		//Add a grip to the last column
-		if(this.hasResizableColumns && !this.isRightFixed && this.mode == "right"){
-			node = this.grid[this.grid.length-1];
-			this._createGrip(node);
-		}
+		if(this.hasResizableColumns && ((!this.isRightFixed && isRightMode)
+			|| (this.isLeftFixed && !isRightMode && this.nbZones == 1) )){
+			this._createGrip(grid.length - 1);
+		}
+
+		for(var i = 0; i < nbColumns; i++){
+			// Fix CODEX defect #53025 :
+			//		Apply acceptType attribute on each new column.
+			node = dojo.create("td", {
+				'class': "gridContainerZone dojoxDndArea" ,
+				'accept': accept,
+				'id': this.id + "_dz" + this.nbZones
+			});
 
-		for(var i=0; i<nbColumns; i++){
-			node = dojo.doc.createElement("td");
-			dojo.addClass(node,"gridContainerZone");
-			//to fix IE Bug Border with empty cells
-			node.id = this.id + "_dz" + this.nbZones;
-			var dz;
-			//MODIF MYS
-			if(this.mode == "right"){
+			length = grid.length;
+
+			if(isRightMode){
 				if(this.isRightFixed){
-					this.grid[this.grid.length-1].node.parentNode.insertBefore(node,this.grid[this.grid.length-1].node);
-					dz = this._createZone(node);
-					this.grid.splice(this.grid.length-1,0,dz);
-				}else{
-					var zone = this.gridNode.appendChild(node);
-					dz = this._createZone(node);
-					this.grid.push(dz);
+					index = length - 1;
+					grid.splice(index, 0, {
+						'node': grid[index].node.parentNode.insertBefore(node, grid[index].node) 
+					});
+				}
+				else{
+					index = length;
+					grid.push({ 'node': this.gridNode.appendChild(node) });
 				}
-			}else{
+			}
+			else{
 				if(this.isLeftFixed){
-					(this.grid.length == 1) ? this.grid[0].node.parentNode.appendChild(node,this.grid[0].node) : this.grid[1].node.parentNode.insertBefore(node,this.grid[1].node);
-					dz = this._createZone(node);
-					this.grid.splice(1,0,dz);
-				}else{
-					this.grid[this.grid.length-this.nbZones].node.parentNode.insertBefore(node,this.grid[this.grid.length-this.nbZones].node);
-					dz = this._createZone(node);
-					this.grid.splice(this.grid.length-this.nbZones,0,dz);
+					index = (length == 1) ? 0 : 1;
+					this._grid.splice(1, 0, {
+						'node': this._grid[index].node.parentNode.appendChild(node, this._grid[index].node)
+					});
+					index = 1;
+				}
+				else{
+					index = length - this.nbZones;
+					this._grid.splice(index, 0, {
+						'node': grid[index].node.parentNode.insertBefore(node, grid[index].node)
+					});
 				}
 			}
 			if(this.hasResizableColumns){
-				// add a OnDndStart connect for each added columns
-				var self = this;
-				var handle = dojo.connect(dz, "onDndStart", dz, function(source){
-					if(source == this){
-						self.handleDndInsertNodes = [];
-						for(var o = 0; o < self.grid.length; o++){
-							self.handleDndInsertNodes.push(dojo.connect(self.grid[o], "insertNodes", self, function(){
-								self._disconnectDnd();
-							}));
-						}
-						self.handleDndInsertNodes.push(dojo.connect(dz, "onDndCancel", self, self._disconnectDnd));
-						self.onResized();
-					}
-				});
-				if(this.mode == "right"){
-					if(this.isRightFixed){
-						this.handleDndStart.splice(this.handleDndStart.length - 1, 0, handle);
-					}else{
-						this.handleDndStart.push(handle);
-					}
-				}else{
-					if(this.isLeftFixed){
-						this.handleDndStart.splice(1, 0, handle);
-					}else{
-						this.handleDndStart.splice(this.handleDndStart.length - this.nbZones, 0, handle);
-					}
-				}
 				//Add a grip to resize columns
-				this._createGrip(dz);
+				if((!isRightMode && this.nbZones != 1) ||
+						(!isRightMode && this.nbZones == 1 && !this.isLeftFixed) ||
+							(isRightMode && i < nbColumns-1) ||
+								(isRightMode && i == nbColumns-1 && this.isRightFixed)){
+					this._createGrip(index);
+				}
 			}
+			// register tnbZoneshe new area into the areaManager
+			m.registerByNode(grid[index].node);
 			this.nbZones++;
 		}
-		this._updateColumnsWidth();
+		this._updateColumnsWidth(m);
 	},
 
 	_deleteColumn: function(/*Array*/indices){
-		//summary: Remove some columns with indices passed as an array
-		var zone, child, nbDelZones;
-		nbDelZones = 0;
-		for(var i = 0; i < indices.length; i++){
-			var idx = indices[i];
-			if(this.mode == "right"){
-				zone = this.grid[idx];
-			}else{
-				zone = this.grid[idx - nbDelZones];
-			}
-			for(var j = 0; j < zone.node.childNodes.length; j++){
-				if(zone.node.childNodes[j].nodeType != 1){ continue; } //1 = dojo.html.ELEMENT_NODE
-				child = dijit.byId(zone.node.childNodes[j].id);
-				for(var x = 0; x < this.getChildren().length; x++){
-					if(this.getChildren()[x] === child){
-						this.getChildren().splice(x, 1);
-						break;
-					}
-				}
-			}
-			zone.node.parentNode.removeChild(zone.node);
-			if(this.mode == "right"){
-				if(this.hasResizableColumns){
-					dojo.disconnect(this.handleDndStart[idx]);
-				}
-				this.grid.splice(idx, 1);
-			}else{
-				if(this.hasResizableColumns){
-					dojo.disconnect(this.handleDndStart[idx - nbDelZones]);
-				}
-				this.grid.splice(idx - nbDelZones, 1);
+		// summary:
+		//		Remove some columns with indices passed as an array.
+		// indices:
+		//		Column index array
+		// tags:
+		//		private
+
+		//console.log("dojox.layout.GridContainer ::: _deleteColumn");
+		var child, grid, index,
+			nbDelZones = 0,
+			length = indices.length,
+			m = this._dragManager;
+		for(var i = 0; i < length; i++){
+			index = (this.mode == "right") ? indices[i] : indices[i] - nbDelZones;
+			grid = this._grid[index];
+
+			if(this.hasResizableColumns && grid.grip){
+				dojo.forEach(grid.gripHandler, function(handler){
+					dojo.disconnect(handler);
+				});
+				dojo.destroy(this.domNode.removeChild(grid.grip));
+				grid.grip = null;
 			}
+
+			m.unregister(grid.node);
+			dojo.destroy(this.gridNode.removeChild(grid.node));
+			this._grid.splice(index, 1);
 			this.nbZones--;
 			nbDelZones++;
-			if(zone.grip){
-				this.domNode.removeChild(zone.grip);
-			}
 		}
-		this._updateColumnsWidth();
-	},
 
-	_getColWidth: function(idx){
-		if(idx < this.colWidths.length){
-			return this.colWidths[idx];
+		// last grip
+		var lastGrid = this._grid[this.nbZones-1];
+		if(lastGrid.grip){
+			dojo.forEach(lastGrid.gripHandler, dojo.disconnect);
+			dojo.destroy(this.domNode.removeChild(lastGrid.grip));
+			lastGrid.grip = null;
 		}
-		var totalWidth = 100;
-		dojo.forEach(this.colWidths, function(width){
-			totalWidth -= width;
-		});
-		return totalWidth / (this.nbZones - this.colWidths.length);
-	},
 
-	_updateColumnsWidth: function(){
-		//summary:
-		//		Update the columns width.
-
-		var zone;
-		for(var z = 0; z < this.grid.length; z++){
-			this.grid[z].node.style.width = this._getColWidth(z) + "%";
-	 	}
+		this._updateColumnsWidth(m);
 	},
 
-	_selectFocus: function(/*Event*/event){
-		//summary:
-		//		Enable a11y into the GridContainer :
-		//		- Possibility to move focus into the GridContainer (TAB, LEFT ARROW, RIGHT ARROW, UP ARROW, DOWN ARROW).
-		//		- Possibility to move GridContainer's children (Drag and Drop) with keyboard. (SHIFT +	ARROW).
-		//		If the type of widget is not draggable, a popup is displayed.
-		var e = event.keyCode;
-		var zone = null;
-		var focus = dijit.getFocus();
-		var focusNode = focus.node;
-		var k = dojo.keys;
-		var i, found, accept, r, z, _dndType;
-		var child = (e == k.UP_ARROW || e == k.LEFT_ARROW) ? "lastChild" : "firstChild";
-		var pos = (e == k.UP_ARROW || e == k.LEFT_ARROW) ? "previousSibling" : "nextSibling";
-		if(focusNode == this.containerNode){
-			switch(e){
-				case k.DOWN_ARROW:
-				case k.RIGHT_ARROW:
-					for(i = 0; i < this.gridNode.childNodes.length; i++){
-						zone = this.gridNode.childNodes[i].firstChild;
-						found = false;
-						while(!found){
-							if(zone != null){
-								if(zone.style.display !== "none"){
-									dijit.focus(zone);
-									dojo.stopEvent(event);
-									found = true;
-								}else{
-									zone = zone[pos];
-								}
-							}else{ break; }
-						}
-						if(found){ break; }
-					}
-					break;
-				case k.UP_ARROW:
-				case k.LEFT_ARROW:
-					for(i = this.gridNode.childNodes.length - 1; i >= 0; i--){
-						zone = this.gridNode.childNodes[i].lastChild;
-						found = false;
-						while(!found){
-							if(zone != null){
-								if(zone.style.display !== "none"){
-									dijit.focus(zone);
-									dojo.stopEvent(event);
-									found = true;
-								}else{
-									zone = zone[pos];
-								}
-							}else{ break; }
-						}
-						if(found){ break; }
-					}
-					break;
-			}
-		}else{
-			if(focusNode.parentNode.parentNode == this.gridNode){
-				switch(e){
-					case k.UP_ARROW:
-					case k.DOWN_ARROW:
-						dojo.stopEvent(event);
-						var nbDisplayChild = 0;
-						dojo.forEach(focusNode.parentNode.childNodes, function(child){
-							if(child.style.display !== "none")
-								nbDisplayChild++;
-						});
-						if(nbDisplayChild == 1) return;
-						found = false;
-						zone = focusNode[pos];
-						while(!found){
-							if(zone == null){
-								zone = focusNode.parentNode[child];
-								if(zone.style.display !== "none")
-									found = true;
-								else
-									zone = zone[pos];
-							}else{
-								if(zone.style.display !== "none"){
-									found = true;
-								}else{
-									zone = zone[pos];
-								}
-							}
-						}
-						if(event.shiftKey){
-							if(dijit.byNode(focusNode).dragRestriction)
-								return;
-							_dndType = focusNode.getAttribute("dndtype");
-							accept = false;
-							for(i = 0; i < this.acceptTypes.length; i++){
-								if(_dndType == this.acceptTypes[i]){
-									accept = true;
-									break;
-								}
-							}
-							if(accept){
-								var parent = focusNode.parentNode;
-								var firstChild = parent.firstChild;
-								var lastChild = parent.lastChild;
-								while(firstChild.style.display == "none" || lastChild.style.display == "none"){
-									if(firstChild.style.display == "none"){
-										firstChild = firstChild.nextSibling;
-									}
-									if(lastChild.style.display == "none"){
-										lastChild = lastChild.previousSibling;
-									}
-								}
-								if(e == k.UP_ARROW){
-									r = parent.removeChild(focusNode);
-									if(r == firstChild){
-										parent.appendChild(r);
-									}else{
-										parent.insertBefore(r, zone);
-									}
-									r.setAttribute("tabIndex", "0");
-									dijit.focus(r);
-								}else{
-									if(focusNode == lastChild){
-										r = parent.removeChild(focusNode);
-										parent.insertBefore(r, zone);
-										r.setAttribute("tabIndex", "0");
-										dijit.focus(r);
-									}else{
-										r = parent.removeChild(zone);
-										parent.insertBefore(r, focusNode);
-										focusNode.setAttribute("tabIndex", "0");
-										dijit.focus(focusNode);
-									}
-								}
-							}else{
-								this._displayPopup();
-							}
-						}else{
-							dijit.focus(zone);
-						}
-						break;
-					case k.RIGHT_ARROW:
-					case k.LEFT_ARROW:
-						dojo.stopEvent(event);
-						if(event.shiftKey){
-							if(dijit.byNode(focusNode).dragRestriction){ return; }
-							z = 0;
-							if(focusNode.parentNode[pos] == null){
-								if(e == k.LEFT_ARROW){ z = this.gridNode.childNodes.length - 1; }
-							}else if(focusNode.parentNode[pos].nodeType == 3){
-								z = this.gridNode.childNodes.length - 2;
-							}else{
-								for(i = 0; i < this.gridNode.childNodes.length; i++){
-									if(focusNode.parentNode[pos] == this.gridNode.childNodes[i]){ break; }
-									z++;
-								}
-							}
-							_dndType = focusNode.getAttribute("dndtype");
-							accept = false;
-							for(i = 0; i < this.acceptTypes.length; i++){
-								if(_dndType == this.acceptTypes[i]){
-									accept = true;
-									break;
-								}
-							}
-							if(accept){
-								var parentSource = focusNode.parentNode;
-								var widget = dijit.byNode(focusNode);
-								r = parentSource.removeChild(focusNode);
-								var place = (e == k.RIGHT_ARROW ? 0 : this.gridNode.childNodes[z].length);
-								this.addService(widget, z, place);
-								r.setAttribute("tabIndex", "0");
-								dijit.focus(r);
-								this._placeGrips();
-							}else{
-								this._displayPopup();
-							}
-
-						}else{
-							var node = focusNode.parentNode;
-
-							while(zone === null){
-								if(node[pos] !== null && node[pos].nodeType !== 3){
-									node = node[pos];
-								}else{
-									if(pos === "previousSibling"){
-										node = node.parentNode.childNodes[node.parentNode.childNodes.length - 1];
-									}else{
-										node = node.parentNode.childNodes[0];
-									}
-								}
-								found = false;
-								var tempZone = node[child];
-								while(!found){
-									if(tempZone != null){
-										if(tempZone.style.display !== "none"){
-											zone = tempZone;
-											found = true;
-										}else{
-											tempZone = tempZone[pos];
-										}
-									}else{ break; }
-								}
-							}
-							dijit.focus(zone);
-						}
-					break;
-				}
-			}else{
-				// focus on a grip !
-				if(dojo.hasClass(focusNode,"gridContainerGrip") || dojo.hasClass(focusNode,"gridContainerGripShow")){
-					this._activeGrip = event.target;
-					this._a11yOn = true;
-					this.resizeColumnOn(event);
-				}
-			}
-		}
+	_updateColumnsWidth: function(/*Object*/ manager){
+		// summary:
+		//		Update the columns width.
+		// manager:
+		//		dojox.mdnd.AreaManager singleton
+		// tags:
+		//		private
+
+		//console.log("dojox.layout.GridContainer ::: _updateColumnsWidth");
+	 	this.inherited(arguments);
+		manager._dropMode.updateAreas(manager._areaList);
 	},
 
-	_displayPopup: function(){
-		//summary: display a popup when a widget type can not move
-		if(this._canDisplayPopup){
-			var popup = dojo.doc.createElement("div");
-			dojo.addClass(popup, "gridContainerPopup");
-			popup.innerHTML = "this widget type is not accepted to be moved!"; //TODO: i18n with improved wording, or preferably find an alternate UI
-			var attachPopup = this.containerNode.appendChild(popup);
-			this._canDisplayPopup = false;
-			setTimeout(dojo.hitch(this, function(){
-				this.containerNode.removeChild(attachPopup);
-				dojo.destroy(attachPopup);
-				this._canDisplayPopup = true;
-			}), this.timeDisplayPopup);
-		}
+	destroy: function(){
+		dojo.unsubscribe(this._dropHandler);
+		this.inherited(arguments);
 	}
-
-});
-
-dojo.extend(dijit._Widget, {
-	// dragRestriction: Boolean
-	//		To remove the drag capability.
-	dragRestriction : false,
-
-	// column: String
-	//		Column of the grid to place the widget.
-	column : "1",
-
-	// group: String
-	//		Defines a group belonging.
-	group : ""
-
 });