richfaces-svn-commits
November 2011
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 160 discussions
JBoss Rich Faces SVN: r22986 - in modules/docs/trunk: Component_Development_Kit_Guide and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: bleathem
Date: 2011-11-23 10:58:39 -0500 (Wed, 23 Nov 2011)
New Revision: 22986
Modified:
modules/docs/trunk/Component_Development_Kit_Guide/pom.xml
modules/docs/trunk/Component_Reference/pom.xml
modules/docs/trunk/Developer_Guide/pom.xml
modules/docs/trunk/Migration_Guide/pom.xml
modules/docs/trunk/parent/pom.xml
modules/docs/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 4.1.0.CR1
Modified: modules/docs/trunk/Component_Development_Kit_Guide/pom.xml
===================================================================
--- modules/docs/trunk/Component_Development_Kit_Guide/pom.xml 2011-11-23 15:26:54 UTC (rev 22985)
+++ modules/docs/trunk/Component_Development_Kit_Guide/pom.xml 2011-11-23 15:58:39 UTC (rev 22986)
@@ -4,14 +4,14 @@
<groupId>org.richfaces.docs</groupId>
<artifactId>richfaces-cdk-guide</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.CR1</version>
<packaging>jdocbook</packaging>
<name>RichFaces CDK Guide</name>
<parent>
<groupId>org.richfaces.docs</groupId>
<artifactId>docs-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.CR1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -106,9 +106,9 @@
</profiles>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Compo...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/Componen...</developerConnection>
- <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/Component_De...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.1.0....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.1.0.CR1...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.1.0.CR1/Com...</url>
</scm>
</project>
Modified: modules/docs/trunk/Component_Reference/pom.xml
===================================================================
--- modules/docs/trunk/Component_Reference/pom.xml 2011-11-23 15:26:54 UTC (rev 22985)
+++ modules/docs/trunk/Component_Reference/pom.xml 2011-11-23 15:58:39 UTC (rev 22986)
@@ -4,14 +4,14 @@
<groupId>org.richfaces.docs</groupId>
<artifactId>richfaces-component-reference</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.CR1</version>
<packaging>jdocbook</packaging>
<name>RichFaces Component Reference</name>
<parent>
<groupId>org.richfaces.docs</groupId>
<artifactId>docs-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.CR1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -106,9 +106,9 @@
</profiles>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Compo...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/Componen...</developerConnection>
- <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/Component_Re...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.1.0....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.1.0.CR1...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.1.0.CR1/Com...</url>
</scm>
</project>
Modified: modules/docs/trunk/Developer_Guide/pom.xml
===================================================================
--- modules/docs/trunk/Developer_Guide/pom.xml 2011-11-23 15:26:54 UTC (rev 22985)
+++ modules/docs/trunk/Developer_Guide/pom.xml 2011-11-23 15:58:39 UTC (rev 22986)
@@ -4,14 +4,14 @@
<groupId>org.richfaces.docs</groupId>
<artifactId>richfaces-developer-guide</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.CR1</version>
<packaging>jdocbook</packaging>
<name>RichFaces Developer Guide</name>
<parent>
<groupId>org.richfaces.docs</groupId>
<artifactId>docs-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.CR1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -107,9 +107,9 @@
</profiles>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Devel...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/Develope...</developerConnection>
- <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/Developer_Guide</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.1.0....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.1.0.CR1...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.1.0.CR1/Dev...</url>
</scm>
</project>
Modified: modules/docs/trunk/Migration_Guide/pom.xml
===================================================================
--- modules/docs/trunk/Migration_Guide/pom.xml 2011-11-23 15:26:54 UTC (rev 22985)
+++ modules/docs/trunk/Migration_Guide/pom.xml 2011-11-23 15:58:39 UTC (rev 22986)
@@ -4,14 +4,14 @@
<groupId>org.richfaces.docs</groupId>
<artifactId>richfaces-migration-guide</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.CR1</version>
<packaging>jdocbook</packaging>
<name>RichFaces Migration Guide</name>
<parent>
<groupId>org.richfaces.docs</groupId>
<artifactId>docs-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.CR1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -107,9 +107,9 @@
</profiles>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/Migra...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/Migratio...</developerConnection>
- <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/Migration_Guide</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.1.0....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.1.0.CR1...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.1.0.CR1/Mig...</url>
</scm>
</project>
Modified: modules/docs/trunk/parent/pom.xml
===================================================================
--- modules/docs/trunk/parent/pom.xml 2011-11-23 15:26:54 UTC (rev 22985)
+++ modules/docs/trunk/parent/pom.xml 2011-11-23 15:58:39 UTC (rev 22986)
@@ -28,7 +28,7 @@
<groupId>org.richfaces.docs</groupId>
<artifactId>docs-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.CR1</version>
<name>Richfaces Docs: Parent</name>
<packaging>pom</packaging>
<url>http://richfaces.org</url>
@@ -219,8 +219,8 @@
-->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk/parent</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk/parent</developerConnection>
- <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk/parent</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.1.0....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.1.0.CR1...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.1.0.CR1/parent</url>
</scm>
</project>
Modified: modules/docs/trunk/pom.xml
===================================================================
--- modules/docs/trunk/pom.xml 2011-11-23 15:26:54 UTC (rev 22985)
+++ modules/docs/trunk/pom.xml 2011-11-23 15:58:39 UTC (rev 22986)
@@ -9,7 +9,7 @@
<groupId>org.richfaces.docs</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.CR1</version>
<packaging>pom</packaging>
<name>RichFaces Document Aggregator</name>
@@ -22,9 +22,9 @@
</modules>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/docs/tags/4.1.0.CR1</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/docs/tags/4.1.0.CR1</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/modules/docs/tags/4.1.0.CR1</url>
</scm>
</project>
12 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r22985 - sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: blabno
Date: 2011-11-23 10:26:54 -0500 (Wed, 23 Nov 2011)
New Revision: 22985
Modified:
sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/jquery.ui.sortable.js
Log:
fixed formatting of jquery.ui.sortable.js
Modified: sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/jquery.ui.sortable.js
===================================================================
--- sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/jquery.ui.sortable.js 2011-11-23 15:21:04 UTC (rev 22984)
+++ sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/jquery.ui.sortable.js 2011-11-23 15:26:54 UTC (rev 22985)
@@ -12,8 +12,7 @@
* jquery.ui.mouse.js
* jquery.ui.widget.js
*/
-(function($, undefined)
-{
+(function($, undefined) {
$.widget("ui.sortable", $.ui.mouse, {
widgetEventPrefix: "sort",
@@ -41,8 +40,7 @@
tolerance: "intersect",
zIndex: 1000
},
- _create: function()
- {
+ _create: function() {
var o = this.options;
this.containerCache = {};
@@ -52,8 +50,7 @@
this.refresh();
//Let's determine if the items are being displayed horizontally
- this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this
- .items[0].item.css('display')) : false;
+ this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
//Let's determine the parent's offset
this.offset = this.element.offset();
@@ -63,20 +60,20 @@
},
- destroy: function()
- {
- this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");
+ destroy: function() {
+ this.element
+ .removeClass("ui-sortable ui-sortable-disabled")
+ .removeData("sortable")
+ .unbind(".sortable");
this._mouseDestroy();
- for (var i = this.items.length - 1; i >= 0; i--) {
+ for (var i = this.items.length - 1; i >= 0; i--)
this.items[i].item.removeData("sortable-item");
- }
return this;
},
- _setOption: function(key, value)
- {
+ _setOption: function(key, value) {
if (key === "disabled") {
this.options[ key ] = value;
@@ -88,47 +85,34 @@
}
},
- _mouseCapture: function(event, overrideHandle)
- {
+ _mouseCapture: function(event, overrideHandle) {
if (this.reverting) {
return false;
}
- if (this.options.disabled || this.options.type == 'static') {
- return false;
- }
+ if (this.options.disabled || this.options.type == 'static') return false;
//We have to refresh the items data once first
this._refreshItems(event);
//Find out if the clicked node (or one of its parents) is a actual item in this.items
- var currentItem = null, self = this, nodes = $(event.target).parents().each(function()
- {
+ var currentItem = null, self = this, nodes = $(event.target).parents().each(function() {
if ($.data(this, 'sortable-item') == self) {
currentItem = $(this);
return false;
}
});
- if ($.data(event.target, 'sortable-item') == self) {
- currentItem = $(event.target);
- }
+ if ($.data(event.target, 'sortable-item') == self) currentItem = $(event.target);
- if (!currentItem) {
- return false;
- }
+ if (!currentItem) return false;
if (this.options.handle && !overrideHandle) {
var validHandle = false;
- $(this.options.handle, currentItem).find("*").andSelf().each(function()
- {
- if (this == event.target) {
- validHandle = true;
- }
+ $(this.options.handle, currentItem).find("*").andSelf().each(function() {
+ if (this == event.target) validHandle = true;
});
- if (!validHandle) {
- return false;
- }
+ if (!validHandle) return false;
}
this.currentItem = currentItem;
@@ -137,8 +121,7 @@
},
- _mouseStart: function(event, overrideHandle, noActivation)
- {
+ _mouseStart: function(event, overrideHandle, noActivation) {
var o = this.options, self = this;
this.currentContainer = this;
@@ -181,8 +164,7 @@
top: event.pageY - this.offset.top
},
parent: this._getParentOffset(),
- relative: this
- ._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+ relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
});
//Generate the original position
@@ -205,43 +187,34 @@
this._createPlaceholder();
//Set a containment if given in the options
- if (o.containment) {
+ if (o.containment)
this._setContainment();
- }
if (o.cursor) { // cursor option
- if ($('body').css("cursor")) {
- this._storedCursor = $('body').css("cursor");
- }
+ if ($('body').css("cursor")) this._storedCursor = $('body').css("cursor");
$('body').css("cursor", o.cursor);
}
if (o.opacity) { // opacity option
- if (this.helper.css("opacity")) {
- this._storedOpacity = this.helper.css("opacity");
- }
+ if (this.helper.css("opacity")) this._storedOpacity = this.helper.css("opacity");
this.helper.css("opacity", o.opacity);
}
if (o.zIndex) { // zIndex option
- if (this.helper.css("zIndex")) {
- this._storedZIndex = this.helper.css("zIndex");
- }
+ if (this.helper.css("zIndex")) this._storedZIndex = this.helper.css("zIndex");
this.helper.css("zIndex", o.zIndex);
}
//Prepare scrolling
- if (this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
+ if (this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML')
this.overflowOffset = this.scrollParent.offset();
- }
//Call callbacks
this._trigger("start", event, this._uiHash());
//Recache the helper size
- if (!this._preserveHelperProportions) {
+ if (!this._preserveHelperProportions)
this._cacheHelperProportions();
- }
//Post 'activate' events to possible containers
@@ -252,13 +225,11 @@
}
//Prepare possible droppables
- if ($.ui.ddmanager) {
+ if ($.ui.ddmanager)
$.ui.ddmanager.current = this;
- }
- if ($.ui.ddmanager && !o.dropBehaviour) {
+ if ($.ui.ddmanager && !o.dropBehaviour)
$.ui.ddmanager.prepareOffsets(this, event);
- }
this.dragging = true;
@@ -268,8 +239,7 @@
},
- _mouseDrag: function(event)
- {
+ _mouseDrag: function(event) {
//Compute the helpers position
this.position = this._generatePosition(event);
@@ -284,67 +254,54 @@
var o = this.options, scrolled = false;
if (this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
- if ((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
+ if ((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
- } else if (event.pageY - this.overflowOffset.top < o.scrollSensitivity) {
+ else if (event.pageY - this.overflowOffset.top < o.scrollSensitivity)
this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
- }
- if ((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
+ if ((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
- } else if (event.pageX - this.overflowOffset.left < o.scrollSensitivity) {
+ else if (event.pageX - this.overflowOffset.left < o.scrollSensitivity)
this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
- }
} else {
- if (event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
+ if (event.pageY - $(document).scrollTop() < o.scrollSensitivity)
scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
- } else if ($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
+ else if ($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
- }
- if (event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
+ if (event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
- } else if ($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
+ else if ($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
- }
}
- if (scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
+ if (scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
$.ui.ddmanager.prepareOffsets(this, event);
- }
}
//Regenerate the absolute position used for position checks
this.positionAbs = this._convertPositionTo("absolute");
//Set the helper position
- if (!this.options.axis || this.options.axis != "y") {
- this.helper[0].style.left = this.position.left + 'px';
- }
- if (!this.options.axis || this.options.axis != "x") {
- this.helper[0].style.top = this.position.top + 'px';
- }
+ if (!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left + 'px';
+ if (!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top + 'px';
//Rearrange
for (var i = this.items.length - 1; i >= 0; i--) {
//Cache variables and intersection, continue if no intersection
var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
- if (!intersection) {
- continue;
- }
+ if (!intersection) continue;
- if (itemElement != this.currentItem[0] //cannot intersect with itself && this.placeholder[intersection == 1 ? "next" : "prev"]()[0]
- != itemElement //no useless actions that have been done before && !$.ui.contains(this.placeholder[0],
- {
- itemElement
- }
- ) //no action if the item moved is the parent of the item checked && (this.options.type == 'semi-dynamic' ? !$.ui
- .contains(this.element[0], itemElement) : true)
- //&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container) {
+ if (itemElement != this.currentItem[0] //cannot intersect with itself
+ && this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
+ && !$.ui.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
+ && (this.options.type == 'semi-dynamic' ? !$.ui.contains(this.element[0], itemElement) : true)
+ //&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
+ ) {
this.direction = intersection == 1 ? "down" : "up";
@@ -363,9 +320,7 @@
this._contactContainers(event);
//Interconnect with droppables
- if ($.ui.ddmanager) {
- $.ui.ddmanager.drag(this, event);
- }
+ if ($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
//Call callbacks
this._trigger('sort', event, this._uiHash());
@@ -375,17 +330,13 @@
},
- _mouseStop: function(event, noPropagation)
- {
+ _mouseStop: function(event, noPropagation) {
- if (!event) {
- return;
- }
+ if (!event) return;
//If we are using droppables, inform the manager about the drop
- if ($.ui.ddmanager && !this.options.dropBehaviour) {
+ if ($.ui.ddmanager && !this.options.dropBehaviour)
$.ui.ddmanager.drop(this, event);
- }
if (this.options.revert) {
var self = this;
@@ -394,11 +345,9 @@
self.reverting = true;
$(this.helper).animate({
- left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0]
- .scrollLeft),
+ left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
- }, parseInt(this.options.revert, 10) || 500, function()
- {
+ }, parseInt(this.options.revert, 10) || 500, function() {
self._clear(event);
});
} else {
@@ -409,8 +358,7 @@
},
- cancel: function()
- {
+ cancel: function() {
var self = this;
@@ -418,11 +366,10 @@
this._mouseUp({ target: null });
- if (this.options.helper == "original") {
+ if (this.options.helper == "original")
this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
- } else {
+ else
this.currentItem.show();
- }
//Post deactivating events to containers
for (var i = this.containers.length - 1; i >= 0; i--) {
@@ -437,12 +384,8 @@
if (this.placeholder) {
//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
- if (this.placeholder[0].parentNode) {
- this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
- }
- if (this.options.helper != "original" && this.helper && this.helper[0].parentNode) {
- this.helper.remove();
- }
+ if (this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+ if (this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
$.extend(this, {
helper: null,
@@ -462,19 +405,15 @@
},
- serialize: function(o)
- {
+ serialize: function(o) {
var items = this._getItemsAsjQuery(o && o.connected);
var str = [];
o = o || {};
- $(items).each(function()
- {
+ $(items).each(function() {
var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
- if (res) {
- str.push((o.key || res[1] + '[]') + '=' + (o.key && o.expression ? res[1] : res[2]));
- }
+ if (res) str.push((o.key || res[1] + '[]') + '=' + (o.key && o.expression ? res[1] : res[2]));
});
if (!str.length && o.key) {
@@ -485,15 +424,13 @@
},
- toArray: function(o)
- {
+ toArray: function(o) {
var items = this._getItemsAsjQuery(o && o.connected);
var ret = [];
o = o || {};
- items.each(function()
- {
+ items.each(function() {
ret.push($(o.item || this).attr(o.attribute || 'id') || '');
});
return ret;
@@ -501,8 +438,7 @@
},
/* Be careful with the following core functions */
- _intersectsWith: function(item)
- {
+ _intersectsWith: function(item) {
var x1 = this.positionAbs.left,
x2 = x1 + this.helperProportions.width,
@@ -519,19 +455,22 @@
var isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r;
- if (this.options.tolerance == "pointer" || this.options.forcePointerForContainers || (this.options.tolerance != "pointer" && this
- .helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])) {
+ if (this.options.tolerance == "pointer"
+ || this.options.forcePointerForContainers
+ || (this.options.tolerance != "pointer" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])
+ ) {
return isOverElement;
} else {
- return (l < x1 + (this.helperProportions.width / 2) // Right Half && x2 - (this.helperProportions.width / 2) < r // Left Half && t < y1 + (this
- .helperProportions.height / 2) // Bottom Half && y2 - (this.helperProportions.height / 2) < b ); // Top Half
+ return (l < x1 + (this.helperProportions.width / 2) // Right Half
+ && x2 - (this.helperProportions.width / 2) < r // Left Half
+ && t < y1 + (this.helperProportions.height / 2) // Bottom Half
+ && y2 - (this.helperProportions.height / 2) < b ); // Top Half
}
},
- _intersectsWithPointer: function(item)
- {
+ _intersectsWithPointer: function(item) {
var isOverElementHeight = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
isOverElementWidth = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
@@ -539,17 +478,16 @@
verticalDirection = this._getDragVerticalDirection(),
horizontalDirection = this._getDragHorizontalDirection();
- if (!isOverElement) {
+ if (!isOverElement)
return false;
- }
- return this.floating ? ( ((horizontalDirection && horizontalDirection == "right") || verticalDirection == "down") ? 2 : 1 ) : ( verticalDirection
- && (verticalDirection == "down" ? 2 : 1) );
+ return this.floating ?
+ ( ((horizontalDirection && horizontalDirection == "right") || verticalDirection == "down") ? 2 : 1 )
+ : ( verticalDirection && (verticalDirection == "down" ? 2 : 1) );
},
- _intersectsWithSides: function(item)
- {
+ _intersectsWithSides: function(item) {
var isOverBottomHalf = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height / 2), item.height),
isOverRightHalf = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width / 2), item.width),
@@ -564,33 +502,30 @@
},
- _getDragVerticalDirection: function()
- {
+ _getDragVerticalDirection: function() {
var delta = this.positionAbs.top - this.lastPositionAbs.top;
return delta != 0 && (delta > 0 ? "down" : "up");
},
- _getDragHorizontalDirection: function()
- {
+ _getDragHorizontalDirection: function() {
var delta = this.positionAbs.left - this.lastPositionAbs.left;
return delta != 0 && (delta > 0 ? "right" : "left");
},
- refresh: function(event)
- {
+ refresh: function(event) {
this._refreshItems(event);
this.refreshPositions();
return this;
},
- _connectWith: function()
- {
+ _connectWith: function() {
var options = this.options;
- return options.connectWith.constructor == String ? [options.connectWith] : options.connectWith;
+ return options.connectWith.constructor == String
+ ? [options.connectWith]
+ : options.connectWith;
},
- _getItemsAsjQuery: function(connected)
- {
+ _getItemsAsjQuery: function(connected) {
var self = this;
var items = [];
@@ -603,8 +538,7 @@
for (var j = cur.length - 1; j >= 0; j--) {
var inst = $.data(cur[j], 'sortable');
if (inst && inst != this && !inst.options.disabled) {
- queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element)
- .not(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]);
+ queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]);
}
}
;
@@ -612,13 +546,10 @@
;
}
- queries.push([
- $.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this
- .options.items, this.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), this]);
+ queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), this]);
for (var i = queries.length - 1; i >= 0; i--) {
- queries[i][0].each(function()
- {
+ queries[i][0].each(function() {
items.push(this);
});
}
@@ -628,17 +559,15 @@
},
- _removeCurrentsFromItems: function()
- {
+ _removeCurrentsFromItems: function() {
var list = this.currentItem.find(":data(sortable-item)");
for (var i = 0; i < this.items.length; i++) {
for (var j = 0; j < list.length; j++) {
- if (list[j] == this.items[i].item[0]) {
+ if (list[j] == this.items[i].item[0])
this.items.splice(i, 1);
- }
}
;
@@ -647,16 +576,14 @@
},
- _refreshItems: function(event)
- {
+ _refreshItems: function(event) {
this.items = [];
this.containers = [this];
var items = this.items;
var self = this;
var queries = [
- [$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items,
- this.element), this]
+ [$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]
];
var connectWith = this._connectWith();
@@ -666,9 +593,7 @@
for (var j = cur.length - 1; j >= 0; j--) {
var inst = $.data(cur[j], 'sortable');
if (inst && inst != this && !inst.options.disabled) {
- queries.push([
- $.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options
- .items, inst.element), inst]);
+ queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
this.containers.push(inst);
}
}
@@ -699,8 +624,7 @@
},
- refreshPositions: function(fast)
- {
+ refreshPositions: function(fast) {
//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
if (this.offsetParent && this.helper) {
@@ -711,9 +635,8 @@
var item = this.items[i];
//We ignore calculating positions of all connected containers when we're not over them
- if (item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0]) {
+ if (item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0])
continue;
- }
var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
@@ -744,44 +667,37 @@
return this;
},
- _createPlaceholder: function(that)
- {
+ _createPlaceholder: function(that) {
var self = that || this, o = self.options;
if (!o.placeholder || o.placeholder.constructor == String) {
var className = o.placeholder;
o.placeholder = {
- element: function()
- {
+ element: function() {
- var el = $(document.createElement(self.currentItem[0].nodeName)).addClass(className || self.currentItem[0].className
- + " ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];
+ var el = $(document.createElement(self.currentItem[0].nodeName))
+ .addClass(className || self.currentItem[0].className + " ui-sortable-placeholder")
+ .removeClass("ui-sortable-helper")[0];
- if (!className) {
+ if (!className)
el.style.visibility = "hidden";
- }
return el;
},
- update: function(container, p)
- {
+ update: function(container, p) {
// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
- if (className && !o.forcePlaceholderSize) {
- return;
- }
+ if (className && !o.forcePlaceholderSize) return;
//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
if (!p.height()) {
- p.height(self.currentItem.innerHeight() - parseInt(self.currentItem.css('paddingTop') || 0, 10) - parseInt(self.currentItem
- .css('paddingBottom') || 0, 10));
+ p.height(self.currentItem.innerHeight() - parseInt(self.currentItem.css('paddingTop') || 0, 10) - parseInt(self.currentItem.css('paddingBottom') || 0, 10));
}
;
if (!p.width()) {
- p.width(self.currentItem.innerWidth() - parseInt(self.currentItem.css('paddingLeft') || 0, 10) - parseInt(self.currentItem
- .css('paddingRight') || 0, 10));
+ p.width(self.currentItem.innerWidth() - parseInt(self.currentItem.css('paddingLeft') || 0, 10) - parseInt(self.currentItem.css('paddingRight') || 0, 10));
}
;
}
@@ -799,8 +715,7 @@
},
- _contactContainers: function(event)
- {
+ _contactContainers: function(event) {
// get innermost container that intersects with item
var innermostContainer = null, innermostIndex = null;
@@ -809,16 +724,14 @@
for (var i = this.containers.length - 1; i >= 0; i--) {
// never consider a container that's located within the item itself
- if ($.ui.contains(this.currentItem[0], this.containers[i].element[0])) {
+ if ($.ui.contains(this.currentItem[0], this.containers[i].element[0]))
continue;
- }
if (this._intersectsWith(this.containers[i].containerCache)) {
// if we've already found a container and it's more "inner" than this, then continue
- if (innermostContainer && $.ui.contains(this.containers[i].element[0], innermostContainer.element[0])) {
+ if (innermostContainer && $.ui.contains(this.containers[i].element[0], innermostContainer.element[0]))
continue;
- }
innermostContainer = this.containers[i];
innermostIndex = i;
@@ -834,9 +747,7 @@
}
// if no intersecting containers found, return
- if (!innermostContainer) {
- return;
- }
+ if (!innermostContainer) return;
// move the item into the container if it's not there already
if (this.containers.length === 1) {
@@ -849,9 +760,7 @@
var itemWithLeastDistance = null;
var base = this.positionAbs[this.containers[innermostIndex].floating ? 'left' : 'top'];
for (var j = this.items.length - 1; j >= 0; j--) {
- if (!$.ui.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) {
- continue;
- }
+ if (!$.ui.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) continue;
var cur = this.items[j][this.containers[innermostIndex].floating ? 'left' : 'top'];
if (Math.abs(cur - base) < dist) {
dist = Math.abs(cur - base);
@@ -860,13 +769,10 @@
}
if (!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled
- {
return;
- }
this.currentContainer = this.containers[innermostIndex];
- itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null,
- this.containers[innermostIndex].element, true);
+ itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
this._trigger("change", event, this._uiHash());
this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
@@ -880,36 +786,25 @@
},
- _createHelper: function(event)
- {
+ _createHelper: function(event) {
var o = this.options;
- var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper == 'clone' ? this.currentItem
- .clone() : this.currentItem);
+ var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper == 'clone' ? this.currentItem.clone() : this.currentItem);
if (!helper.parents('body').length) //Add the helper to the DOM if that didn't happen already
- {
$(o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
- }
- if (helper[0] == this.currentItem[0]) {
- this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem
- .css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
- }
+ if (helper[0] == this.currentItem[0])
+ this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
- if (helper[0].style.width == '' || o.forceHelperSize) {
- helper.width(this.currentItem.width());
- }
- if (helper[0].style.height == '' || o.forceHelperSize) {
- helper.height(this.currentItem.height());
- }
+ if (helper[0].style.width == '' || o.forceHelperSize) helper.width(this.currentItem.width());
+ if (helper[0].style.height == '' || o.forceHelperSize) helper.height(this.currentItem.height());
return helper;
},
- _adjustOffsetFromHelper: function(obj)
- {
+ _adjustOffsetFromHelper: function(obj) {
if (typeof obj == 'string') {
obj = obj.split(' ');
}
@@ -930,8 +825,7 @@
}
},
- _getParentOffset: function()
- {
+ _getParentOffset: function() {
//Get the offsetParent and cache its position
@@ -947,8 +841,8 @@
po.top += this.scrollParent.scrollTop();
}
- if ((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information || (this
- .offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie)) //Ugly IE fix
+ if ((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
+ || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie)) //Ugly IE fix
po = { top: 0, left: 0 };
return {
@@ -958,8 +852,7 @@
},
- _getRelativeOffset: function()
- {
+ _getRelativeOffset: function() {
if (this.cssPosition == "relative") {
var p = this.currentItem.position();
@@ -973,38 +866,30 @@
},
- _cacheMargins: function()
- {
+ _cacheMargins: function() {
this.margins = {
left: (parseInt(this.currentItem.css("marginLeft"), 10) || 0),
top: (parseInt(this.currentItem.css("marginTop"), 10) || 0)
};
},
- _cacheHelperProportions: function()
- {
+ _cacheHelperProportions: function() {
this.helperProportions = {
width: this.helper.outerWidth(),
height: this.helper.outerHeight()
};
},
- _setContainment: function()
- {
+ _setContainment: function() {
var o = this.options;
- if (o.containment == 'parent') {
- o.containment = this.helper[0].parentNode;
- }
- if (o.containment == 'document' || o.containment == 'window') {
- this.containment = [
- 0 - this.offset.relative.left - this.offset.parent.left,
- 0 - this.offset.relative.top - this.offset.parent.top,
- $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
- ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height
- - this.margins.top
- ];
- }
+ if (o.containment == 'parent') o.containment = this.helper[0].parentNode;
+ if (o.containment == 'document' || o.containment == 'window') this.containment = [
+ 0 - this.offset.relative.left - this.offset.parent.left,
+ 0 - this.offset.relative.top - this.offset.parent.top,
+ $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
+ ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+ ];
if (!(/^(document|window|parent)$/).test(o.containment)) {
var ce = $(o.containment)[0];
@@ -1014,51 +899,39 @@
this.containment = [
co.left + (parseInt($(ce).css("borderLeftWidth"), 10) || 0) + (parseInt($(ce).css("paddingLeft"), 10) || 0) - this.margins.left,
co.top + (parseInt($(ce).css("borderTopWidth"), 10) || 0) + (parseInt($(ce).css("paddingTop"), 10) || 0) - this.margins.top,
- co.left + (over ? Math.max(ce.scrollWidth, ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"), 10) || 0)
- - (parseInt($(ce).css("paddingRight"), 10) || 0) - this.helperProportions.width - this.margins.left,
- co.top + (over ? Math.max(ce.scrollHeight, ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"), 10) || 0)
- - (parseInt($(ce).css("paddingBottom"), 10) || 0) - this.helperProportions.height - this.margins.top
+ co.left + (over ? Math.max(ce.scrollWidth, ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"), 10) || 0) - (parseInt($(ce).css("paddingRight"), 10) || 0) - this.helperProportions.width - this.margins.left,
+ co.top + (over ? Math.max(ce.scrollHeight, ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"), 10) || 0) - (parseInt($(ce).css("paddingBottom"), 10) || 0) - this.helperProportions.height - this.margins.top
];
}
},
- _convertPositionTo: function(d, pos)
- {
+ _convertPositionTo: function(d, pos) {
- if (!pos) {
- pos = this.position;
- }
+ if (!pos) pos = this.position;
var mod = d == "absolute" ? 1 : -1;
- var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0],
- this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+ var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
return {
top: (
- pos.top // The absolute mouse position + this.offset.relative.top
- * mod // Only for relative positioned nodes: Relative offset from element to offset parent
- + this.offset.parent.top
- * mod // The offsetParent's offset without borders (offset + border) - ($.browser
- .safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent
- .scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+ pos.top // The absolute mouse position
+ + this.offset.relative.top * mod // Only for relative positioned nodes: Relative offset from element to offset parent
+ + this.offset.parent.top * mod // The offsetParent's offset without borders (offset + border)
+ - ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
),
left: (
- pos.left // The absolute mouse position + this.offset.relative.left
- * mod // Only for relative positioned nodes: Relative offset from element to offset parent
- + this.offset.parent.left
- * mod // The offsetParent's offset without borders (offset + border) - ($.browser
- .safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent
- .scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+ pos.left // The absolute mouse position
+ + this.offset.relative.left * mod // Only for relative positioned nodes: Relative offset from element to offset parent
+ + this.offset.parent.left * mod // The offsetParent's offset without borders (offset + border)
+ - ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
)
};
},
- _generatePosition: function(event)
- {
+ _generatePosition: function(event) {
- var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0],
- this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+ var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
// This is another very weird special case that only happens for relative elements:
// 1. If the css position is relative
@@ -1079,60 +952,44 @@
if (this.originalPosition) { //If we are not dragging yet, we won't check for options
if (this.containment) {
- if (event.pageX - this.offset.click.left < this.containment[0]) {
- pageX = this.containment[0] + this.offset.click.left;
- }
- if (event.pageY - this.offset.click.top < this.containment[1]) {
- pageY = this.containment[1] + this.offset.click.top;
- }
- if (event.pageX - this.offset.click.left > this.containment[2]) {
- pageX = this.containment[2] + this.offset.click.left;
- }
- if (event.pageY - this.offset.click.top > this.containment[3]) {
- pageY = this.containment[3] + this.offset.click.top;
- }
+ if (event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
+ if (event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
+ if (event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
+ if (event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
}
if (o.grid) {
var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
- pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this
- .containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+ pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
- pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this
- .containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+ pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
}
}
return {
top: (
- pageY // The absolute mouse position - this.offset.click
- .top // Click offset (relative to the element) - this.offset.relative
- .top // Only for relative positioned nodes: Relative offset from element to offset parent
- - this.offset.parent
- .top // The offsetParent's offset without borders (offset + border) + ($.browser
- .safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent
- .scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+ pageY // The absolute mouse position
+ - this.offset.click.top // Click offset (relative to the element)
+ - this.offset.relative.top // Only for relative positioned nodes: Relative offset from element to offset parent
+ - this.offset.parent.top // The offsetParent's offset without borders (offset + border)
+ + ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
),
left: (
- pageX // The absolute mouse position - this.offset.click
- .left // Click offset (relative to the element) - this.offset.relative
- .left // Only for relative positioned nodes: Relative offset from element to offset parent
- - this.offset.parent
- .left // The offsetParent's offset without borders (offset + border) + ($.browser
- .safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent
- .scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+ pageX // The absolute mouse position
+ - this.offset.click.left // Click offset (relative to the element)
+ - this.offset.relative.left // Only for relative positioned nodes: Relative offset from element to offset parent
+ - this.offset.parent.left // The offsetParent's offset without borders (offset + border)
+ + ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
)
};
},
- _rearrange: function(event, i, a, hardRefresh)
- {
+ _rearrange: function(event, i, a, hardRefresh) {
- a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0],
- (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling));
+ a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling));
//Various things done here to improve the performance:
// 1. we create a setTimeout, that calls refreshPositions
@@ -1142,17 +999,13 @@
this.counter = this.counter ? ++this.counter : 1;
var self = this, counter = this.counter;
- window.setTimeout(function()
- {
- if (counter == self.counter) {
- self.refreshPositions(!hardRefresh);
- } //Precompute after each DOM insertion, NOT on mousemove
+ window.setTimeout(function() {
+ if (counter == self.counter) self.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
}, 0);
},
- _clear: function(event, noPropagation)
- {
+ _clear: function(event, noPropagation) {
this.reverting = false;
// We delay all events that have to be triggered to after the point where the placeholder has been removed and
@@ -1161,55 +1014,37 @@
// We first have to update the dom position of the actual currentItem
// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
- if (!this._noFinalSort && this.currentItem.parent().length) {
- this.placeholder.before(this.currentItem);
- }
+ if (!this._noFinalSort && this.currentItem.parent().length) this.placeholder.before(this.currentItem);
this._noFinalSort = null;
if (this.helper[0] == this.currentItem[0]) {
for (var i in this._storedCSS) {
- if (this._storedCSS[i] == 'auto' || this._storedCSS[i] == 'static') {
- this._storedCSS[i] = '';
- }
+ if (this._storedCSS[i] == 'auto' || this._storedCSS[i] == 'static') this._storedCSS[i] = '';
}
this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
} else {
this.currentItem.show();
}
- if (this.fromOutside && !noPropagation) {
- delayedTriggers.push(function(event)
- {
- this._trigger("receive", event, this._uiHash(this.fromOutside));
- });
- }
- if ((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this
- .currentItem.parent()[0]) && !noPropagation) {
- delayedTriggers.push(function(event)
- {
- this._trigger("update", event, this._uiHash());
- });
- } //Trigger update callback if the DOM position has changed
+ if (this.fromOutside && !noPropagation) delayedTriggers.push(function(event) {
+ this._trigger("receive", event, this._uiHash(this.fromOutside));
+ });
+ if ((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) && !noPropagation) delayedTriggers.push(function(event) {
+ this._trigger("update", event, this._uiHash());
+ }); //Trigger update callback if the DOM position has changed
if (!$.ui.contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element
- if (!noPropagation) {
- delayedTriggers.push(function(event)
- {
- this._trigger("remove", event, this._uiHash());
- });
- }
+ if (!noPropagation) delayedTriggers.push(function(event) {
+ this._trigger("remove", event, this._uiHash());
+ });
for (var i = this.containers.length - 1; i >= 0; i--) {
if ($.ui.contains(this.containers[i].element[0], this.currentItem[0]) && !noPropagation) {
- delayedTriggers.push((function(c)
- {
- return function(event)
- {
+ delayedTriggers.push((function(c) {
+ return function(event) {
c._trigger("receive", event, this._uiHash(this));
};
}).call(this, this.containers[i]));
- delayedTriggers.push((function(c)
- {
- return function(event)
- {
+ delayedTriggers.push((function(c) {
+ return function(event) {
c._trigger("update", event, this._uiHash(this));
};
}).call(this, this.containers[i]));
@@ -1221,20 +1056,14 @@
//Post events to containers
for (var i = this.containers.length - 1; i >= 0; i--) {
- if (!noPropagation) {
- delayedTriggers.push((function(c)
- {
- return function(event)
- {
- c._trigger("deactivate", event, this._uiHash(this));
- };
- }).call(this, this.containers[i]));
- }
+ if (!noPropagation) delayedTriggers.push((function(c) {
+ return function(event) {
+ c._trigger("deactivate", event, this._uiHash(this));
+ };
+ }).call(this, this.containers[i]));
if (this.containers[i].containerCache.over) {
- delayedTriggers.push((function(c)
- {
- return function(event)
- {
+ delayedTriggers.push((function(c) {
+ return function(event) {
c._trigger("out", event, this._uiHash(this));
};
}).call(this, this.containers[i]));
@@ -1243,15 +1072,9 @@
}
//Do what was originally in plugins
- if (this._storedCursor) {
- $('body').css("cursor", this._storedCursor);
- } //Reset cursor
- if (this._storedOpacity) {
- this.helper.css("opacity", this._storedOpacity);
- } //Reset opacity
- if (this._storedZIndex) {
- this.helper.css("zIndex", this._storedZIndex == 'auto' ? '' : this._storedZIndex);
- } //Reset z-index
+ if (this._storedCursor) $('body').css("cursor", this._storedCursor); //Reset cursor
+ if (this._storedOpacity) this.helper.css("opacity", this._storedOpacity); //Reset opacity
+ if (this._storedZIndex) this.helper.css("zIndex", this._storedZIndex == 'auto' ? '' : this._storedZIndex); //Reset z-index
this.dragging = false;
if (this.cancelHelperRemoval) {
@@ -1266,16 +1089,12 @@
return false;
}
- if (!noPropagation) {
- this._trigger("beforeStop", event, this._uiHash());
- }
+ if (!noPropagation) this._trigger("beforeStop", event, this._uiHash());
//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
- if (this.helper[0] != this.currentItem[0]) {
- this.helper.remove();
- }
+ if (this.helper[0] != this.currentItem[0]) this.helper.remove();
this.helper = null;
if (!noPropagation) {
@@ -1291,15 +1110,13 @@
},
- _trigger: function()
- {
+ _trigger: function() {
if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
this.cancel();
}
},
- _uiHash: function(inst)
- {
+ _uiHash: function(inst) {
var self = inst || this;
return {
helper: self.helper,
12 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r22984 - modules/docs/trunk/Developer_Guide/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: bleathem
Date: 2011-11-23 10:21:04 -0500 (Wed, 23 Nov 2011)
New Revision: 22984
Modified:
modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml
Log:
Applied Pavol's corrections to the dev guide
Modified: modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml
===================================================================
--- modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml 2011-11-23 14:36:08 UTC (rev 22983)
+++ modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml 2011-11-23 15:21:04 UTC (rev 22984)
@@ -270,7 +270,7 @@
<step>
<title>Download RichFaces archive</title>
<para>
- Download RichFaces from the JBoss RichFaces Downloads area at <ulink url="http://www.jboss.org/richfaces/download.html">http://www.jboss.org/richfaces/download.html</ulink>. The binary files (available in <filename class="extension">.bin.zip</filename> or <filename class="extension">.bin.tar.gz</filename> archives) contain the following:
+ Download RichFaces from the JBoss RichFaces Downloads area at <ulink url="http://www.jboss.org/richfaces/download.html">http://www.jboss.org/richfaces/download.html</ulink>. The binary files (available in <filename class="extension">.zip</filename> or <filename class="extension">.bin.tar.gz</filename> archives) contain the following:
</para>
<itemizedlist>
<listitem>
@@ -383,7 +383,7 @@
<section id="sect-Component_Using_RichFaces_with_Maven-Setting_up_Maven">
<title>Setting up <productname>Maven</productname></title>
<para>
- <productname>Maven</productname> can be downloaded and installed from Apache's website at <ulink url="http://maven.apache.org/download.html">http://maven.apache.org/download.html</ulink>. Due to the use of dependency importing, <productname>Maven</productname> version 2.0.9 or above is required.
+ <productname>Maven</productname> can be downloaded and installed from Apache's website at <ulink url="http://maven.apache.org/download.html">http://maven.apache.org/download.html</ulink>. Due to the use of dependency importing, <productname>Maven</productname> version 3.0.3 or above is required.
</para>
<para>
Once <productname>Maven</productname> has been installed, no further configuration is required to begin building Maven projects.
12 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r22983 - modules/docs/trunk/Component_Reference/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-11-23 09:36:08 -0500 (Wed, 23 Nov 2011)
New Revision: 22983
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Output_and_messages.xml
Log:
RFPL-1477: renamed a4j:form to h:form
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Output_and_messages.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Output_and_messages.xml 2011-11-23 14:21:10 UTC (rev 22982)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Output_and_messages.xml 2011-11-23 14:36:08 UTC (rev 22983)
@@ -881,7 +881,7 @@
<programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richtoolTip-Attaching_the_tool-tip.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
</example>
<para>
- The <sgmltag><rich:tooltip></sgmltag> component can alternatively be left unattached, and is instead invoked through an event handler on the target component. To leave the <sgmltag><rich:tooltip></sgmltag> component unattached, set <code>attached="false"</code>, and define the event handler to trigger the tool-tip on the target component. This approach is demonstrated in <xref linkend="exam-Component_Reference-richtooltip-Unattached_tool-tips" />. When leaving the <sgmltag><rich:tooltip></sgmltag> component unattached, ensure it has an <varname>id</varname> identifier defined. If it is defined outside the target element, it must be nested in an <sgmltag><a4j:form></sgmltag> component.
+ The <sgmltag><rich:tooltip></sgmltag> component can alternatively be left unattached, and is instead invoked through an event handler on the target component. To leave the <sgmltag><rich:tooltip></sgmltag> component unattached, set <code>attached="false"</code>, and define the event handler to trigger the tool-tip on the target component. This approach is demonstrated in <xref linkend="exam-Component_Reference-richtooltip-Unattached_tool-tips" />. When leaving the <sgmltag><rich:tooltip></sgmltag> component unattached, ensure it has an <varname>id</varname> identifier defined. If it is defined outside the target element, it must be nested in an <sgmltag><h:form></sgmltag> component.
</para>
<example id="exam-Component_Reference-richtooltip-Unattached_tool-tips">
<title>Unattached tool-tips</title>
12 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r22982 - modules/docs/trunk/Migration_Guide/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-11-23 09:21:10 -0500 (Wed, 23 Nov 2011)
New Revision: 22982
Modified:
modules/docs/trunk/Migration_Guide/src/main/docbook/en-US/Upgrading.xml
Log:
RFPL-1844: Migration Guide: wrong list of project artifacts for installation - refered to Developer Guide
Modified: modules/docs/trunk/Migration_Guide/src/main/docbook/en-US/Upgrading.xml
===================================================================
--- modules/docs/trunk/Migration_Guide/src/main/docbook/en-US/Upgrading.xml 2011-11-23 13:57:15 UTC (rev 22981)
+++ modules/docs/trunk/Migration_Guide/src/main/docbook/en-US/Upgrading.xml 2011-11-23 14:21:10 UTC (rev 22982)
@@ -28,52 +28,11 @@
<step id="step-Migration_Guide-Installation-Install_libraries">
<title>Install libraries</title>
<para>
- Copy the following libraries from the <productname>RichFaces</productname> package to your application's <filename class="directory">WEB-INF/lib</filename> libraries directory:
+ Refer to the list of <emphasis>RichFaces libraries and it's dependencies</emphasis> [<emphasis>RichFaces 4: Developer Guide, section 2.1.1. RichFaces libraries and dependencies</emphasis>].
+ </para>
+ <para>
+ Copy them to your application's <filename class="directory">WEB-INF/lib</filename> libraries directory.
</para>
- <itemizedlist>
- <listitem>
- <para>
- <filename class="libraryfile">richfaces-api</filename>
- </para>
- </listitem>
- <listitem>
- <para>
- <filename class="libraryfile">richfaces-impl</filename>
- </para>
- </listitem>
- <listitem>
- <para>
- <filename class="libraryfile">core-ui</filename>
- </para>
- </listitem>
- </itemizedlist>
- <!--
- <para>
- Existing projects should already contain the following libraries; if not, they will need to be included in the libraries directory as well:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- <filename class="libraryfile">commons-logging</filename>
- </para>
- </listitem>
- <listitem>
- <para>
- <filename class="libraryfile">commons-beanutils</filename>
- </para>
- </listitem>
- <listitem>
- <para>
- <filename class="libraryfile">slf4j-api</filename>
- </para>
- </listitem>
- <listitem>
- <para>
- <filename class="libraryfile">slf4j-log4j12</filename>
- </para>
- </listitem>
- </itemizedlist>
- -->
</step>
<step id="step-Migration_Guide-Installation-Set_up_Maven">
<title>Set up Maven</title>
12 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r22981 - modules/docs/trunk/Developer_Guide/src/main/docbook/en-US.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-11-23 08:57:15 -0500 (Wed, 23 Nov 2011)
New Revision: 22981
Modified:
modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml
Log:
RFPL-1857: Document third-party dependencies for non-maven based projects
Modified: modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml
===================================================================
--- modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml 2011-11-23 13:31:16 UTC (rev 22980)
+++ modules/docs/trunk/Developer_Guide/src/main/docbook/en-US/chap-Developer_Guide-Getting_started_with_RichFaces.xml 2011-11-23 13:57:15 UTC (rev 22981)
@@ -38,6 +38,205 @@
</para>
-->
+ <section id="sect-Developer_Guide-Getting_started_with_RichFaces-Technical_Requirements-Project_libraries_and_dependencies">
+ <title>Project libraries and dependencies</title>
+
+ <para>
+ RichFaces library comes in form of Java archives for Core Framework and Components.
+ </para>
+
+ <itemizedlist>
+ <title>RichFaces libraries</title>
+ <listitem>
+ <para>
+ <filename>richfaces-core-api.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>richfaces-core-impl.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>richfaces-components-api.jar</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>richfaces-components-ui.jar</filename>
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <para>
+ The framework depends on third-party dependencies which can be classified to mandatory and optional (libraries enabling certain functionality).
+ </para>
+ <para>
+ Note that these dependencies may depend on their own runtime dependencies.
+ </para>
+
+ <itemizedlist>
+ <title>Mandatory third-party dependencies</title>
+ <listitem>
+ <para>
+ Java Server Faces 2.x implementation
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>javax.faces.jar</filename> (version <code>2.1.3</code> or higher)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ or <filename>myfaces-impl.jar</filename> (version <code>2.1.4</code> or higher)
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ Google Guava
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>guava.jar</filename> (version <code>r08</code>)
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ CSS Parser
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>cssparser.jar</filename> (version <code>0.9.5</code>)
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ Simple API for CSS
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>sac.jar</filename> (version <code>1.3</code>)
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist>
+
+ <itemizedlist>
+ <title>Optional third-party dependencies</title>
+ <listitem>
+ <para>
+ Bean validation (JSR-303) integration for client-side validation (JSR-303 API and Implementation)
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>validation-api.jar</filename> (version <code>1.0.0.GA</code>)
+ </para>
+ </listitem>
+ </itemizedlist>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>hibernate-validator.jar</filename> (version <code>4.2</code> or higher)
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ Push transport library - Atmosphere (without dependencies)
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>atmosphere-runtime.jar</filename> (version <code>0.8.0-RC1</code>)
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ Push JMS integration (JMS API and Implementation)
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>jms.jar</filename> (version <code>1.1</code>)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>hornetq-jms.jar</filename> (version <code>2.2</code> or higher)
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ Push CDI integration (CDI API and Implementation)
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>cdi-api.jar</filename> (version <code>1.0-SP4</code>)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>javax.inject.jar</filename> (version <code>1</code>)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>jsr-250-api.jar</filename> (version <code>1.0</code>)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>weld-servlet.jar</filename> (version <code>1.1.0.Final</code>)
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ Extended caching (EhCache)
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>ehcache.jar</filename> (version <code>1.6.0</code>)
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist>
+
+ <note>
+ <title>Dependencies for servlet containers</title>
+ <para>
+ Some of dependencies are part of Java EE 6 specification and thus it is not necessary to include them in projects running on Java EE applications servers.
+ </para>
+ <para>
+ It is still necessary to include them on servlet containers.
+ </para>
+ <para>
+ Dependencies on Servlet API, JSP API and EL API are excluded since these are integral parts of both application servers and servlet containers.
+ </para>
+ </note>
+ </section>
</section>
<section id="sect-Developer_Guide-Getting_started_with_RichFaces-Development_environments">
@@ -139,7 +338,7 @@
<step id="step-Developer_Guide-Creating_a_project-Add_the_RichFaces_libraries_to_the_project">
<title>Add the RichFaces libraries to the project</title>
<para>
- Add <filename>richfaces-core-api.jar</filename>, <filename>richfaces-core-impl.jar</filename>, <filename>richfaces-components-api.jar</filename>, and <filename>richfaces-components-ui.jar</filename> into your project. Copy them from the location where you unzipped the RichFaces archive to the <filename>WebContent/WEB-INF/lib/</filename> directory of your project in <application>JBoss Tools</application>.
+ Add <link linkend="sect-Developer_Guide-Getting_started_with_RichFaces-Technical_Requirements-Project_libraries_and_dependencies">RichFaces libraries and their mandatory dependencies</link> to the project. Copy them from the location where you unzipped the RichFaces archive to the <filename>WebContent/WEB-INF/lib/</filename> directory of your project in <application>JBoss Tools</application>.
</para>
</step>
<step id="step-Developer_Guide-Creating_a_project-Reference_the_tag_libraries">
12 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r22980 - modules/tests/metamer/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: jjamrich
Date: 2011-11-23 08:31:16 -0500 (Wed, 23 Nov 2011)
New Revision: 22980
Removed:
modules/tests/metamer/trunk/.gitignore
Log:
Remove .gitignore from svn repo. This file shouldn't be pushed into git public repo as well.
Deleted: modules/tests/metamer/trunk/.gitignore
===================================================================
--- modules/tests/metamer/trunk/.gitignore 2011-11-23 11:53:41 UTC (rev 22979)
+++ modules/tests/metamer/trunk/.gitignore 2011-11-23 13:31:16 UTC (rev 22980)
@@ -1,10 +0,0 @@
-/.checkstyle
-/.classpath
-/.project
-/.settings
-/target
-/profiles.xml
-/nbactions.xml
-/faces-config.NavData
-/nb-configuration.xml
-/ftest-source/src/main/java/org/testng/Assert.java
12 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r22979 - in sandbox/trunk/ui: dashboard and 28 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: blabno
Date: 2011-11-23 06:53:41 -0500 (Wed, 23 Nov 2011)
New Revision: 22979
Added:
sandbox/trunk/ui/dashboard/
sandbox/trunk/ui/dashboard/bom/
sandbox/trunk/ui/dashboard/bom/pom.xml
sandbox/trunk/ui/dashboard/demo/
sandbox/trunk/ui/dashboard/demo/pom.xml
sandbox/trunk/ui/dashboard/demo/src/
sandbox/trunk/ui/dashboard/demo/src/main/
sandbox/trunk/ui/dashboard/demo/src/main/java/
sandbox/trunk/ui/dashboard/demo/src/main/java/org/
sandbox/trunk/ui/dashboard/demo/src/main/java/org/richfaces/
sandbox/trunk/ui/dashboard/demo/src/main/java/org/richfaces/sandbox/
sandbox/trunk/ui/dashboard/demo/src/main/java/org/richfaces/sandbox/dashboard/
sandbox/trunk/ui/dashboard/demo/src/main/java/org/richfaces/sandbox/dashboard/Bean.java
sandbox/trunk/ui/dashboard/demo/src/main/resources/
sandbox/trunk/ui/dashboard/demo/src/main/resources/rebel.xml
sandbox/trunk/ui/dashboard/demo/src/main/webapp/
sandbox/trunk/ui/dashboard/demo/src/main/webapp/META-INF/
sandbox/trunk/ui/dashboard/demo/src/main/webapp/META-INF/MANIFEST.MF
sandbox/trunk/ui/dashboard/demo/src/main/webapp/WEB-INF/
sandbox/trunk/ui/dashboard/demo/src/main/webapp/WEB-INF/faces-config.xml
sandbox/trunk/ui/dashboard/demo/src/main/webapp/WEB-INF/web.xml
sandbox/trunk/ui/dashboard/demo/src/main/webapp/index.jsp
sandbox/trunk/ui/dashboard/demo/src/main/webapp/menu.xhtml
sandbox/trunk/ui/dashboard/demo/src/main/webapp/sample_1.xhtml
sandbox/trunk/ui/dashboard/parent/
sandbox/trunk/ui/dashboard/parent/pom.xml
sandbox/trunk/ui/dashboard/pom.xml
sandbox/trunk/ui/dashboard/ui/
sandbox/trunk/ui/dashboard/ui/pom.xml
sandbox/trunk/ui/dashboard/ui/src/
sandbox/trunk/ui/dashboard/ui/src/main/
sandbox/trunk/ui/dashboard/ui/src/main/java/
sandbox/trunk/ui/dashboard/ui/src/main/java/org/
sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/
sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/component/
sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/component/AbstractDashboard.java
sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/component/package-info.java
sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/event/
sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/event/PositionChangeEvent.java
sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/event/PositionChangeListener.java
sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/renderkit/
sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/renderkit/html/
sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/renderkit/html/DashboardRenderer.java
sandbox/trunk/ui/dashboard/ui/src/main/resources/
sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/
sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/
sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/dashboard.css
sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/jquery.ui.sortable.js
sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/richfaces.dashboard.js
sandbox/trunk/ui/dashboard/ui/src/test/
sandbox/trunk/ui/dashboard/ui/src/test/java/
Log:
Created dashboard sandbox component.
Added: sandbox/trunk/ui/dashboard/bom/pom.xml
===================================================================
--- sandbox/trunk/ui/dashboard/bom/pom.xml (rev 0)
+++ sandbox/trunk/ui/dashboard/bom/pom.xml 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ JBoss, Home of Professional Open Source
+ Copyright , Red Hat, Inc. and individual contributors
+ by the @authors tag. See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.richfaces.sandbox.ui.dashboard</groupId>
+ <artifactId>dashboard-bom</artifactId>
+ <version>4.1.0-SNAPSHOT</version>
+ <name>Richfaces UI Components: dashboard bom</name>
+ <packaging>pom</packaging>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>dashboard-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>bernard.labno.pl</id>
+ <name>MyCo Internal Repository</name>
+ <url>http://bernard.labno.pl/artifactory/libs-snapshot-local</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+</project>
Added: sandbox/trunk/ui/dashboard/demo/pom.xml
===================================================================
--- sandbox/trunk/ui/dashboard/demo/pom.xml (rev 0)
+++ sandbox/trunk/ui/dashboard/demo/pom.xml 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces.sandbox.ui.dashboard</groupId>
+ <artifactId>dashboard-parent</artifactId>
+ <version>4.1.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>dashboard-demo</artifactId>
+ <name>Richfaces UI Components: dashboard demo</name>
+ <packaging>war</packaging>
+ <build>
+ <finalName>dashboard-demo</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.sandbox.ui.dashboard</groupId>
+ <artifactId>dashboard-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.el</groupId>
+ <artifactId>el-ri</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+</project>
+
+
Added: sandbox/trunk/ui/dashboard/demo/src/main/java/org/richfaces/sandbox/dashboard/Bean.java
===================================================================
--- sandbox/trunk/ui/dashboard/demo/src/main/java/org/richfaces/sandbox/dashboard/Bean.java (rev 0)
+++ sandbox/trunk/ui/dashboard/demo/src/main/java/org/richfaces/sandbox/dashboard/Bean.java 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright , Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.sandbox.dashboard;
+
+import org.richfaces.event.PositionChangeEvent;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import java.io.Serializable;
+import java.util.Random;
+
+public class Bean implements Serializable {
+// ------------------------------ FIELDS ------------------------------
+
+ private boolean enabled;
+
+ private Random random = new Random();
+
+// --------------------- GETTER / SETTER METHODS ---------------------
+
+ public boolean isEnabled()
+ {
+ return enabled;
+ }
+
+ public void setEnabled(boolean enabled)
+ {
+ this.enabled = enabled;
+ }
+
+// -------------------------- OTHER METHODS --------------------------
+
+ public void action()
+ {
+ FacesContext.getCurrentInstance().addMessage(null, new FacesMessage("Action performed"));
+ }
+
+ public void positionChanged(PositionChangeEvent event)
+ {
+ FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(event.toString()));
+ }
+}
Added: sandbox/trunk/ui/dashboard/demo/src/main/resources/rebel.xml
===================================================================
--- sandbox/trunk/ui/dashboard/demo/src/main/resources/rebel.xml (rev 0)
+++ sandbox/trunk/ui/dashboard/demo/src/main/resources/rebel.xml 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com"
+ xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
+
+ <classpath>
+ <dir name="/home/bernard/projects/richfaces/sandbox/trunk/ui/dashboard/demo/target/classes"></dir>
+ <dir name="/home/bernard/projects/richfaces/sandbox/trunk/ui/dashboard/ui/target/classes"></dir>
+ </classpath>
+
+ <web>
+ <link target="/">
+ <dir name="/home/bernard/projects/richfaces/sandbox/trunk/ui/dashboard/demo/src/main/webapp"></dir>
+ </link>
+ </web>
+
+</application>
Added: sandbox/trunk/ui/dashboard/demo/src/main/webapp/META-INF/MANIFEST.MF
===================================================================
--- sandbox/trunk/ui/dashboard/demo/src/main/webapp/META-INF/MANIFEST.MF (rev 0)
+++ sandbox/trunk/ui/dashboard/demo/src/main/webapp/META-INF/MANIFEST.MF 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: sandbox/trunk/ui/dashboard/demo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- sandbox/trunk/ui/dashboard/demo/src/main/webapp/WEB-INF/faces-config.xml (rev 0)
+++ sandbox/trunk/ui/dashboard/demo/src/main/webapp/WEB-INF/faces-config.xml 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?><!--
+ JBoss, Home of Professional Open Source
+ Copyright , Red Hat, Inc. and individual contributors
+ by the @authors tag. See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee" version="2.0">
+
+ <managed-bean>
+ <managed-bean-name>bean</managed-bean-name>
+ <managed-bean-class>org.richfaces.sandbox.dashboard.Bean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+
+</faces-config>
\ No newline at end of file
Added: sandbox/trunk/ui/dashboard/demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- sandbox/trunk/ui/dashboard/demo/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ sandbox/trunk/ui/dashboard/demo/src/main/webapp/WEB-INF/web.xml 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ JBoss, Home of Professional Open Source
+ Copyright , Red Hat, Inc. and individual contributors
+ by the @authors tag. See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+ <display-name>Schedule demo</display-name>
+ <context-param>
+ <param-name>javax.faces.CONFIG_FILES</param-name>
+ <param-value>/WEB-INF/faces-config.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.SKIN</param-name>
+ <param-value>classic</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.FACELETS_REFRESH_PERIOD</param-name>
+ <param-value>2</param-value>
+ </context-param>
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+ <context-param>
+ <param-name>com.sun.faces.validateXml</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>com.sun.faces.verifyObjects</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+ <param-value>com.sun.facelets.FaceletViewHandler</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.PROJECT_STAGE</param-name>
+ <param-value>Development</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
Added: sandbox/trunk/ui/dashboard/demo/src/main/webapp/index.jsp
===================================================================
--- sandbox/trunk/ui/dashboard/demo/src/main/webapp/index.jsp (rev 0)
+++ sandbox/trunk/ui/dashboard/demo/src/main/webapp/index.jsp 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,29 @@
+<%--
+ JBoss, Home of Professional Open Source
+ Copyright , Red Hat, Inc. and individual contributors
+ by the @authors tag. See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ --%>
+
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head></head>
+<body>
+<jsp:forward page="sample_1.jsf"/>
+</body>
+</html>
Added: sandbox/trunk/ui/dashboard/demo/src/main/webapp/menu.xhtml
===================================================================
--- sandbox/trunk/ui/dashboard/demo/src/main/webapp/menu.xhtml (rev 0)
+++ sandbox/trunk/ui/dashboard/demo/src/main/webapp/menu.xhtml 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,28 @@
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright , Red Hat, Inc. and individual contributors
+ by the @authors tag. See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<ui:component xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html">
+ <h:panelGrid colsumns="3">
+ <h:outputLink value="#{facesContext.externalContext.requestContextPath}/sample_1.jsf">Example 1</h:outputLink>
+ </h:panelGrid>
+</ui:component>
Added: sandbox/trunk/ui/dashboard/demo/src/main/webapp/sample_1.xhtml
===================================================================
--- sandbox/trunk/ui/dashboard/demo/src/main/webapp/sample_1.xhtml (rev 0)
+++ sandbox/trunk/ui/dashboard/demo/src/main/webapp/sample_1.xhtml 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,143 @@
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright , Red Hat, Inc. and individual contributors
+ by the @authors tag. See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"
+ xmlns:dashboard="http://richfaces.org/sandbox/dashboard">
+<h:head>
+ <title>Dashboard sample</title>
+</h:head>
+<h:body class="rich-container">
+ <style type="text/css">
+ .red {
+ color: red;
+ }
+
+ .blue {
+ color: blue;
+ }
+
+ .pink {
+ color: pink;
+ }
+
+ .bold {
+ font-weight: bold;
+ }
+
+ .italic {
+ font-style: italic;
+ }
+
+ .blue .orange {
+ background-color: orange;
+ }
+
+
+ </style>
+ <script type="text/javascript">
+ function handleChange(event, item, sX, sY, eX, eY)
+ {
+ RichFaces.ui.Notify({severity:0,summary:'Client change handler',detail:'It`s the client! sX=' + sX + ';sY=' + sY + ';eX=' + eX + ";eY=" + eY
+ + ";item=" + item.text() + ";event=" + event.type});
+ }
+ </script>
+ <ui:include src="menu.xhtml"/>
+
+ <p>
+
+ </p>
+
+ <rich:notifyMessages/>
+
+ <h:form id="f">
+ <h:outputLabel value="Dashboard enabled" for="enable"/>
+ <h:selectBooleanCheckbox id="enable" value="#{bean.enabled}"
+ onchange="if(this.checked){#{rich:component('dashboard')}.enable()} else {#{rich:component('dashboard')}.disable()}"/>
+ <h:outputLabel value="Allow changes" for="changesAccepted"/>
+ <h:selectBooleanCheckbox id="changesAccepted"/>
+
+ <dashboard:dashboard id="dashboard" style="border:1px dotted #aaa;" placeholderClass="orange" title="The dashboard"
+ onchange="handleChange(event,item,startX,startY,endX,endY)"
+ onbeforechange="if(!#{rich:element('changesAccepted')}.checked) {RichFaces.ui.Notify({severity:2,summary:'Changes are not allowed',detail:'Tick the `Allow changes`checkbox'});return false;}"
+ positionChangeListener="#{bean.positionChanged}" enabled="#{bean.enabled}">
+ <h:column>
+ <h:panelGroup layout="block" id="jack">Jack</h:panelGroup>
+ <h:panelGroup layout="block" id="viki">Viki</h:panelGroup>
+ <rich:panel>
+ The panel
+ </rich:panel>
+ </h:column>
+ <h:column id="column2" headerClass="red">
+ <h:panelGroup layout="block" id="ron">Red Ron</h:panelGroup>
+ <h:panelGroup layout="block" id="sam">Red Sam</h:panelGroup>
+ <h:commandButton value="Buttons are not movable"/>
+ <h:inputText value="Inputs are not movable"/>
+ </h:column>
+ <h:column id="column3" footerClass="blue">
+ <h:panelGroup layout="block" id="blue">Blue</h:panelGroup>
+ </h:column>
+ <h:column id="column4" rendered="false">
+ <h:panelGroup layout="block" id="hidden">Hidden</h:panelGroup>
+ </h:column>
+ <rich:column styleClass="pink" footerClass="bold" headerClass="italic">
+ <rich:panel>
+ <f:facet name="header">Panel</f:facet>
+ The pink panel <br/>
+ <h:commandButton value="Action" action="#{bean.action}"/>
+ </rich:panel>
+ </rich:column>
+ </dashboard:dashboard>
+
+ <p>This is another dashboard:</p>
+ <dashboard:dashboard id="panelBoard" positionChangeListener="#{bean.positionChanged}">
+ <h:column>
+ <rich:panel>
+ <f:facet name="header">Panel</f:facet>
+ Jill
+ </rich:panel>
+ <rich:panel>
+ <f:facet name="header">Panel</f:facet>
+ Jack
+ </rich:panel>
+ <rich:panel>
+ <f:facet name="header">Panel</f:facet>
+ Baloo
+ </rich:panel>
+ </h:column>
+ <h:column>
+ <rich:panel>
+ <f:facet name="header">Panel</f:facet>
+ Lessie
+ </rich:panel>
+ <rich:panel>
+ <f:facet name="header">Panel</f:facet>
+ Phill
+ </rich:panel>
+ </h:column>
+ </dashboard:dashboard>
+ </h:form>
+
+</h:body>
+</html>
Added: sandbox/trunk/ui/dashboard/parent/pom.xml
===================================================================
--- sandbox/trunk/ui/dashboard/parent/pom.xml (rev 0)
+++ sandbox/trunk/ui/dashboard/parent/pom.xml 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ JBoss, Home of Professional Open Source
+ Copyright , Red Hat, Inc. and individual contributors
+ by the @authors tag. See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-root-parent</artifactId>
+ <version>4.1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.richfaces.sandbox.ui.dashboard</groupId>
+ <artifactId>dashboard-parent</artifactId>
+ <name>Richfaces UI Components: dashboard parent</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
+ <org.richfaces.cdk.version>4.1.0-SNAPSHOT</org.richfaces.cdk.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.sandbox.ui.dashboard</groupId>
+ <artifactId>dashboard-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <version>${org.richfaces.cdk.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <version>${org.richfaces.cdk.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0-alpha-4</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <configuration>
+ <fail>false</fail>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>bernard.labno.pl</id>
+ <name>MyCo Internal Repository</name>
+ <url>http://bernard.labno.pl/artifactory/libs-snapshot-local</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+</project>
Added: sandbox/trunk/ui/dashboard/pom.xml
===================================================================
--- sandbox/trunk/ui/dashboard/pom.xml (rev 0)
+++ sandbox/trunk/ui/dashboard/pom.xml 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ JBoss, Home of Professional Open Source
+ Copyright , Red Hat, Inc. and individual contributors
+ by the @authors tag. See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces.sandbox.ui.dashboard</groupId>
+ <artifactId>dashboard-parent</artifactId>
+ <version>4.1.0-SNAPSHOT</version>
+ <relativePath>parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>dashboard-aggregator</artifactId>
+ <packaging>pom</packaging>
+ <name>Richfaces UI Components: dashboard Aggregator</name>
+
+ <modules>
+ <module>bom</module>
+ <module>parent</module>
+ <module>ui</module>
+ <module>demo</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>cli</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.twdata.maven</groupId>
+ <artifactId>maven-cli-plugin</artifactId>
+ <version>1.0.6-SNAPSHOT</version>
+ <configuration>
+ <userAliases>
+ <ui>dashboard-ui clean install</ui>
+ <demo>dashboard-demo clean package</demo>
+ </userAliases>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>bernard.labno.pl</id>
+ <name>MyCo Internal Repository</name>
+ <url>http://bernard.labno.pl/artifactory/libs-snapshot-local</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+</project>
Added: sandbox/trunk/ui/dashboard/ui/pom.xml
===================================================================
--- sandbox/trunk/ui/dashboard/ui/pom.xml (rev 0)
+++ sandbox/trunk/ui/dashboard/ui/pom.xml 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright , Red Hat, Inc. and individual contributors
+ by the @authors tag. See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces.sandbox.ui.dashboard</groupId>
+ <artifactId>dashboard-parent</artifactId>
+ <version>4.1.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <artifactId>dashboard-ui</artifactId>
+ <name>Richfaces UI Components: dashboard ui</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui.core</groupId>
+ <artifactId>richfaces-ui-core-ui</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-ui</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-test-stage</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <version>${org.richfaces.cdk.version}</version>
+ <executions>
+ <execution>
+ <id>cdk-generate-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/sandbox/trunk/ui/dashboard</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/sandbox/trunk/ui/dashboard</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/</url>
+ </scm>
+
+</project>
Added: sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/component/AbstractDashboard.java
===================================================================
--- sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/component/AbstractDashboard.java (rev 0)
+++ sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/component/AbstractDashboard.java 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright , Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.component;
+
+import org.richfaces.cdk.annotations.Attribute;
+import org.richfaces.cdk.annotations.Event;
+import org.richfaces.cdk.annotations.EventName;
+import org.richfaces.cdk.annotations.JsfComponent;
+import org.richfaces.cdk.annotations.JsfRenderer;
+import org.richfaces.cdk.annotations.Signature;
+import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
+import org.richfaces.context.ExtendedPartialViewContext;
+import org.richfaces.event.PositionChangeEvent;
+import org.richfaces.event.PositionChangeListener;
+import org.richfaces.renderkit.html.DashboardRenderer;
+
+import javax.el.MethodExpression;
+import javax.faces.component.UIComponentBase;
+import javax.faces.context.FacesContext;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.FacesEvent;
+
+@JsfComponent(tag = @Tag(name = "dashboard", handler = "org.richfaces.view.facelets.html.DashboardTagHandler", generate = true, type = TagType.Facelets),
+ fires = {@Event(value = PositionChangeEvent.class, listener = PositionChangeListener.class)},
+ renderer = @JsfRenderer(family = AbstractDashboard.COMPONENT_FAMILY, type = DashboardRenderer.RENDERER_TYPE),
+ attributes = {"ajax-props.xml", "core-props.xml"})
+public abstract class AbstractDashboard extends UIComponentBase {
+// ------------------------------ FIELDS ------------------------------
+
+ public static final String COMPONENT_FAMILY = "org.richfaces.Dashboard";
+
+ public static final String COMPONENT_TYPE = "org.richfaces.Dashboard";
+
+ public static final String SWITCH_TYPE_AJAX = "ajax";
+
+ public static final String _DEFAULT_SWITCH_TYPE = SWITCH_TYPE_AJAX;
+
+// -------------------------- OTHER METHODS --------------------------
+
+ @Override
+ public void broadcast(FacesEvent event) throws AbortProcessingException
+ {
+ if (event instanceof PositionChangeEvent) {
+ super.broadcast(event);
+ FacesContext facesContext = getFacesContext();
+ MethodExpression expression = getPositionChangeListener();
+ if (expression != null) {
+ setResponseData(expression.invoke(facesContext.getELContext(), new Object[]{event}));
+ }
+ } else {
+ super.broadcast(event);
+ }
+ }
+
+ @Attribute(events = @EventName(value = "beforechange"))
+ public abstract String getOnbeforechange();
+
+ @Attribute(events = @EventName(value = "change", defaultEvent = true))
+ public abstract String getOnchange();
+
+ @Attribute
+ public abstract String getPlaceholderClass();
+
+ @Attribute(signature = @Signature(parameters = PositionChangeEvent.class))
+ public abstract MethodExpression getPositionChangeListener();
+
+ @Attribute(defaultValue = "SwitchType." + _DEFAULT_SWITCH_TYPE,
+ suggestedValue = SWITCH_TYPE_AJAX)
+ public abstract SwitchType getSwitchType();
+
+ @Attribute(defaultValue = "true")
+ public abstract boolean isEnabled();
+
+ @Attribute(defaultValue = "true")
+ public abstract boolean isForcePlaceholderSize();
+
+ private void setResponseData(Object data)
+ {
+ ExtendedPartialViewContext.getInstance(getFacesContext()).getResponseComponentDataMap().put(getClientId(getFacesContext()), data);
+ }
+}
Added: sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/component/package-info.java
===================================================================
--- sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/component/package-info.java (rev 0)
+++ sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/component/package-info.java 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,4 @@
+@TagLibrary(uri = "http://richfaces.org/sandbox/dashboard", shortName = "dashboard", prefix = "dashboard",
+ displayName = "Dashboard component tags") package org.richfaces.component;
+
+import org.richfaces.cdk.annotations.TagLibrary;
\ No newline at end of file
Added: sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/event/PositionChangeEvent.java
===================================================================
--- sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/event/PositionChangeEvent.java (rev 0)
+++ sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/event/PositionChangeEvent.java 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,72 @@
+package org.richfaces.event;
+
+import javax.faces.component.UIComponent;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.FacesListener;
+
+public class PositionChangeEvent extends FacesEvent {
+// ------------------------------ FIELDS ------------------------------
+
+ private int endX;
+
+ private int endY;
+
+ private int startX;
+
+ private int startY;
+
+// --------------------------- CONSTRUCTORS ---------------------------
+
+ public PositionChangeEvent(UIComponent component, int startX, int startY, int endX, int endY)
+ {
+ super(component);
+ this.startX = startX;
+ this.startY = startY;
+ this.endX = endX;
+ this.endY = endY;
+ }
+
+// --------------------- GETTER / SETTER METHODS ---------------------
+
+ public int getEndX()
+ {
+ return endX;
+ }
+
+ public int getEndY()
+ {
+ return endY;
+ }
+
+ public int getStartX()
+ {
+ return startX;
+ }
+
+ public int getStartY()
+ {
+ return startY;
+ }
+
+// ------------------------ CANONICAL METHODS ------------------------
+
+ @Override
+ public String toString()
+ {
+ return "PositionChangeEvent{" + "endX=" + endX + ", endY=" + endY + ", startX=" + startX + ", startY=" + startY + '}';
+ }
+
+// -------------------------- OTHER METHODS --------------------------
+
+ @Override
+ public boolean isAppropriateListener(FacesListener listener)
+ {
+ return listener instanceof PositionChangeListener;
+ }
+
+ @Override
+ public void processListener(FacesListener listener)
+ {
+ ((PositionChangeListener) listener).positionChange(this);
+ }
+}
Added: sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/event/PositionChangeListener.java
===================================================================
--- sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/event/PositionChangeListener.java (rev 0)
+++ sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/event/PositionChangeListener.java 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,9 @@
+package org.richfaces.event;
+
+import javax.faces.event.FacesListener;
+
+public interface PositionChangeListener extends FacesListener {
+// -------------------------- OTHER METHODS --------------------------
+
+ void positionChange(PositionChangeEvent event);
+}
Added: sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/renderkit/html/DashboardRenderer.java
===================================================================
--- sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/renderkit/html/DashboardRenderer.java (rev 0)
+++ sandbox/trunk/ui/dashboard/ui/src/main/java/org/richfaces/renderkit/html/DashboardRenderer.java 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,236 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright , Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.renderkit.html;
+
+import org.ajax4jsf.javascript.JSFunctionDefinition;
+import org.ajax4jsf.javascript.JSObject;
+import org.ajax4jsf.javascript.JSReference;
+import org.ajax4jsf.javascript.ScriptString;
+import org.richfaces.cdk.annotations.JsfRenderer;
+import org.richfaces.component.AbstractDashboard;
+import org.richfaces.component.SwitchType;
+import org.richfaces.event.PositionChangeEvent;
+import org.richfaces.renderkit.AjaxFunction;
+import org.richfaces.renderkit.HtmlConstants;
+import org.richfaces.renderkit.RendererBase;
+import org.richfaces.renderkit.util.AjaxRendererUtils;
+import org.richfaces.renderkit.util.RendererUtils;
+
+import javax.faces.application.ResourceDependencies;
+import javax.faces.application.ResourceDependency;
+import javax.faces.component.UIColumn;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UINamingContainer;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+@JsfRenderer(family = AbstractDashboard.COMPONENT_FAMILY, type = DashboardRenderer.RENDERER_TYPE)
+@ResourceDependencies({@ResourceDependency(library = "javax.faces", name = "jsf.js"), @ResourceDependency(name = "jquery.js", target = "head"),
+ @ResourceDependency(name = "richfaces.js", target = "head"), @ResourceDependency(name = "richfaces-event.js", target = "head"),
+ @ResourceDependency(name = "richfaces-base-component.js", target = "head"),
+ @ResourceDependency(library = "org.richfaces", name = "jquery-ui-core.js", target = "head"),
+ @ResourceDependency(name = "jquery.ui.sortable.js", target = "head"), @ResourceDependency(name = "richfaces.dashboard.js", target = "head"),
+ @ResourceDependency(name = "dashboard.css", target = "head")})
+public class DashboardRenderer extends RendererBase {
+// ------------------------------ FIELDS ------------------------------
+
+ public static final String RENDERER_TYPE = "org.richfaces.DashboardRenderer";
+
+ private static final Map<String, Object> DEFAULTS;
+
+ private static final String END_X_PARAM = "eX";
+
+ private static final String END_Y_PARAM = "eY";
+
+ private static final String EVENT_TYPE_PARAM = "eventType";
+
+ private static final String POSITION_CHANGE_EVENT = "change";
+
+ private static final String START_X_PARAM = "sX";
+
+ private static final String START_Y_PARAM = "sY";
+
+// -------------------------- STATIC METHODS --------------------------
+
+ static {
+ Map<String, Object> defaults = new HashMap<String, Object>();
+ DEFAULTS = Collections.unmodifiableMap(defaults);
+ }
+
+// -------------------------- OTHER METHODS --------------------------
+
+ @Override
+ public void decode(FacesContext context, UIComponent component)
+ {
+ super.decode(context, component);
+ if (!component.isRendered()) {
+ return;
+ }
+ Map<String, String> requestParameterMap = context.getExternalContext().getRequestParameterMap();
+ if (requestParameterMap.get(component.getClientId(context)) != null) {
+ String endx = requestParameterMap.get(getFieldId(context, (AbstractDashboard) component, END_X_PARAM));
+ String endy = requestParameterMap.get(getFieldId(context, (AbstractDashboard) component, END_Y_PARAM));
+ String starty = requestParameterMap.get(getFieldId(context, (AbstractDashboard) component, START_Y_PARAM));
+ String startx = requestParameterMap.get(getFieldId(context, (AbstractDashboard) component, START_X_PARAM));
+ String eventTypeParam = requestParameterMap.get(getFieldId(context, (AbstractDashboard) component, EVENT_TYPE_PARAM));
+
+ if (POSITION_CHANGE_EVENT.equals(eventTypeParam)) {
+ new PositionChangeEvent(component, Integer.parseInt(startx), Integer.parseInt(starty), Integer.parseInt(endx), Integer.parseInt(endy)).queue();
+ }
+ }
+ }
+
+ @Override
+ public boolean getRendersChildren()
+ {
+ return true;
+ }
+
+ protected void addOptionIfSetAndNotDefault(String optionName, Object value, Map<String, Object> options)
+ {
+ if (value != null && !"".equals(value) && !value.equals(DEFAULTS.get(optionName)) && !(value instanceof Collection && ((Collection) value).size() == 0)
+ && !(value instanceof Map && ((Map) value).size() == 0)) {
+ options.put(optionName, value);
+ }
+ }
+
+ protected Object createSubmitEventFunction(FacesContext context, AbstractDashboard component)
+ {
+ ScriptString jsFunction;
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put(getFieldId(context, component, START_X_PARAM), new JSReference(START_X_PARAM));
+ params.put(getFieldId(context, component, START_Y_PARAM), new JSReference(START_Y_PARAM));
+ params.put(getFieldId(context, component, END_X_PARAM), new JSReference(END_X_PARAM));
+ params.put(getFieldId(context, component, END_Y_PARAM), new JSReference(END_Y_PARAM));
+ params.put(getFieldId(context, component, EVENT_TYPE_PARAM), new JSReference(EVENT_TYPE_PARAM));
+ String clientId = component.getClientId();
+ params.put(clientId, clientId);
+ if (isAjaxMode(component)) {
+ AjaxFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction(context, component);
+ ajaxFunction.getOptions().getParameters().putAll(params);
+ jsFunction = ajaxFunction;
+ } else {
+ return null;
+ }
+ return new JSFunctionDefinition("event", EVENT_TYPE_PARAM, START_X_PARAM, START_Y_PARAM, END_X_PARAM, END_Y_PARAM).addToBody(jsFunction);
+ }
+
+ @Override
+ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException
+ {
+ if (!(component instanceof AbstractDashboard)) {
+ return;
+ }
+ String clientId = component.getClientId(context);
+ writer.startElement(HtmlConstants.DIV_ELEM, null);
+ writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, clientId, HtmlConstants.ID_ATTRIBUTE);
+ Object styleClass = component.getAttributes().get("styleClass");
+ writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-db" + (styleClass == null ? "" : styleClass), HtmlConstants.STYLE_CLASS_ATTR);
+ getUtils().encodePassThruAttribute(context, component.getAttributes(), writer, "style");
+ getUtils().encodePassThruAttribute(context, component.getAttributes(), writer, "title");
+ }
+
+ @Override
+ protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException
+ {
+ for (UIComponent child : component.getChildren()) {
+ if (child instanceof UIColumn) {
+ if (!child.isRendered()) {
+ continue;
+ }
+ writer.startElement(HtmlConstants.DIV_ELEM, child);
+ writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, child.getClientId(context), HtmlConstants.ID_ATTRIBUTE);
+ Object styleClass = child.getAttributes().get("styleClass");
+ Object headerClass = child.getAttributes().get("headerClass");
+ Object footerClass = child.getAttributes().get("footerClass");
+ StringBuilder className = new StringBuilder("rf-db-cl");
+ if (styleClass != null) {
+ className.append(" ").append(styleClass);
+ }
+ if (headerClass != null) {
+ className.append(" ").append(headerClass);
+ }
+ if (footerClass != null) {
+ className.append(" ").append(footerClass);
+ }
+ writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, className.toString(), HtmlConstants.CLASS_ATTRIBUTE);
+ for (UIComponent grandChild : child.getChildren()) {
+ grandChild.encodeAll(context);
+ }
+ writer.endElement(HtmlConstants.DIV_ELEM);
+ } else {
+ component.encodeAll(context);
+ }
+ }
+ }
+
+ @Override
+ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException
+ {
+ if (!(component instanceof AbstractDashboard)) {
+ return;
+ }
+ String clientId = component.getClientId(context);
+ writer.startElement(HtmlConstants.SCRIPT_ELEM, null);
+ writer.writeAttribute(HtmlConstants.TYPE_ATTR, "text/javascript", "type");
+ final Map<String, Object> options = getOptions(context, (AbstractDashboard) component);
+ options.put("submitEventFunction", createSubmitEventFunction(context, (AbstractDashboard) component));
+ writer.writeText(new JSObject("RichFaces.ui.Dashboard", clientId, options), null);
+ writer.writeText(";", null);
+ writer.endElement(HtmlConstants.SCRIPT_ELEM);
+ writer.startElement(HtmlConstants.DIV_ELEM, component);
+ writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-db-clr", HtmlConstants.CLASS_ATTRIBUTE);
+ writer.endElement(HtmlConstants.DIV_ELEM);
+ writer.endElement(HtmlConstants.DIV_ELEM);
+ }
+
+ protected String getFieldId(FacesContext context, AbstractDashboard component, String attribute)
+ {
+ return RendererUtils.getInstance().clientId(context, component) + UINamingContainer.getSeparatorChar(context) + attribute;
+ }
+
+ protected Map<String, Object> getOptions(FacesContext context, AbstractDashboard dashboard) throws IOException
+ {
+ /**
+ * Include only attributes that are actually set.
+ */
+ Map<String, Object> options = new HashMap<String, Object>();
+ addOptionIfSetAndNotDefault("placeholderClass", dashboard.getPlaceholderClass(), options);
+ addOptionIfSetAndNotDefault("forcePlaceholderSize", dashboard.isForcePlaceholderSize(), options);
+ addOptionIfSetAndNotDefault("enabled", dashboard.isEnabled(), options);
+ addOptionIfSetAndNotDefault("beforechange", dashboard.getOnbeforechange(), options);
+ addOptionIfSetAndNotDefault("change", dashboard.getOnchange(), options);
+ return options;
+ }
+
+ protected boolean isAjaxMode(AbstractDashboard component)
+ {
+ SwitchType mode = component.getSwitchType();
+ return SwitchType.ajax.equals(mode) || null == mode;
+ }
+}
Added: sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/dashboard.css
===================================================================
--- sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/dashboard.css (rev 0)
+++ sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/dashboard.css 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,32 @@
+.rf-db {
+
+}
+
+.rf-db-cn {
+
+}
+
+.rf-db .rf-db-plh {
+ background: -moz-linear-gradient(center top, rgba(255, 255, 255, 0.6), rgba(255, 255, 255, 0)) repeat scroll 0 0 #85B2CB;
+ border: 1px solid #7096AB;
+ box-shadow: 0 0 8px #85B2CB;
+ box-shadow: 0 0 8px #85B2CB, 0 1px 0 #FFFFFF inset;
+}
+
+.rf-db-cl {
+ float: left;
+ width: 200px;
+}
+
+.rf-db-cl + .rf-db-cl {
+ margin-left: 1ex;
+}
+
+.rf-db-cl > * {
+ margin-top: 1ex;
+}
+
+.rf-db-clr {
+ clear: both;
+ height: 0;
+}
\ No newline at end of file
Added: sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/jquery.ui.sortable.js
===================================================================
--- sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/jquery.ui.sortable.js (rev 0)
+++ sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/jquery.ui.sortable.js 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,1321 @@
+/*
+ * jQuery UI Sortable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ * jquery.ui.core.js
+ * jquery.ui.mouse.js
+ * jquery.ui.widget.js
+ */
+(function($, undefined)
+{
+
+ $.widget("ui.sortable", $.ui.mouse, {
+ widgetEventPrefix: "sort",
+ options: {
+ appendTo: "parent",
+ axis: false,
+ connectWith: false,
+ containment: false,
+ cursor: 'auto',
+ cursorAt: false,
+ dropOnEmpty: true,
+ forcePlaceholderSize: false,
+ forceHelperSize: false,
+ grid: false,
+ handle: false,
+ helper: "original",
+ items: '> *',
+ opacity: false,
+ placeholder: false,
+ revert: false,
+ scroll: true,
+ scrollSensitivity: 20,
+ scrollSpeed: 20,
+ scope: "default",
+ tolerance: "intersect",
+ zIndex: 1000
+ },
+ _create: function()
+ {
+
+ var o = this.options;
+ this.containerCache = {};
+ this.element.addClass("ui-sortable");
+
+ //Get the items
+ this.refresh();
+
+ //Let's determine if the items are being displayed horizontally
+ this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this
+ .items[0].item.css('display')) : false;
+
+ //Let's determine the parent's offset
+ this.offset = this.element.offset();
+
+ //Initialize mouse events for interaction
+ this._mouseInit();
+
+ },
+
+ destroy: function()
+ {
+ this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");
+ this._mouseDestroy();
+
+ for (var i = this.items.length - 1; i >= 0; i--) {
+ this.items[i].item.removeData("sortable-item");
+ }
+
+ return this;
+ },
+
+ _setOption: function(key, value)
+ {
+ if (key === "disabled") {
+ this.options[ key ] = value;
+
+ this.widget()
+ [ value ? "addClass" : "removeClass"]("ui-sortable-disabled");
+ } else {
+ // Don't call widget base _setOption for disable as it adds ui-state-disabled class
+ $.Widget.prototype._setOption.apply(this, arguments);
+ }
+ },
+
+ _mouseCapture: function(event, overrideHandle)
+ {
+
+ if (this.reverting) {
+ return false;
+ }
+
+ if (this.options.disabled || this.options.type == 'static') {
+ return false;
+ }
+
+ //We have to refresh the items data once first
+ this._refreshItems(event);
+
+ //Find out if the clicked node (or one of its parents) is a actual item in this.items
+ var currentItem = null, self = this, nodes = $(event.target).parents().each(function()
+ {
+ if ($.data(this, 'sortable-item') == self) {
+ currentItem = $(this);
+ return false;
+ }
+ });
+ if ($.data(event.target, 'sortable-item') == self) {
+ currentItem = $(event.target);
+ }
+
+ if (!currentItem) {
+ return false;
+ }
+ if (this.options.handle && !overrideHandle) {
+ var validHandle = false;
+
+ $(this.options.handle, currentItem).find("*").andSelf().each(function()
+ {
+ if (this == event.target) {
+ validHandle = true;
+ }
+ });
+ if (!validHandle) {
+ return false;
+ }
+ }
+
+ this.currentItem = currentItem;
+ this._removeCurrentsFromItems();
+ return true;
+
+ },
+
+ _mouseStart: function(event, overrideHandle, noActivation)
+ {
+
+ var o = this.options, self = this;
+ this.currentContainer = this;
+
+ //We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
+ this.refreshPositions();
+
+ //Create and append the visible helper
+ this.helper = this._createHelper(event);
+
+ //Cache the helper size
+ this._cacheHelperProportions();
+
+ /*
+ * - Position generation -
+ * This block generates everything position related - it's the core of draggables.
+ */
+
+ //Cache the margins of the original element
+ this._cacheMargins();
+
+ //Get the next scrolling parent
+ this.scrollParent = this.helper.scrollParent();
+
+ //The element's absolute position on the page minus margins
+ this.offset = this.currentItem.offset();
+ this.offset = {
+ top: this.offset.top - this.margins.top,
+ left: this.offset.left - this.margins.left
+ };
+
+ // Only after we got the offset, we can change the helper's position to absolute
+ // TODO: Still need to figure out a way to make relative sorting possible
+ this.helper.css("position", "absolute");
+ this.cssPosition = this.helper.css("position");
+
+ $.extend(this.offset, {
+ click: { //Where the click happened, relative to the element
+ left: event.pageX - this.offset.left,
+ top: event.pageY - this.offset.top
+ },
+ parent: this._getParentOffset(),
+ relative: this
+ ._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+ });
+
+ //Generate the original position
+ this.originalPosition = this._generatePosition(event);
+ this.originalPageX = event.pageX;
+ this.originalPageY = event.pageY;
+
+ //Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
+ (o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+ //Cache the former DOM position
+ this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
+
+ //If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
+ if (this.helper[0] != this.currentItem[0]) {
+ this.currentItem.hide();
+ }
+
+ //Create the placeholder
+ this._createPlaceholder();
+
+ //Set a containment if given in the options
+ if (o.containment) {
+ this._setContainment();
+ }
+
+ if (o.cursor) { // cursor option
+ if ($('body').css("cursor")) {
+ this._storedCursor = $('body').css("cursor");
+ }
+ $('body').css("cursor", o.cursor);
+ }
+
+ if (o.opacity) { // opacity option
+ if (this.helper.css("opacity")) {
+ this._storedOpacity = this.helper.css("opacity");
+ }
+ this.helper.css("opacity", o.opacity);
+ }
+
+ if (o.zIndex) { // zIndex option
+ if (this.helper.css("zIndex")) {
+ this._storedZIndex = this.helper.css("zIndex");
+ }
+ this.helper.css("zIndex", o.zIndex);
+ }
+
+ //Prepare scrolling
+ if (this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
+ this.overflowOffset = this.scrollParent.offset();
+ }
+
+ //Call callbacks
+ this._trigger("start", event, this._uiHash());
+
+ //Recache the helper size
+ if (!this._preserveHelperProportions) {
+ this._cacheHelperProportions();
+ }
+
+
+ //Post 'activate' events to possible containers
+ if (!noActivation) {
+ for (var i = this.containers.length - 1; i >= 0; i--) {
+ this.containers[i]._trigger("activate", event, self._uiHash(this));
+ }
+ }
+
+ //Prepare possible droppables
+ if ($.ui.ddmanager) {
+ $.ui.ddmanager.current = this;
+ }
+
+ if ($.ui.ddmanager && !o.dropBehaviour) {
+ $.ui.ddmanager.prepareOffsets(this, event);
+ }
+
+ this.dragging = true;
+
+ this.helper.addClass("ui-sortable-helper");
+ this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+ return true;
+
+ },
+
+ _mouseDrag: function(event)
+ {
+
+ //Compute the helpers position
+ this.position = this._generatePosition(event);
+ this.positionAbs = this._convertPositionTo("absolute");
+
+ if (!this.lastPositionAbs) {
+ this.lastPositionAbs = this.positionAbs;
+ }
+
+ //Do scrolling
+ if (this.options.scroll) {
+ var o = this.options, scrolled = false;
+ if (this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
+
+ if ((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
+ this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
+ } else if (event.pageY - this.overflowOffset.top < o.scrollSensitivity) {
+ this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+ }
+
+ if ((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
+ this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
+ } else if (event.pageX - this.overflowOffset.left < o.scrollSensitivity) {
+ this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+ }
+
+ } else {
+
+ if (event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
+ scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+ } else if ($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
+ scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+ }
+
+ if (event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
+ scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+ } else if ($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
+ scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+ }
+
+ }
+
+ if (scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
+ $.ui.ddmanager.prepareOffsets(this, event);
+ }
+ }
+
+ //Regenerate the absolute position used for position checks
+ this.positionAbs = this._convertPositionTo("absolute");
+
+ //Set the helper position
+ if (!this.options.axis || this.options.axis != "y") {
+ this.helper[0].style.left = this.position.left + 'px';
+ }
+ if (!this.options.axis || this.options.axis != "x") {
+ this.helper[0].style.top = this.position.top + 'px';
+ }
+
+ //Rearrange
+ for (var i = this.items.length - 1; i >= 0; i--) {
+
+ //Cache variables and intersection, continue if no intersection
+ var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
+ if (!intersection) {
+ continue;
+ }
+
+ if (itemElement != this.currentItem[0] //cannot intersect with itself && this.placeholder[intersection == 1 ? "next" : "prev"]()[0]
+ != itemElement //no useless actions that have been done before && !$.ui.contains(this.placeholder[0],
+ {
+ itemElement
+ }
+ ) //no action if the item moved is the parent of the item checked && (this.options.type == 'semi-dynamic' ? !$.ui
+ .contains(this.element[0], itemElement) : true)
+ //&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container) {
+
+ this.direction = intersection == 1 ? "down" : "up";
+
+ if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
+ this._rearrange(event, item);
+ } else {
+ break;
+ }
+
+ this._trigger("change", event, this._uiHash());
+ break;
+ }
+ }
+
+ //Post events to containers
+ this._contactContainers(event);
+
+ //Interconnect with droppables
+ if ($.ui.ddmanager) {
+ $.ui.ddmanager.drag(this, event);
+ }
+
+ //Call callbacks
+ this._trigger('sort', event, this._uiHash());
+
+ this.lastPositionAbs = this.positionAbs;
+ return false;
+
+ },
+
+ _mouseStop: function(event, noPropagation)
+ {
+
+ if (!event) {
+ return;
+ }
+
+ //If we are using droppables, inform the manager about the drop
+ if ($.ui.ddmanager && !this.options.dropBehaviour) {
+ $.ui.ddmanager.drop(this, event);
+ }
+
+ if (this.options.revert) {
+ var self = this;
+ var cur = self.placeholder.offset();
+
+ self.reverting = true;
+
+ $(this.helper).animate({
+ left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0]
+ .scrollLeft),
+ top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
+ }, parseInt(this.options.revert, 10) || 500, function()
+ {
+ self._clear(event);
+ });
+ } else {
+ this._clear(event, noPropagation);
+ }
+
+ return false;
+
+ },
+
+ cancel: function()
+ {
+
+ var self = this;
+
+ if (this.dragging) {
+
+ this._mouseUp({ target: null });
+
+ if (this.options.helper == "original") {
+ this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+ } else {
+ this.currentItem.show();
+ }
+
+ //Post deactivating events to containers
+ for (var i = this.containers.length - 1; i >= 0; i--) {
+ this.containers[i]._trigger("deactivate", null, self._uiHash(this));
+ if (this.containers[i].containerCache.over) {
+ this.containers[i]._trigger("out", null, self._uiHash(this));
+ this.containers[i].containerCache.over = 0;
+ }
+ }
+
+ }
+
+ if (this.placeholder) {
+ //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+ if (this.placeholder[0].parentNode) {
+ this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+ }
+ if (this.options.helper != "original" && this.helper && this.helper[0].parentNode) {
+ this.helper.remove();
+ }
+
+ $.extend(this, {
+ helper: null,
+ dragging: false,
+ reverting: false,
+ _noFinalSort: null
+ });
+
+ if (this.domPosition.prev) {
+ $(this.domPosition.prev).after(this.currentItem);
+ } else {
+ $(this.domPosition.parent).prepend(this.currentItem);
+ }
+ }
+
+ return this;
+
+ },
+
+ serialize: function(o)
+ {
+
+ var items = this._getItemsAsjQuery(o && o.connected);
+ var str = [];
+ o = o || {};
+
+ $(items).each(function()
+ {
+ var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+ if (res) {
+ str.push((o.key || res[1] + '[]') + '=' + (o.key && o.expression ? res[1] : res[2]));
+ }
+ });
+
+ if (!str.length && o.key) {
+ str.push(o.key + '=');
+ }
+
+ return str.join('&');
+
+ },
+
+ toArray: function(o)
+ {
+
+ var items = this._getItemsAsjQuery(o && o.connected);
+ var ret = [];
+ o = o || {};
+
+ items.each(function()
+ {
+ ret.push($(o.item || this).attr(o.attribute || 'id') || '');
+ });
+ return ret;
+
+ },
+
+ /* Be careful with the following core functions */
+ _intersectsWith: function(item)
+ {
+
+ var x1 = this.positionAbs.left,
+ x2 = x1 + this.helperProportions.width,
+ y1 = this.positionAbs.top,
+ y2 = y1 + this.helperProportions.height;
+
+ var l = item.left,
+ r = l + item.width,
+ t = item.top,
+ b = t + item.height;
+
+ var dyClick = this.offset.click.top,
+ dxClick = this.offset.click.left;
+
+ var isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r;
+
+ if (this.options.tolerance == "pointer" || this.options.forcePointerForContainers || (this.options.tolerance != "pointer" && this
+ .helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])) {
+ return isOverElement;
+ } else {
+
+ return (l < x1 + (this.helperProportions.width / 2) // Right Half && x2 - (this.helperProportions.width / 2) < r // Left Half && t < y1 + (this
+ .helperProportions.height / 2) // Bottom Half && y2 - (this.helperProportions.height / 2) < b ); // Top Half
+
+ }
+ },
+
+ _intersectsWithPointer: function(item)
+ {
+
+ var isOverElementHeight = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
+ isOverElementWidth = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
+ isOverElement = isOverElementHeight && isOverElementWidth,
+ verticalDirection = this._getDragVerticalDirection(),
+ horizontalDirection = this._getDragHorizontalDirection();
+
+ if (!isOverElement) {
+ return false;
+ }
+
+ return this.floating ? ( ((horizontalDirection && horizontalDirection == "right") || verticalDirection == "down") ? 2 : 1 ) : ( verticalDirection
+ && (verticalDirection == "down" ? 2 : 1) );
+
+ },
+
+ _intersectsWithSides: function(item)
+ {
+
+ var isOverBottomHalf = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height / 2), item.height),
+ isOverRightHalf = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width / 2), item.width),
+ verticalDirection = this._getDragVerticalDirection(),
+ horizontalDirection = this._getDragHorizontalDirection();
+
+ if (this.floating && horizontalDirection) {
+ return ((horizontalDirection == "right" && isOverRightHalf) || (horizontalDirection == "left" && !isOverRightHalf));
+ } else {
+ return verticalDirection && ((verticalDirection == "down" && isOverBottomHalf) || (verticalDirection == "up" && !isOverBottomHalf));
+ }
+
+ },
+
+ _getDragVerticalDirection: function()
+ {
+ var delta = this.positionAbs.top - this.lastPositionAbs.top;
+ return delta != 0 && (delta > 0 ? "down" : "up");
+ },
+
+ _getDragHorizontalDirection: function()
+ {
+ var delta = this.positionAbs.left - this.lastPositionAbs.left;
+ return delta != 0 && (delta > 0 ? "right" : "left");
+ },
+
+ refresh: function(event)
+ {
+ this._refreshItems(event);
+ this.refreshPositions();
+ return this;
+ },
+
+ _connectWith: function()
+ {
+ var options = this.options;
+ return options.connectWith.constructor == String ? [options.connectWith] : options.connectWith;
+ },
+
+ _getItemsAsjQuery: function(connected)
+ {
+
+ var self = this;
+ var items = [];
+ var queries = [];
+ var connectWith = this._connectWith();
+
+ if (connectWith && connected) {
+ for (var i = connectWith.length - 1; i >= 0; i--) {
+ var cur = $(connectWith[i]);
+ for (var j = cur.length - 1; j >= 0; j--) {
+ var inst = $.data(cur[j], 'sortable');
+ if (inst && inst != this && !inst.options.disabled) {
+ queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element)
+ .not(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]);
+ }
+ }
+ ;
+ }
+ ;
+ }
+
+ queries.push([
+ $.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this
+ .options.items, this.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), this]);
+
+ for (var i = queries.length - 1; i >= 0; i--) {
+ queries[i][0].each(function()
+ {
+ items.push(this);
+ });
+ }
+ ;
+
+ return $(items);
+
+ },
+
+ _removeCurrentsFromItems: function()
+ {
+
+ var list = this.currentItem.find(":data(sortable-item)");
+
+ for (var i = 0; i < this.items.length; i++) {
+
+ for (var j = 0; j < list.length; j++) {
+ if (list[j] == this.items[i].item[0]) {
+ this.items.splice(i, 1);
+ }
+ }
+ ;
+
+ }
+ ;
+
+ },
+
+ _refreshItems: function(event)
+ {
+
+ this.items = [];
+ this.containers = [this];
+ var items = this.items;
+ var self = this;
+ var queries = [
+ [$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items,
+ this.element), this]
+ ];
+ var connectWith = this._connectWith();
+
+ if (connectWith) {
+ for (var i = connectWith.length - 1; i >= 0; i--) {
+ var cur = $(connectWith[i]);
+ for (var j = cur.length - 1; j >= 0; j--) {
+ var inst = $.data(cur[j], 'sortable');
+ if (inst && inst != this && !inst.options.disabled) {
+ queries.push([
+ $.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options
+ .items, inst.element), inst]);
+ this.containers.push(inst);
+ }
+ }
+ ;
+ }
+ ;
+ }
+
+ for (var i = queries.length - 1; i >= 0; i--) {
+ var targetData = queries[i][1];
+ var _queries = queries[i][0];
+
+ for (var j = 0, queriesLength = _queries.length; j < queriesLength; j++) {
+ var item = $(_queries[j]);
+
+ item.data('sortable-item', targetData); // Data for target checking (mouse manager)
+
+ items.push({
+ item: item,
+ instance: targetData,
+ width: 0, height: 0,
+ left: 0, top: 0
+ });
+ }
+ ;
+ }
+ ;
+
+ },
+
+ refreshPositions: function(fast)
+ {
+
+ //This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
+ if (this.offsetParent && this.helper) {
+ this.offset.parent = this._getParentOffset();
+ }
+
+ for (var i = this.items.length - 1; i >= 0; i--) {
+ var item = this.items[i];
+
+ //We ignore calculating positions of all connected containers when we're not over them
+ if (item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0]) {
+ continue;
+ }
+
+ var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
+
+ if (!fast) {
+ item.width = t.outerWidth();
+ item.height = t.outerHeight();
+ }
+
+ var p = t.offset();
+ item.left = p.left;
+ item.top = p.top;
+ }
+ ;
+
+ if (this.options.custom && this.options.custom.refreshContainers) {
+ this.options.custom.refreshContainers.call(this);
+ } else {
+ for (var i = this.containers.length - 1; i >= 0; i--) {
+ var p = this.containers[i].element.offset();
+ this.containers[i].containerCache.left = p.left;
+ this.containers[i].containerCache.top = p.top;
+ this.containers[i].containerCache.width = this.containers[i].element.outerWidth();
+ this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
+ }
+ ;
+ }
+
+ return this;
+ },
+
+ _createPlaceholder: function(that)
+ {
+
+ var self = that || this, o = self.options;
+
+ if (!o.placeholder || o.placeholder.constructor == String) {
+ var className = o.placeholder;
+ o.placeholder = {
+ element: function()
+ {
+
+ var el = $(document.createElement(self.currentItem[0].nodeName)).addClass(className || self.currentItem[0].className
+ + " ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];
+
+ if (!className) {
+ el.style.visibility = "hidden";
+ }
+
+ return el;
+ },
+ update: function(container, p)
+ {
+
+ // 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
+ // 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
+ if (className && !o.forcePlaceholderSize) {
+ return;
+ }
+
+ //If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
+ if (!p.height()) {
+ p.height(self.currentItem.innerHeight() - parseInt(self.currentItem.css('paddingTop') || 0, 10) - parseInt(self.currentItem
+ .css('paddingBottom') || 0, 10));
+ }
+ ;
+ if (!p.width()) {
+ p.width(self.currentItem.innerWidth() - parseInt(self.currentItem.css('paddingLeft') || 0, 10) - parseInt(self.currentItem
+ .css('paddingRight') || 0, 10));
+ }
+ ;
+ }
+ };
+ }
+
+ //Create the placeholder
+ self.placeholder = $(o.placeholder.element.call(self.element, self.currentItem));
+
+ //Append it after the actual current item
+ self.currentItem.after(self.placeholder);
+
+ //Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
+ o.placeholder.update(self, self.placeholder);
+
+ },
+
+ _contactContainers: function(event)
+ {
+
+ // get innermost container that intersects with item
+ var innermostContainer = null, innermostIndex = null;
+
+
+ for (var i = this.containers.length - 1; i >= 0; i--) {
+
+ // never consider a container that's located within the item itself
+ if ($.ui.contains(this.currentItem[0], this.containers[i].element[0])) {
+ continue;
+ }
+
+ if (this._intersectsWith(this.containers[i].containerCache)) {
+
+ // if we've already found a container and it's more "inner" than this, then continue
+ if (innermostContainer && $.ui.contains(this.containers[i].element[0], innermostContainer.element[0])) {
+ continue;
+ }
+
+ innermostContainer = this.containers[i];
+ innermostIndex = i;
+
+ } else {
+ // container doesn't intersect. trigger "out" event if necessary
+ if (this.containers[i].containerCache.over) {
+ this.containers[i]._trigger("out", event, this._uiHash(this));
+ this.containers[i].containerCache.over = 0;
+ }
+ }
+
+ }
+
+ // if no intersecting containers found, return
+ if (!innermostContainer) {
+ return;
+ }
+
+ // move the item into the container if it's not there already
+ if (this.containers.length === 1) {
+ this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+ this.containers[innermostIndex].containerCache.over = 1;
+ } else if (this.currentContainer != this.containers[innermostIndex]) {
+
+ //When entering a new container, we will find the item with the least distance and append our item near it
+ var dist = 10000;
+ var itemWithLeastDistance = null;
+ var base = this.positionAbs[this.containers[innermostIndex].floating ? 'left' : 'top'];
+ for (var j = this.items.length - 1; j >= 0; j--) {
+ if (!$.ui.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) {
+ continue;
+ }
+ var cur = this.items[j][this.containers[innermostIndex].floating ? 'left' : 'top'];
+ if (Math.abs(cur - base) < dist) {
+ dist = Math.abs(cur - base);
+ itemWithLeastDistance = this.items[j];
+ }
+ }
+
+ if (!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled
+ {
+ return;
+ }
+
+ this.currentContainer = this.containers[innermostIndex];
+ itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null,
+ this.containers[innermostIndex].element, true);
+ this._trigger("change", event, this._uiHash());
+ this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
+
+ //Update the placeholder
+ this.options.placeholder.update(this.currentContainer, this.placeholder);
+
+ this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+ this.containers[innermostIndex].containerCache.over = 1;
+ }
+
+
+ },
+
+ _createHelper: function(event)
+ {
+
+ var o = this.options;
+ var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper == 'clone' ? this.currentItem
+ .clone() : this.currentItem);
+
+ if (!helper.parents('body').length) //Add the helper to the DOM if that didn't happen already
+ {
+ $(o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
+ }
+
+ if (helper[0] == this.currentItem[0]) {
+ this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem
+ .css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
+ }
+
+ if (helper[0].style.width == '' || o.forceHelperSize) {
+ helper.width(this.currentItem.width());
+ }
+ if (helper[0].style.height == '' || o.forceHelperSize) {
+ helper.height(this.currentItem.height());
+ }
+
+ return helper;
+
+ },
+
+ _adjustOffsetFromHelper: function(obj)
+ {
+ if (typeof obj == 'string') {
+ obj = obj.split(' ');
+ }
+ if ($.isArray(obj)) {
+ obj = {left: +obj[0], top: +obj[1] || 0};
+ }
+ if ('left' in obj) {
+ this.offset.click.left = obj.left + this.margins.left;
+ }
+ if ('right' in obj) {
+ this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+ }
+ if ('top' in obj) {
+ this.offset.click.top = obj.top + this.margins.top;
+ }
+ if ('bottom' in obj) {
+ this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+ }
+ },
+
+ _getParentOffset: function()
+ {
+
+
+ //Get the offsetParent and cache its position
+ this.offsetParent = this.helper.offsetParent();
+ var po = this.offsetParent.offset();
+
+ // This is a special case where we need to modify a offset calculated on start, since the following happened:
+ // 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+ // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+ // the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+ if (this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) {
+ po.left += this.scrollParent.scrollLeft();
+ po.top += this.scrollParent.scrollTop();
+ }
+
+ if ((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information || (this
+ .offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie)) //Ugly IE fix
+ po = { top: 0, left: 0 };
+
+ return {
+ top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"), 10) || 0),
+ left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"), 10) || 0)
+ };
+
+ },
+
+ _getRelativeOffset: function()
+ {
+
+ if (this.cssPosition == "relative") {
+ var p = this.currentItem.position();
+ return {
+ top: p.top - (parseInt(this.helper.css("top"), 10) || 0) + this.scrollParent.scrollTop(),
+ left: p.left - (parseInt(this.helper.css("left"), 10) || 0) + this.scrollParent.scrollLeft()
+ };
+ } else {
+ return { top: 0, left: 0 };
+ }
+
+ },
+
+ _cacheMargins: function()
+ {
+ this.margins = {
+ left: (parseInt(this.currentItem.css("marginLeft"), 10) || 0),
+ top: (parseInt(this.currentItem.css("marginTop"), 10) || 0)
+ };
+ },
+
+ _cacheHelperProportions: function()
+ {
+ this.helperProportions = {
+ width: this.helper.outerWidth(),
+ height: this.helper.outerHeight()
+ };
+ },
+
+ _setContainment: function()
+ {
+
+ var o = this.options;
+ if (o.containment == 'parent') {
+ o.containment = this.helper[0].parentNode;
+ }
+ if (o.containment == 'document' || o.containment == 'window') {
+ this.containment = [
+ 0 - this.offset.relative.left - this.offset.parent.left,
+ 0 - this.offset.relative.top - this.offset.parent.top,
+ $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
+ ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height
+ - this.margins.top
+ ];
+ }
+
+ if (!(/^(document|window|parent)$/).test(o.containment)) {
+ var ce = $(o.containment)[0];
+ var co = $(o.containment).offset();
+ var over = ($(ce).css("overflow") != 'hidden');
+
+ this.containment = [
+ co.left + (parseInt($(ce).css("borderLeftWidth"), 10) || 0) + (parseInt($(ce).css("paddingLeft"), 10) || 0) - this.margins.left,
+ co.top + (parseInt($(ce).css("borderTopWidth"), 10) || 0) + (parseInt($(ce).css("paddingTop"), 10) || 0) - this.margins.top,
+ co.left + (over ? Math.max(ce.scrollWidth, ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"), 10) || 0)
+ - (parseInt($(ce).css("paddingRight"), 10) || 0) - this.helperProportions.width - this.margins.left,
+ co.top + (over ? Math.max(ce.scrollHeight, ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"), 10) || 0)
+ - (parseInt($(ce).css("paddingBottom"), 10) || 0) - this.helperProportions.height - this.margins.top
+ ];
+ }
+
+ },
+
+ _convertPositionTo: function(d, pos)
+ {
+
+ if (!pos) {
+ pos = this.position;
+ }
+ var mod = d == "absolute" ? 1 : -1;
+ var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0],
+ this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+ return {
+ top: (
+ pos.top // The absolute mouse position + this.offset.relative.top
+ * mod // Only for relative positioned nodes: Relative offset from element to offset parent
+ + this.offset.parent.top
+ * mod // The offsetParent's offset without borders (offset + border) - ($.browser
+ .safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent
+ .scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+ ),
+ left: (
+ pos.left // The absolute mouse position + this.offset.relative.left
+ * mod // Only for relative positioned nodes: Relative offset from element to offset parent
+ + this.offset.parent.left
+ * mod // The offsetParent's offset without borders (offset + border) - ($.browser
+ .safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent
+ .scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+ )
+ };
+
+ },
+
+ _generatePosition: function(event)
+ {
+
+ var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0],
+ this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+ // This is another very weird special case that only happens for relative elements:
+ // 1. If the css position is relative
+ // 2. and the scroll parent is the document or similar to the offset parent
+ // we have to refresh the relative offset during the scroll so there are no jumps
+ if (this.cssPosition == 'relative' && !(this.scrollParent[0] != document && this.scrollParent[0] != this.offsetParent[0])) {
+ this.offset.relative = this._getRelativeOffset();
+ }
+
+ var pageX = event.pageX;
+ var pageY = event.pageY;
+
+ /*
+ * - Position constraining -
+ * Constrain the position to a mix of grid, containment.
+ */
+
+ if (this.originalPosition) { //If we are not dragging yet, we won't check for options
+
+ if (this.containment) {
+ if (event.pageX - this.offset.click.left < this.containment[0]) {
+ pageX = this.containment[0] + this.offset.click.left;
+ }
+ if (event.pageY - this.offset.click.top < this.containment[1]) {
+ pageY = this.containment[1] + this.offset.click.top;
+ }
+ if (event.pageX - this.offset.click.left > this.containment[2]) {
+ pageX = this.containment[2] + this.offset.click.left;
+ }
+ if (event.pageY - this.offset.click.top > this.containment[3]) {
+ pageY = this.containment[3] + this.offset.click.top;
+ }
+ }
+
+ if (o.grid) {
+ var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
+ pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this
+ .containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+ var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
+ pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this
+ .containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+ }
+
+ }
+
+ return {
+ top: (
+ pageY // The absolute mouse position - this.offset.click
+ .top // Click offset (relative to the element) - this.offset.relative
+ .top // Only for relative positioned nodes: Relative offset from element to offset parent
+ - this.offset.parent
+ .top // The offsetParent's offset without borders (offset + border) + ($.browser
+ .safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent
+ .scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+ ),
+ left: (
+ pageX // The absolute mouse position - this.offset.click
+ .left // Click offset (relative to the element) - this.offset.relative
+ .left // Only for relative positioned nodes: Relative offset from element to offset parent
+ - this.offset.parent
+ .left // The offsetParent's offset without borders (offset + border) + ($.browser
+ .safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent
+ .scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+ )
+ };
+
+ },
+
+ _rearrange: function(event, i, a, hardRefresh)
+ {
+
+ a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0],
+ (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling));
+
+ //Various things done here to improve the performance:
+ // 1. we create a setTimeout, that calls refreshPositions
+ // 2. on the instance, we have a counter variable, that get's higher after every append
+ // 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
+ // 4. this lets only the last addition to the timeout stack through
+ this.counter = this.counter ? ++this.counter : 1;
+ var self = this, counter = this.counter;
+
+ window.setTimeout(function()
+ {
+ if (counter == self.counter) {
+ self.refreshPositions(!hardRefresh);
+ } //Precompute after each DOM insertion, NOT on mousemove
+ }, 0);
+
+ },
+
+ _clear: function(event, noPropagation)
+ {
+
+ this.reverting = false;
+ // We delay all events that have to be triggered to after the point where the placeholder has been removed and
+ // everything else normalized again
+ var delayedTriggers = [], self = this;
+
+ // We first have to update the dom position of the actual currentItem
+ // Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
+ if (!this._noFinalSort && this.currentItem.parent().length) {
+ this.placeholder.before(this.currentItem);
+ }
+ this._noFinalSort = null;
+
+ if (this.helper[0] == this.currentItem[0]) {
+ for (var i in this._storedCSS) {
+ if (this._storedCSS[i] == 'auto' || this._storedCSS[i] == 'static') {
+ this._storedCSS[i] = '';
+ }
+ }
+ this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+ } else {
+ this.currentItem.show();
+ }
+
+ if (this.fromOutside && !noPropagation) {
+ delayedTriggers.push(function(event)
+ {
+ this._trigger("receive", event, this._uiHash(this.fromOutside));
+ });
+ }
+ if ((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this
+ .currentItem.parent()[0]) && !noPropagation) {
+ delayedTriggers.push(function(event)
+ {
+ this._trigger("update", event, this._uiHash());
+ });
+ } //Trigger update callback if the DOM position has changed
+ if (!$.ui.contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element
+ if (!noPropagation) {
+ delayedTriggers.push(function(event)
+ {
+ this._trigger("remove", event, this._uiHash());
+ });
+ }
+ for (var i = this.containers.length - 1; i >= 0; i--) {
+ if ($.ui.contains(this.containers[i].element[0], this.currentItem[0]) && !noPropagation) {
+ delayedTriggers.push((function(c)
+ {
+ return function(event)
+ {
+ c._trigger("receive", event, this._uiHash(this));
+ };
+ }).call(this, this.containers[i]));
+ delayedTriggers.push((function(c)
+ {
+ return function(event)
+ {
+ c._trigger("update", event, this._uiHash(this));
+ };
+ }).call(this, this.containers[i]));
+ }
+ }
+ ;
+ }
+ ;
+
+ //Post events to containers
+ for (var i = this.containers.length - 1; i >= 0; i--) {
+ if (!noPropagation) {
+ delayedTriggers.push((function(c)
+ {
+ return function(event)
+ {
+ c._trigger("deactivate", event, this._uiHash(this));
+ };
+ }).call(this, this.containers[i]));
+ }
+ if (this.containers[i].containerCache.over) {
+ delayedTriggers.push((function(c)
+ {
+ return function(event)
+ {
+ c._trigger("out", event, this._uiHash(this));
+ };
+ }).call(this, this.containers[i]));
+ this.containers[i].containerCache.over = 0;
+ }
+ }
+
+ //Do what was originally in plugins
+ if (this._storedCursor) {
+ $('body').css("cursor", this._storedCursor);
+ } //Reset cursor
+ if (this._storedOpacity) {
+ this.helper.css("opacity", this._storedOpacity);
+ } //Reset opacity
+ if (this._storedZIndex) {
+ this.helper.css("zIndex", this._storedZIndex == 'auto' ? '' : this._storedZIndex);
+ } //Reset z-index
+
+ this.dragging = false;
+ if (this.cancelHelperRemoval) {
+ if (!noPropagation) {
+ this._trigger("beforeStop", event, this._uiHash());
+ for (var i = 0; i < delayedTriggers.length; i++) {
+ delayedTriggers[i].call(this, event);
+ }
+ ; //Trigger all delayed events
+ this._trigger("stop", event, this._uiHash());
+ }
+ return false;
+ }
+
+ if (!noPropagation) {
+ this._trigger("beforeStop", event, this._uiHash());
+ }
+
+ //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+ this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+
+ if (this.helper[0] != this.currentItem[0]) {
+ this.helper.remove();
+ }
+ this.helper = null;
+
+ if (!noPropagation) {
+ for (var i = 0; i < delayedTriggers.length; i++) {
+ delayedTriggers[i].call(this, event);
+ }
+ ; //Trigger all delayed events
+ this._trigger("stop", event, this._uiHash());
+ }
+
+ this.fromOutside = false;
+ return true;
+
+ },
+
+ _trigger: function()
+ {
+ if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
+ this.cancel();
+ }
+ },
+
+ _uiHash: function(inst)
+ {
+ var self = inst || this;
+ return {
+ helper: self.helper,
+ placeholder: self.placeholder || $([]),
+ position: self.position,
+ originalPosition: self.originalPosition,
+ offset: self.positionAbs,
+ item: self.currentItem,
+ sender: inst ? inst.element : null
+ };
+ }
+
+ });
+
+ $.extend($.ui.sortable, {
+ version: "1.8.16"
+ });
+
+})(jQuery);
Added: sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/richfaces.dashboard.js
===================================================================
--- sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/richfaces.dashboard.js (rev 0)
+++ sandbox/trunk/ui/dashboard/ui/src/main/resources/META-INF/resources/richfaces.dashboard.js 2011-11-23 11:53:41 UTC (rev 22979)
@@ -0,0 +1,221 @@
+/**
+ * This function evaluates code in template with object in ScopeChain.
+ * This is usefull if you need to evaluate code that uses member names
+ * that colide with external names that the code refers to.
+ * There is almost exact method in utils.js called Richfaces.eval,
+ * but it swallows exception thrown during evaluation, which makes debugging
+ * hard.
+ */
+(function ($, rf)
+{
+ // Create (for example) ui container for our component class
+ rf.ui = rf.ui || {};
+ // Default options definition if needed for the component
+ // var defaultOptions = {};
+ const SUBMIT_EVENT_FUNCTION = 'submitEventFunction';
+ const DASHBOARD_CHANGE = "dashboardChanged";
+ const DASHBOARD_START_POSITION = "dashboardStartPosition";
+ const ORIGINAL_MIN_HEIGHT = "dashboardOriginalMinHeight";
+
+ /**
+ * Calculates child index for given item within it's parent.
+ * @param item item to get index for
+ */
+ var getIndex = function(item)
+ {
+ var index = -1;
+ while (item != null && item.size() > 0) {
+ item = item.prev();
+ index++;
+ }
+ return index;
+ };
+ // Extending component class with new properties and methods using extendClass
+ // $super - reference to the parent prototype, will be available inside those methods
+ rf.ui.Dashboard = rf.BaseComponent.extendClass({
+ // class name
+ name:"Dashboard",
+ init: function (componentId, options)
+ {
+ var dashboard = this;
+ this.element = document.getElementById(componentId);
+ if (!this.element) {
+ throw "No element with id '" + componentId + "' found.";
+ }
+ this.container = jQuery(this.element);
+ this.options = options;
+ // call constructor of parent class if needed
+ $super.constructor.call(this, componentId);
+ // attach component object to DOM element for
+ // future cleaning and for client side API calls
+ this.attachToDom(this.id);
+ // ...
+
+ var startHandler = function(event, data)
+ {
+ /**
+ * Store original position
+ */
+ var y = getIndex(data.item);
+ var x = getIndex(data.item.parent());
+ data.item.data(DASHBOARD_START_POSITION, {x:x,y:y});
+ /**
+ * set min-height to all columns so that it's easy to move components accross columns
+ */
+ var columns = jQuery(".rf-db-cl", dashboard.container);
+ columns.css("minHeight", "");
+ columns.each(function()
+ {
+ var jthis = jQuery(this);
+ jthis.data(ORIGINAL_MIN_HEIGHT, jthis.css("minHeight"));
+ jthis.css("minHeight", 0);
+ });
+ var maxHeight = 0;
+ columns.each(function()
+ {
+ var height = jQuery(this).height();
+ if (height > maxHeight) {
+ maxHeight = height;
+ }
+ });
+ columns.css("minHeight", maxHeight + 50);
+ };
+ var stopHandler = function(event, data)
+ {
+ var columns = jQuery(".rf-db-cl", dashboard.container);
+ columns.each(function()
+ {
+ var jthis = jQuery(this);
+ var originalMinHeight = jthis.data(ORIGINAL_MIN_HEIGHT);
+ jthis.css("minHeight", originalMinHeight == null ? 0 : originalMinHeight);
+ });
+ var changed = data.item.data(DASHBOARD_CHANGE);
+ data.item.data(DASHBOARD_CHANGE, null);
+ var y = getIndex(data.item);
+ var x = getIndex(data.item.parent());
+ if (changed) {
+ var sP = data.item.data(DASHBOARD_START_POSITION);
+ if (dashboard.__executeEventHandler("beforechange", {event:event,item:data.item,startX:sP.x,startY:sP.y,endX:x,endY:y}) === false) {
+ dashboard.cancel();
+ return;
+ }
+ if (dashboard.options[SUBMIT_EVENT_FUNCTION] != null) {
+ dashboard.options[SUBMIT_EVENT_FUNCTION](event, 'change', sP.x, sP.y, x, y);
+ }
+ dashboard.__executeEventHandler("change", {event:event,item:data.item,startX:sP.x,startY:sP.y,endX:x,endY:y});
+ }
+ };
+ var updateHandler = function(event, data)
+ {
+ /**
+ * Store info about change in item because this method is fired for every column
+ * (dropping 1 item may call this method 3 times if there are 3 columns)
+ */
+ data.item.data(DASHBOARD_CHANGE, true)
+ };
+ this.options.disabled = !this.options.enabled;
+ this.options.placeholder = this.options["placeholderClass"];
+ const placeholderRF = "rf-db-plh";
+ this.options = jQuery.extend({
+ placeholder:placeholderRF,
+ forcePlaceholderSize:true,
+ tolerance:"pointer",
+ disabled:false,
+ start:startHandler,
+ stop:stopHandler,
+ update:updateHandler
+ }, this.options);
+ this.options = jQuery.extend(this.options, {
+ connectWith : jQuery(".rf-db-cl", this.container)
+ });
+ if (this.options.placeholder != placeholderRF) {
+ this.options.placeholder = placeholderRF + " " + this.options.placeholder;
+ }
+
+ /**
+ * Plugin init on document load
+ */
+ jQuery(function()
+ {
+ var sortableContainer = jQuery(".rf-db-cl", dashboard.container);
+ sortableContainer.sortable(dashboard.options);
+ if (dashboard.options.enabled !== false) {
+ sortableContainer.disableSelection();
+ }
+ });
+ },
+ // private functions definition
+ /**
+ * Utility functions.
+ */
+ __getResponseComponentData : function(event)
+ {
+ return event.componentData[this.id];
+ },
+ /**
+ * Executes event handler passed in options.
+ * @param eventName name of the event
+ * @param context hash of variables that should be placed in scope when during evaluation
+ */
+ __executeEventHandler : function(eventName, context)
+ {
+ if (this.options[eventName] instanceof Function) {
+ return this.options[eventName].apply(this, context);
+ } else if (this.options[eventName] != null) {
+ return rf.ui.Dashboard.eval("(function(){" + this.options[eventName] + "})()", context);
+ } else {
+ return null;
+ }
+ },
+ __getDelegate : function()
+ {
+ return jQuery(".rf-db-cl", this.container);
+ },
+ cancel : function ()
+ {
+ this.__getDelegate().sortable("cancel");
+ },
+ enable : function ()
+ {
+ this.__getDelegate().sortable("enable");
+ this.__getDelegate().disableSelection();
+ },
+ disable : function ()
+ {
+ this.__getDelegate().sortable("disable");
+ this.__getDelegate().enableSelection();
+ },
+ // destructor definition
+ destroy: function ()
+ {
+ // define destructor if additional cleaning is needed but
+ // in most cases its not nessesary.
+ // call parent’s destructor
+ $super.destroy.call(this);
+ }
+ });
+ // define super class reference - reference to the parent prototype
+ var $super = rf.ui.Dashboard.$super;
+})(jQuery, RichFaces);
+RichFaces.ui.Dashboard.eval = function(template, object)
+{
+ var value;
+ with (object) {
+ value = eval(template);
+ }
+ return value;
+};
+
+/**
+ * Add :focus selector to jQuery since it is in 1.6 and RF is shipped with 1.5
+ */
+(function ($)
+{
+ var filters = $.expr[":"];
+ if (!filters.focus) {
+ filters.focus = function(elem)
+ {
+ return elem === document.activeElement && ( elem.type || elem.href );
+ };
+ }
+})(jQuery);
12 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r22978 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor.
by richfaces-svn-commits＠lists.jboss.org
Author: jjamrich
Date: 2011-11-23 06:18:45 -0500 (Wed, 23 Nov 2011)
New Revision: 22978
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java
Log:
rich:editor: change way to retrieve @style value
Found that there is another way how to retrieve @style value in richfaces-selenium lib. Changed test to use this prefered way.
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java 2011-11-23 10:30:53 UTC (rev 22977)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java 2011-11-23 11:18:45 UTC (rev 22978)
@@ -5,21 +5,32 @@
import static java.text.MessageFormat.format;
import static org.jboss.test.selenium.locator.LocatorFactory.jq;
+import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.editorAttributes;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.immediate;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.lang;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.readonly;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.rendered;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.required;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.requiredMessage;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.skin;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.styleClass;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.title;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.toolbar;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.value;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.width;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
-import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.editorAttributes;
-import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.*;
import java.net.URL;
+import org.jboss.test.selenium.css.CssProperty;
import org.jboss.test.selenium.dom.Event;
import org.jboss.test.selenium.encapsulated.FrameLocator;
import org.jboss.test.selenium.locator.Attribute;
import org.jboss.test.selenium.locator.AttributeLocator;
import org.jboss.test.selenium.locator.JQueryLocator;
import org.jboss.test.selenium.utils.URLUtils;
-import org.jboss.test.selenium.waiting.EventFiredCondition;
import org.jboss.test.selenium.waiting.selenium.SeleniumCondition;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
@@ -44,8 +55,7 @@
private JQueryLocator validationMsgLoc = pjq("span.rf-msgs-sum");
private JQueryLocator editorToolbarGroup = jq("span.cke_toolbar");
-
- private Attribute styleAttribute = new Attribute("style");
+
private Attribute langAttribute = new Attribute("lang");
public enum toolbarGroup {
@@ -171,9 +181,10 @@
editorAttributes.set(EditorAttributes.height, height);
// height style is set for area used as editor canvas (not for whole editor component)
- String style = selenium.getAttribute(
- editor.getDescendant(jq("table.cke_editor tr:eq(1) td")).getAttribute(styleAttribute));
-
+ // String style = selenium.getAttribute(
+ // editor.getDescendant(jq("table.cke_editor tr:eq(1) td")).getAttribute(styleAttribute));
+ String style = selenium.getStyle(
+ editor.getDescendant(jq("table.cke_editor tr:eq(1) td")), CssProperty.HEIGHT);
assertTrue(style != null && style.contains(height));
}
@@ -380,7 +391,7 @@
String STYLE_WIDTH = "345px";
editorAttributes.set(width, STYLE_WIDTH);
- String styleAttr = selenium.getAttribute(editor.getAttribute(styleAttribute));
+ String styleAttr = selenium.getStyle(editor, CssProperty.WIDTH);
assertTrue(styleAttr != null && styleAttr.contains(STYLE_WIDTH), "Style attribute should contain width value");
}
12 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r22977 - in modules/tests/metamer/trunk: application/src/main/webapp/components/richDataScroller and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: jpapouse
Date: 2011-11-23 05:30:53 -0500 (Wed, 23 Nov 2011)
New Revision: 22977
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichDataScrollerBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestDataScrollerAttributes.java
Log:
RFPL-1738: tests for attributes (rich:dataScroller)
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichDataScrollerBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichDataScrollerBean.java 2011-11-22 23:37:09 UTC (rev 22976)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichDataScrollerBean.java 2011-11-23 10:30:53 UTC (rev 22977)
@@ -45,6 +45,7 @@
private static final long serialVersionUID = 122475400649809L;
private static Logger logger;
private Attributes attributes;
+ private Attributes tableAttributes;
private boolean state = true;
/**
@@ -56,7 +57,7 @@
logger.debug("initializing bean " + getClass().getName());
attributes = Attributes.getComponentAttributesFromFacesConfig(UIDataScroller.class, getClass());
-
+
attributes.setAttribute("boundaryControls", "show");
attributes.setAttribute("fastControls", "show");
attributes.setAttribute("stepControls", "show");
@@ -69,6 +70,9 @@
attributes.setAttribute("renderIfSinglePage", true);
attributes.setAttribute("for", "richDataTable");
+ tableAttributes = Attributes.getEmptyAttributes(getClass());
+ tableAttributes.setAttribute("rows", 9);
+
}
public Attributes getAttributes() {
@@ -79,6 +83,14 @@
this.attributes = attributes;
}
+ public Attributes getTableAttributes() {
+ return tableAttributes;
+ }
+
+ public void setTableAttributes(Attributes tableAttributes) {
+ this.tableAttributes = tableAttributes;
+ }
+
/**
* Getter for state.
* @return true if non-empty data model should be used in table
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-11-22 23:37:09 UTC (rev 22976)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-11-23 10:30:53 UTC (rev 22977)
@@ -56,6 +56,7 @@
fastControls="#{richDataScrollerBean.attributes['fastControls'].value}"
fastStep="#{richDataScrollerBean.attributes['fastStep'].value}"
lastPageMode="#{richDataScrollerBean.attributes['lastPageMode'].value}"
+ limitRender="#{richDataScrollerBean.attributes['limitRender'].value}"
maxPages="#{richDataScrollerBean.attributes['maxPages'].value}"
onbegin="#{richDataScrollerBean.attributes['onbegin'].value}"
onbeforedomupdate="#{richDataScrollerBean.attributes['onbeforedomupdate'].value}"
@@ -64,14 +65,18 @@
render="#{richDataScrollerBean.attributes['render'].value} #{nestedComponentId}"
renderIfSinglePage="#{richDataScrollerBean.attributes['renderIfSinglePage'].value}"
rendered="#{richDataScrollerBean.attributes['rendered'].value}"
+ status="#{richDataScrollerBean.attributes['status'].value}"
stepControls="#{richDataScrollerBean.attributes['stepControls'].value}"
+ style="#{richDataScrollerBean.attributes['style'].value}"
+ styleClass="#{richDataScrollerBean.attributes['styleClass'].value}"
+ title="#{richDataScrollerBean.attributes['title'].value}"
/>
</ui:define>
<ui:define name="component">
<rich:dataTable id="richDataTable"
- rows="9"
+ rows="#{richDataScrollerBean.tableAttributes['rows'].value}"
value="#{richDataScrollerBean.state ? model.capitals : null}"
var="record"
>
@@ -106,10 +111,13 @@
<rich:dataScroller id="scroller2"
boundaryControls="#{richDataScrollerBean.attributes['boundaryControls'].value}"
+ data="#{richDataScrollerBean.attributes['data'].value}"
+ execute="#{richDataScrollerBean.attributes['execute'].value}"
fastControls="#{richDataScrollerBean.attributes['fastControls'].value}"
fastStep="#{richDataScrollerBean.attributes['fastStep'].value}"
first="#{richDataScrollerBean.attributes['first'].value}"
lastPageMode="#{richDataScrollerBean.attributes['lastPageMode'].value}"
+ limitRender="#{richDataScrollerBean.attributes['limitRender'].value}"
maxPages="#{richDataScrollerBean.attributes['maxPages'].value}"
onbegin="#{richDataScrollerBean.attributes['onbegin'].value}"
onbeforedomupdate="#{richDataScrollerBean.attributes['onbeforedomupdate'].value}"
@@ -118,7 +126,11 @@
render="#{richDataScrollerBean.attributes['render'].value} scroller1"
renderIfSinglePage="#{richDataScrollerBean.attributes['renderIfSinglePage'].value}"
rendered="#{richDataScrollerBean.attributes['rendered'].value}"
+ status="#{richDataScrollerBean.attributes['status'].value}"
stepControls="#{richDataScrollerBean.attributes['stepControls'].value}"
+ style="#{richDataScrollerBean.attributes['style'].value}"
+ styleClass="#{richDataScrollerBean.attributes['styleClass'].value}"
+ title="#{richDataScrollerBean.attributes['title'].value}"
/>
</f:facet>
@@ -217,8 +229,10 @@
</fieldset>
<br/><br/>
-
+ <h2>Attributes</h2>
<metamer:attributes value="#{richDataScrollerBean.attributes}" id="attributes" />
+ <h2>Table Attributes</h2>
+ <metamer:attributes value="#{richDataScrollerBean.tableAttributes}" id="tableAttributes" />
</ui:define>
</ui:composition>
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java 2011-11-22 23:37:09 UTC (rev 22976)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java 2011-11-23 10:30:53 UTC (rev 22977)
@@ -27,6 +27,7 @@
import org.jboss.test.selenium.framework.AjaxSelenium;
import org.jboss.test.selenium.framework.AjaxSeleniumProxy;
+import org.jboss.test.selenium.locator.Attribute;
import org.jboss.test.selenium.locator.JQueryLocator;
import org.jboss.test.selenium.locator.reference.ReferencedLocator;
import org.jboss.test.selenium.utils.text.SimplifiedFormat;
@@ -216,7 +217,7 @@
}
return integer(selenium.getText(currentPage));
}
-
+
public boolean isFastForwardButtonPresent() {
return selenium.isElementPresent(fastForwardButton);
}
@@ -250,7 +251,7 @@
}
public boolean isPresent() {
- return selenium.isElementPresent(root.getLocator());
+ return selenium.isElementPresent(root.getLocator()) && selenium.isDisplayed(root.getLocator());
}
public static int integer(String string) {
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java 2011-11-22 23:37:09 UTC (rev 22976)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java 2011-11-23 10:30:53 UTC (rev 22977)
@@ -35,7 +35,7 @@
fastControls,
fastStep,
lastPageMode,
- limitRenderer,
+ limitRender,
maxPages,
onbeforedomupdate,
onbegin,
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestDataScrollerAttributes.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestDataScrollerAttributes.java 2011-11-22 23:37:09 UTC (rev 22976)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestDataScrollerAttributes.java 2011-11-23 10:30:53 UTC (rev 22977)
@@ -21,28 +21,46 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.richDataScroller;
+import static org.jboss.test.selenium.locator.LocatorFactory.jq;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
import java.net.URL;
import java.util.Arrays;
import org.jboss.test.selenium.encapsulated.JavaScript;
+import org.jboss.test.selenium.locator.JQueryLocator;
+import org.jboss.test.selenium.waiting.selenium.SeleniumCondition;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
+import org.richfaces.tests.metamer.ftest.abstractions.DataTableAttributes;
+import org.richfaces.tests.metamer.ftest.annotations.Inject;
+import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.richfaces.tests.metamer.ftest.attributes.Attributes;
import org.richfaces.tests.metamer.ftest.model.DataScroller;
import org.testng.annotations.Test;
-import static org.testng.Assert.*;
/**
* Test the functionality of switching pages using DataScroller bound to DataTable.
*
* @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a>
*/
+@Use(field = "scroller", value = {"scrollerOutsideTable", "scrollerInsideTable"})
public class TestDataScrollerAttributes extends AbstractMetamerTest {
- private final Attributes<DataScrollerAttributes> attributes = new Attributes<DataScrollerAttributes>();
- private final DataScroller scroller = PaginationTester.DATA_SCROLLER_OUTSIDE_TABLE;
-
+ private final Attributes<DataScrollerAttributes> attributes = new Attributes<DataScrollerAttributes>(pjq("table[id$='attributes']"));
+ private final Attributes<DataTableAttributes> tableAttributes = new Attributes<DataTableAttributes>(pjq("table[id$='tableAttributes']"));
+
+ @Inject
+ private DataScroller scroller;
+
+ private DataScroller scrollerOutsideTable = PaginationTester.DATA_SCROLLER_OUTSIDE_TABLE;
+ private DataScroller scrollerInsideTable = PaginationTester.DATA_SCROLLER_IN_TABLE_FOOTER;
+
+
@Override
public URL getTestUrl() {
return buildUrl(contextPath, "faces/components/richDataScroller/simple.xhtml");
@@ -60,6 +78,20 @@
}
@Test
+ public void testData() {
+ // attributes
+ getAttributes().set(DataScrollerAttributes.data, "RichFaces");
+ getAttributes().set(DataScrollerAttributes.oncomplete, "data = event.data");
+ // action
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastForward();
+ waitGui.waitForChange(retrieveRequestTime);
+ // check
+ String data = selenium.getEval(new JavaScript("window.data"));
+ assertEquals(data, "RichFaces", "Data sent with ajax request");
+ }
+
+ @Test
public void testEvents() throws InterruptedException {
// set event attributes
getAttributes().set(DataScrollerAttributes.onbeforedomupdate, "metamerEvents += \"beforedomupdate \"");
@@ -80,6 +112,24 @@
}
@Test
+ public void testExecute() {
+ // attributes
+ getAttributes().set(DataScrollerAttributes.execute, "executeChecker");
+ // action
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastForward();
+ waitGui.waitForChange(retrieveRequestTime);
+ // check
+ JQueryLocator logItems = jq("ul.phases-list li:eq({0})");
+ for (int i = 0; i < 6; i++) {
+ if ("* executeChecker".equals(selenium.getText(logItems.format(i)))) {
+ return;
+ }
+ }
+ fail("Attribute execute does not work");
+ }
+
+ @Test
public void testFastControls() {
// init - show
assertTrue(getScroller().isFastForwardButtonPresent(), "The fast forward button should be present.");
@@ -104,6 +154,43 @@
}
@Test
+ public void testLastPageMode() {
+ retrieveRequestTime.initializeValue();
+ getScroller().clickLastPageButton();
+ waitGui.waitForChange(retrieveRequestTime);
+ // init - short
+ assertEquals(getNumberOfRows(), 5, "Attribute lastPageMode doesn't work. The number of rows doesn't match, when the value is set to <short>");
+ // full
+ getAttributes().set(DataScrollerAttributes.lastPageMode, "full");
+ assertEquals(getNumberOfRows(), 9, "Attribute lastPageMode doesn't work. The number of rows doesn't match, when the value is set to <full>");
+ }
+
+ @Test
+ public void testLimitRender() {
+ // false
+ getAttributes().set(DataScrollerAttributes.limitRender, false);
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastForward();
+ waitGui
+ .failWith("The panel hasn't been rerendered despite of the fact the attribute 'limitRender' is set to <false>.")
+ .waitForChange(retrieveRequestTime);
+ // true
+ getAttributes().set(DataScrollerAttributes.limitRender, false);
+ String timeBefore = retrieveRequestTime.getValue();
+ getScroller().clickFastRewind();
+ waitModel
+ .until(new SeleniumCondition() {
+ @Override
+ public boolean isTrue() {
+ return getScroller().getCurrentPage() == 1;
+ }
+ });
+ String timeAfter = retrieveRequestTime.getValue();
+ assertEquals(timeAfter, timeBefore, "The panel hasn been rerendered despite of the fact the attribute 'limitRender' is set to <true>.");
+
+ }
+
+ @Test
public void testMaxPages() {
// init - 10
assertEquals(getScroller().getCountOfVisiblePages(), 6 /* it means - all pages */, "The number of visible pages doesn't match.");
@@ -125,6 +212,31 @@
}
@Test
+ public void testRenderIfSinglePage() {
+ // prepare
+ getTableAttributes().set(DataTableAttributes.rows, 200);
+ // init - true
+ assertTrue(getScroller().isPresent(), "The attribute 'renderIfSinglePage' doesn't work.");
+ // false
+ getAttributes().set(DataScrollerAttributes.renderIfSinglePage, false);
+ assertFalse(getScroller().isPresent(), "The attribute 'renderIfSinglePage' doesn't work.");
+ }
+
+ @Test
+ public void testStatus() {
+ // prepare
+ getAttributes().set(DataScrollerAttributes.status, "statusChecker");
+ String statusBefore = selenium.getText(statusChecker);
+ // action
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastForward();
+ waitGui.waitForChange(retrieveRequestTime);
+ // check
+ String statusAfter = selenium.getText(statusChecker);
+ assertNotEquals(statusAfter, statusBefore, "The status attribute doesn't work.");
+ }
+
+ @Test
public void testStepControls() {
// init - show
assertTrue(getScroller().isNextButtonPresent(), "The next button should be present.");
@@ -135,12 +247,35 @@
assertFalse(getScroller().isPreviousButtonPresent(), "The previous button shouldn't be present.");
}
+ @Test
+ public void testStyle() {
+ super.testStyle(getScroller());
+ }
+
+ @Test
+ public void testStyleClass() {
+ super.testStyleClass(getScroller());
+ }
+
+ @Test
+ public void testTitle() {
+ super.testTitle(getScroller());
+ }
+
private Attributes<DataScrollerAttributes> getAttributes() {
return attributes;
}
+ private int getNumberOfRows() {
+ return selenium.getCount(pjq("*.rf-dt tbody tr.rf-dt-r"));
+ }
+
private DataScroller getScroller() {
return scroller;
}
+ private Attributes<DataTableAttributes> getTableAttributes() {
+ return tableAttributes;
+ }
+
}
12 years, 9 months
- 1
- 0