Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [323] maven/trunk/ogoglio-server/src
|
From: <tre...@us...> - 2007-09-01 17:12:22
|
Revision: 323
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=323&view=rev
Author: trevorolio
Date: 2007-09-01 10:12:25 -0700 (Sat, 01 Sep 2007)
Log Message:
-----------
Added a move menu item to thing context menus which, when selected, whos the thingPopup page in the infoPanel.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js
maven/trunk/ogoglio-server/src/test/resources/templates/TestCube.js
Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js 2007-09-01 17:12:22 UTC (rev 322)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js 2007-09-01 17:12:25 UTC (rev 323)
@@ -228,7 +228,9 @@
panelHTMLWrapper.setAttribute("height", "270");
var spaceID = locationParameters["spaceID"];
var thingURI = getServiceURI() + "/space/" + spaceID + "/thing/" + id + "/service";
- if(nonce != null){
+ if("move" == nonce){
+ thingURI = getServiceURI() + "/thingPopup.html?spaceID=" + spaceID + "&thingID=" + id;
+ } else if(nonce != null){
thingURI += "?nonce=" + nonce;
}
panelHTMLWrapper.setAttribute("src", thingURI);
Modified: maven/trunk/ogoglio-server/src/test/resources/templates/TestCube.js
===================================================================
--- maven/trunk/ogoglio-server/src/test/resources/templates/TestCube.js 2007-09-01 17:12:22 UTC (rev 322)
+++ maven/trunk/ogoglio-server/src/test/resources/templates/TestCube.js 2007-09-01 17:12:25 UTC (rev 323)
@@ -18,23 +18,21 @@
}
function onContextClick(person, shapeName){
- var moveItem = new ContextMenuInfo("Move",true,"move");
var monkeyItem = new ContextMenuInfo("Monkey", true, "monkey");
- var deadItem = new ContextMenuInfo("Groove",false,"groove");
- return new Array(moveItem, monkeyItem, deadItem);
+ var deadItem = new ContextMenuInfo("Groove", false, "groove");
+ return new Array(monkeyItem, deadItem);
}
function onContextMenuItemChosen(username,id){
- if(id == "move"){
- var iFrameURL = "/og/thingPopup.html?thingID=" + thingID + "&spaceID=" + space.id;
- var style = "width: 270px; height: 420px;";
- space.showInfoPanel(thingID, username, "<iframe src='" + iFrameURL + "' style='" + style + "' />");
- return "Showed move info panel";
- } else if (id == "monkey") {
- space.showInfoPanel(thingID, username, "<div><img src='/og/icons/32x32/face-monkey.png'/></div> ");
+ if (id == "monkey") {
+ space.showInfoPanel(thingID, username, "monkey");
return "Showed Monkey";
} else {
return "Unknown item";
}
}
+function onService(method, parameterNames, parameterValues){
+ var html = "<html><body><h1>I am a test cube:</h1><img src='/og/icons/32x32/face-monkey.png' /></body></html>";
+ return new HTTPResponse(200, html, "text/html");
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
