Author: taylor
Date: Tue Dec 15 07:22:54 2009
New Revision: 890677
URL: http://svn.apache.org/viewvc?rev=890677&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1084
persisting moves of toolbars (persist fails until we get per user properties
hooked in)
note: move actions are still using old ajax api, need to convert to newer REST
API
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=890677&r1=890676&r2=890677&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
Tue Dec 15 07:22:54 2009
@@ -277,20 +277,20 @@
drag.get('node').removeClass('moving');
drag.get('dragNode').set('innerHTML', '');
- persistMove(drag.get('node'));
+ persistMove(drag.get('node'), e);
});
- var persistMove = function(drag) {
+ var persistMove = function(drag, e) {
+ var uri = document.location.href;
+ if (uri.indexOf("/portal") > -1)
+ uri = uri.replace("/portal", "/ajaxapi");
+ else
+ uri = uri.replace("/ui", "/ajaxapi");
+ var windowId = drag.getAttribute('id');
if (drag.data.get("toolbar") == false) {
- var uri = document.location.href;
- if (uri.indexOf("/portal") > -1)
- uri = uri.replace("/portal", "/ajaxapi");
- else
- uri = uri.replace("/ui", "/ajaxapi");
- var windowId = drag.getAttribute('id');
var oldColumn = drag.data.get('column');
var oldRow = drag.data.get('row');
var dragParent = drag.get('parentNode');
@@ -303,8 +303,14 @@
reallocateColumn(parentColumn);
var uri = uri + "?action=moveabs&id=" + windowId + "&col=" +
drag.data.get('column') + "&row=" + drag.data.get('row');
Y.on('io:complete', onMoveComplete, this, [windowId]);
- var request = Y.io(uri);
+ var request = Y.io(uri);
}
+ else
+ {
+ var uri = uri + "?action=move&id=" + windowId + "&x=" +
e.target.region.top + "&y=" + e.target.region.left;
+ Y.on('io:complete', onMoveComplete, this, [windowId]);
+ var request = Y.io(uri);
+ }
};
var reallocateColumn = function(column) {
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
