You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2010/06/10 12:44:32 UTC
svn commit: r953275 - in
/incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web:
goat/ComponentStatusGrid.js goat/Relationship.js index.html
Author: zoe
Date: Thu Jun 10 10:44:32 2010
New Revision: 953275
URL: http://svn.apache.org/viewvc?rev=953275&view=rev
Log:
ARIES-319 Fixing container resizing properly. Added back two-way relations - do not render correctly at startup.
Modified:
incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ComponentStatusGrid.js
incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/Relationship.js
incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/index.html
Modified: incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ComponentStatusGrid.js
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ComponentStatusGrid.js?rev=953275&r1=953274&r2=953275&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ComponentStatusGrid.js (original)
+++ incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/ComponentStatusGrid.js Thu Jun 10 10:44:32 2010
@@ -36,11 +36,11 @@ dojo.declare("goat.ComponentStatusGrid",
dataItems:{ identifier : 'id', label : 'name', items : [] },
lastMouseOverIndex:-1,
- constructor : function(where, wheregrid) {
+ constructor : function(wheregrid) {
var _this=this;
- this.hideshowButton = new dijit.form.ToggleButton({
+ var hideshowButton = new dijit.form.ToggleButton({
showLabel: true,
checked: true,
onChange: function(val) {
@@ -56,7 +56,8 @@ dojo.declare("goat.ComponentStatusGrid",
}
},
label: "Hide all"
- }, where);
+ });
+
var layout = [
{
@@ -102,8 +103,10 @@ dojo.declare("goat.ComponentStatusGrid",
var grid = new dojox.grid.DataGrid( {
structure : layout,
store : this.jsonStore
- }, wheregrid);
+ });
+ dojo.place(grid.domNode,wheregrid, "replace");
+ dojo.place(hideshowButton.domNode, grid.domNode, "before");
grid.startup();
Modified: incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/Relationship.js
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/Relationship.js?rev=953275&r1=953274&r2=953275&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/Relationship.js (original)
+++ incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/goat/Relationship.js Thu Jun 10 10:44:32 2010
@@ -105,7 +105,7 @@ activate : function(){
//console.log("create of relationship element complete");
this.relationshipElements.push(r);
//hmm.. do we want to reverse-register the relationship like this?
- //components[component.id].relationshipManager.registerRelationship(r);
+ components[component.id].relationshipManager.registerRelationship(r);
},this);
//console.log(this.relationshipElements);
//console.log("<activate");
Modified: incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/index.html
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/index.html?rev=953275&r1=953274&r2=953275&view=diff
==============================================================================
--- incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/index.html (original)
+++ incubator/aries/trunk/samples/goat/goat-web/src/main/resources/web/index.html Thu Jun 10 10:44:32 2010
@@ -117,7 +117,7 @@ body, html {
initialLayout = new goat.SimpleInitialLayout(1000,1000);
var loadingDialog = new goat.DwrLoadingDialog();
- var componentStatusGrid = new goat.ComponentStatusGrid("hideShowButton","stateTableID");
+ var componentStatusGrid = new goat.ComponentStatusGrid("stateTableID");
providerSelector = new goat.ProviderSelector("providerSelectorID");
var loadSave = new goat.LayoutManager("loadSaveLayoutID");
}
@@ -132,7 +132,6 @@ body, html {
<div dojoType="dijit.layout.BorderContainer" design="sidebar" gutters="true"
style="width: 100%; height: 100%;">
<div dojoType="dijit.layout.ContentPane" region="leading" splitter="true" style="width: 300px;">
- <span id="hideShowButton"> </span>
<div style="width: 300px;" id="stateTableID"></div>
</div>