svnno****@sourc*****
svnno****@sourc*****
2007年 12月 7日 (金) 22:55:26 JST
Revision: 745
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=745
Author: shinsuke
Date: 2007-12-07 22:55:26 +0900 (Fri, 07 Dec 2007)
Log Message:
-----------
fixed order issue.
Modified Paths:
--------------
pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/js/main.js
-------------- next part --------------
Modified: pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/js/main.js
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/js/main.js 2007-12-07 05:41:49 UTC (rev 744)
+++ pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/js/main.js 2007-12-07 13:55:26 UTC (rev 745)
@@ -19,23 +19,29 @@
for(col = 0; col < layouts.size(); col++)
{
var layout = layouts.get(col);
- var portlets = $("div.portlet", layout);
- var portletIds = new Array(portlets.size());
- var maxRow = portlets.size();
- for(row = 0; row < maxRow; row++)
+ for(changeCol = 0 ; changeCol < ser.length; changeCol++)
{
- var portlet = portlets.get(row);
- portletIds[row] = {
- id: portlet.id,
- position: $("div").index(portlet)
+ if(ser[changeCol].id == layout.id)
+ {
+ var portlets = $("div.portlet", layout);
+ var portletIds = new Array(portlets.size());
+ var maxRow = portlets.size();
+ for(row = 0; row < maxRow; row++)
+ {
+ var portlet = portlets.get(row);
+ portletIds[row] = {
+ id: portlet.id,
+ position: ser[changeCol].hash.indexOf(portlet.id)
+ }
+ }
+ portletIds.sort(sortPortletIds);
+ for(row = 0; row < maxRow; row++)
+ {
+ var url = $("input#ajaxUrl").attr("value") + "?action=moveabs&id=" + portletIds[row].id + "&col=" + col + "&row=" + row;
+ $.get(url);
+ }
}
}
- portletIds.sort(sortPortletIds);
- for(row = 0; row < maxRow; row++)
- {
- var url = $("input#ajaxUrl").attr("value") + "?action=moveabs&id=" + portletIds[row].id + "&col=" + col + "&col=" + row;
- $.get(url);
- }
}
},
onStart : function()
@@ -51,7 +57,7 @@
}
);
function sortPortletIds(a, b) {
- return b.position - a.position;
+ return a.position - b.position;
}
function closePortlet(fid) {
var url = $("input#ajaxUrl").attr("value") + "?action=remove&id=" + fid;