[richfaces-svn-commits] JBoss Rich Faces SVN: r21150 - trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces.

Author: abelevich Date: 2011-01-21 08:57:12 -0500 (Fri, 21 Jan 2011) New Revision: 21150 Modified: trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-draggable.js trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-droppable.js trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-indicator.js Log: https://issues.jboss.org/browse/RF-10033 drag-n-drop: apply changes after pre-promotion code review Modified: trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-draggable.js =================================================================== --- trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-draggable.js 2011-01-21 13:46:25 UTC (rev 21149) +++ trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-draggable.js 2011-01-21 13:57:12 UTC (rev 21150) @@ -69,7 +69,7 @@ if(this.__isCustomDragIndicator()) { var indicator = rf.$(this.options.indicator); if(indicator) { - ui.helper.addClass(indicator.draggingClass()); + ui.helper.addClass(indicator.getDraggingClass()); } else { ui.helper.addClass(defaultIndicatorClasses.draggingClass); } Modified: trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-droppable.js =================================================================== --- trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-droppable.js 2011-01-21 13:46:25 UTC (rev 21149) +++ trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-droppable.js 2011-01-21 13:57:12 UTC (rev 21150) @@ -39,8 +39,8 @@ var dragIndicatorObj = rf.$(ui.helper.attr("id")); if (dragIndicatorObj) { - ui.helper.removeClass(dragIndicatorObj.acceptClass()); - ui.helper.removeClass(dragIndicatorObj.rejectClass()); + ui.helper.removeClass(dragIndicatorObj.getAcceptClass()); + ui.helper.removeClass(dragIndicatorObj.getRejectClass()); } else { ui.helper.removeClass(defaultIndicatorClasses.acceptClass); ui.helper.removeClass(defaultIndicatorClasses.rejectClass); @@ -52,11 +52,11 @@ var dragIndicatorObj = rf.$(ui.helper.attr("id")); if (dragIndicatorObj) { if (this.accept(draggable)) { - ui.helper.removeClass(dragIndicatorObj.rejectClass()); - ui.helper.addClass(dragIndicatorObj.acceptClass()); + ui.helper.removeClass(dragIndicatorObj.getRejectClass()); + ui.helper.addClass(dragIndicatorObj.getAcceptClass()); } else { - ui.helper.removeClass(dragIndicatorObj.acceptClass()); - ui.helper.addClass(dragIndicatorObj.rejectClass()); + ui.helper.removeClass(dragIndicatorObj.getAcceptClass()); + ui.helper.addClass(dragIndicatorObj.getRejectClass()); } } else { if (this.accept(draggable)) { @@ -73,8 +73,8 @@ var draggable = ui.draggable; var dragIndicatorObj = rf.$(ui.helper.attr("id")); if (dragIndicatorObj) { - ui.helper.removeClass(dragIndicatorObj.acceptClass()); - ui.helper.removeClass(dragIndicatorObj.rejectClass()); + ui.helper.removeClass(dragIndicatorObj.getAcceptClass()); + ui.helper.removeClass(dragIndicatorObj.getRejectClass()); } else { ui.helper.removeClass(defaultIndicatorClasses.acceptClass); Modified: trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-indicator.js =================================================================== --- trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-indicator.js 2011-01-21 13:46:25 UTC (rev 21149) +++ trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-indicator.js 2011-01-21 13:57:12 UTC (rev 21150) @@ -36,15 +36,15 @@ this.indicator.hide(); }, - acceptClass: function() { + getAcceptClass: function() { return this.options.acceptClass; }, - rejectClass: function() { + getRejectClass: function() { return this.options.rejectClass; }, - draggingClass: function() { + getDraggingClass: function() { return this.options.draggingClass; },