Author: cgeer
Date: Mon Feb 18 21:34:35 2013
New Revision: 1447510
URL: http://svn.apache.org/r1447510
Log:
RAVE-888 Changed the draggable feature to use a css class called
"widget-title-bar-draggable" and only add that class on unlocked widgets.
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
rave/trunk/rave-portal-resources/src/test/javascript/raveSpec.js
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag?rev=1447510&r1=1447509&r2=1447510&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
Mon Feb 18 21:34:35 2013
@@ -34,7 +34,7 @@ Template for rendering a RegionWidget in
<div class="widget-wrapper<c:if test="${isLocked}">
widget-wrapper-locked</c:if><c:if test="${isHideChrome}">
widget-wrapper-hidechrome</c:if>" id="widget-${regionWidget.id}-wrapper">
<c:if test="${!isHideChrome}">
- <div class="widget-title-bar<c:if test="${isLocked}">
widget-title-bar-locked</c:if>">
+ <div class="widget-title-bar<c:choose><c:when test="${isLocked}">
widget-title-bar-locked</c:when><c:otherwise>
widget-title-bar-draggable</c:otherwise></c:choose>">
<c:if test="${!isLocked}">
<div id="widget-${regionWidget.id}-collapse"
class="widget-toolbar-toggle-collapse" title="<fmt:message
key="widget.chrome.toggle"/>"></div>
</c:if>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less?rev=1447510&r1=1447509&r2=1447510&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
Mon Feb 18 21:34:35 2013
@@ -204,7 +204,7 @@ footer {
padding: 4px 10px 4px;
}
-.widget-title-bar:hover {
+.widget-title-bar-draggable:hover {
cursor: move;
}
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js?rev=1447510&r1=1447509&r2=1447510&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js Mon
Feb 18 21:34:35 2013
@@ -167,7 +167,7 @@ var rave = rave || (function () {
opacity: 0.5, // the opacity of the object being dragged
revert: true, // smooth snap animation
cursor: 'move', // the cursor to show while dnd
- handle: '.widget-title-bar', // the draggable handle
+ handle: '.widget-title-bar-draggable', // the draggable handle
forcePlaceholderSize: true, // size the placeholder to the
size of the widget
tolerance: 'pointer', // change dnd drop zone on mouse-over
start: dragStart, // event listener for drag start
Modified: rave/trunk/rave-portal-resources/src/test/javascript/raveSpec.js
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/test/javascript/raveSpec.js?rev=1447510&r1=1447509&r2=1447510&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/test/javascript/raveSpec.js (original)
+++ rave/trunk/rave-portal-resources/src/test/javascript/raveSpec.js Mon Feb 18
21:34:35 2013
@@ -405,7 +405,7 @@ describe("Rave", function() {
expect(sortableArgs).toBeDefined();
expect(sortableArgs.selector).toEqual(".region:not(.region-locked)");
expect(sortableArgs.connectWith).toEqual(".region");
- expect(sortableArgs.handle).toEqual(".widget-title-bar");
+ expect(sortableArgs.handle).toEqual(".widget-title-bar-draggable");
expect(typeof(sortableArgs.start)).toEqual("function");
expect(typeof(sortableArgs.stop)).toEqual("function");
});
