[mashup-dev] svn commit r3551 - in trunk/mashup/java/modules/www: .
js/wso2
svn at wso2.org
svn at wso2.org
Tue Jun 5 09:35:24 PDT 2007
Author: tyrell
Date: Tue Jun 5 09:35:17 2007
New Revision: 3551
Modified:
trunk/mashup/java/modules/www/index.html
trunk/mashup/java/modules/www/js/wso2/MashupListItem.js
trunk/mashup/java/modules/www/js/wso2/mashup-main.js
trunk/mashup/java/modules/www/js/wso2/mashup-utils.js
trunk/mashup/java/modules/www/js/wso2/mashup.js
Log:
Completing drag drop widget creation functionality.
Modified: trunk/mashup/java/modules/www/index.html
==============================================================================
--- trunk/mashup/java/modules/www/index.html (original)
+++ trunk/mashup/java/modules/www/index.html Tue Jun 5 09:35:17 2007
@@ -80,11 +80,11 @@
<script type="text/javascript" src="js/yui-ext/ext-back-compat.js"></script>
+ <script type="text/javascript" src="js/wso2/mashup.js"></script>
<script type="text/javascript" src="js/wso2/MashupWidget.js"></script>
<script type="text/javascript" src="js/wso2/MashupListItem.js"></script>
<script type="text/javascript" src="js/wso2/MashupEditor.js"></script>
<script type="text/javascript" src="js/wso2/mashup-utils.js"></script>
-
<script type="text/javascript" src="js/wso2/MakeEditable.js"></script>
Modified: trunk/mashup/java/modules/www/js/wso2/MashupListItem.js
==============================================================================
--- trunk/mashup/java/modules/www/js/wso2/MashupListItem.js (original)
+++ trunk/mashup/java/modules/www/js/wso2/MashupListItem.js Tue Jun 5 09:35:17 2007
@@ -17,9 +17,9 @@
wso2.mashup.MashupListItem = {}
-
-wso2.mashup.MashupListItem = function(el, userConfig) {
+wso2.mashup.MashupListItem = function(el, mashupObject, userConfig) {
wso2.mashup.MashupListItem.superclass.constructor.call(this, el, userConfig);
+ this.myMashupObject = mashupObject; //Holds the meta-data for the associated mashup
};
YAHOO.extend(wso2.mashup.MashupListItem, YAHOO.widget.Overlay);
@@ -145,16 +145,15 @@
};
-wso2.mashup.MashupListItem.panelCount = 3
+wso2.mashup.MashupListItem.panelCount = 0
/**
* Registers the MashupListItem's header for drag & drop capability.
* @method registerDragDrop
*/
-wso2.mashup.MashupListItem.prototype.registerDragDrop = function() {
-
-
+wso2.mashup.MashupListItem.prototype.registerDragDrop = function() {
+
if (this.header) {
this.dd = new YAHOO.util.DDProxy(this.id, "mashup-list-group");
@@ -226,24 +225,10 @@
this.dd.endDrag = function(e) {
-
- var panel = new wso2.mashup.MashupWidget('panel_' + wso2.mashup.MashupListItem.panelCount++, {visible:true, draggable:true, close:true, minimize:true});
- panel.setHeader("Hello World");
- panel.setBody("Widget Created from the list");
- var srcElimentPosition = YAHOO.util.Dom.getXY(this.getEl());
- YAHOO.util.Dom.setStyle(panel.id, "position", "absolute");
- YAHOO.util.Dom.setStyle(panel.id, "left", srcElimentPosition[0]);
- YAHOO.util.Dom.setStyle(panel.id, "top", srcElimentPosition[1]);
-
- if (!this.col1) {
- panel.render('col_1');
- this.col1 = true;
- } else {
- panel.render('col_2');
- this.col1 = false;
- }
-
+ //Create a mashup widget
+ WSO2.MashupUtils.createMashupWidget(me.myMashupObject);
+
YAHOO.util.Dom.setStyle(this.getEl(), "opacity", 1);
};
Modified: trunk/mashup/java/modules/www/js/wso2/mashup-main.js
==============================================================================
--- trunk/mashup/java/modules/www/js/wso2/mashup-main.js (original)
+++ trunk/mashup/java/modules/www/js/wso2/mashup-main.js Tue Jun 5 09:35:17 2007
@@ -154,18 +154,7 @@
createUI : function() {
-
- wso2.mashup.services.listServiceGroups(wso2.mashup.populateMashupsList);
-
- var panel = new wso2.mashup.MashupWidget("panel", {visible:true, draggable:true, close:true, minimize:true});
- panel.setHeader("Hello World");
- panel.setBody("The MashupWidget Body");
- panel.render('col_1');
-
- var panel1 = new wso2.mashup.MashupWidget("panel_1", {visible:true, draggable:true, close:true, minimize:true});
- panel1.setHeader("Hello World");
- panel1.setBody("The MashupWidget Body");
- panel1.render('col_2');
+ wso2.mashup.services.listServiceGroups(wso2.mashup.populateMashupsList);
},
Modified: trunk/mashup/java/modules/www/js/wso2/mashup-utils.js
==============================================================================
--- trunk/mashup/java/modules/www/js/wso2/mashup-utils.js (original)
+++ trunk/mashup/java/modules/www/js/wso2/mashup-utils.js Tue Jun 5 09:35:17 2007
@@ -50,9 +50,8 @@
*/
WSO2.MashupUtils.createListItem = function(xmlBodyContent) {
- var mashupsListItem = new wso2.mashup.MashupListItem('mashupListItem_' + WSO2.MashupUtils.listItemCount++, {visible:true,draggable:true});
-
- WSO2.MashupUtils.generateMashupFromXml(xmlBodyContent);
+ var mashupObject = WSO2.MashupUtils.generateMashupFromXml(xmlBodyContent);
+ var mashupsListItem = new wso2.mashup.MashupListItem('mashupListItem_' + WSO2.MashupUtils.listItemCount++, mashupObject, {visible:true,draggable:true});
var mashupActionHolder = document.createElement("div");
mashupActionHolder.id = 'serviceActionsDiv_' + WSO2.MashupUtils.listItemCount;
@@ -85,18 +84,30 @@
var titleText = document.createTextNode("Available Services");
mashupTitle.appendChild(titleText);
mashupListBox.appendChild(mashupTitle);
-
+
//re-setting the list item count
WSO2.MashupUtils.listItemCount = 0;
};
-WSO2.MashupUtils.generateMashupFromXml = function(xmlContent){
- alert(xmlContent.getElementsByTagName("eprs")[0].firstChild.nodeValue);
+/**
+ * @description Creates a new Mashup object from a well formed xml
+ * @method generateMashupFromXml
+ * @param {XML} xmlDataContent
+ * @return {WSO2.Mashup} Generated object
+ */
-};
+WSO2.MashupUtils.generateMashupFromXml = function(xmlDataContent) {
+ var mashupId = xmlDataContent.getElementsByTagName("service_id")[0].firstChild.nodeValue;
+ var mashupTitle = xmlDataContent.getElementsByTagName("name")[0].firstChild.nodeValue;
+ var mashupDesc = xmlDataContent.getElementsByTagName("description")[0].firstChild.nodeValue;
+ var mashupEprs = xmlDataContent.getElementsByTagName("eprs");
+
+ return new wso2.mashup.Mashup(mashupId, mashupTitle, mashupDesc, mashupEprs);
+
+};
/**
@@ -124,7 +135,7 @@
/**
* @description Add the Mashup Widget to the inerface.
* @method createMashupWidget
- * @param {WSO2.Mashup} mashupObj The Mashup object containing details about mashup.
+ * @param {WSO2.Mashup} mashupObj The Mashup object containing details about mashup.
*/
WSO2.MashupUtils.createMashupWidget = function(mashupObj) {
@@ -137,6 +148,7 @@
panel.setHeader(maTitle);
var mainEl = document.createElement("div");
+
for (var i = 0; i < eprs.length; i++) {
var parEl = document.createElement("p");
if (typeof eprs[i] == "string") {
@@ -149,18 +161,7 @@
}
- var str_1 = "<div style='padding:5px; visibility:inherit;'><div id='demo' class='yui-navset'>" +
- "<ul class='yui-nav'> " +
- "<li class='selected'><a href='#tab1'><em>Links</em></a></li>" +
- "<li><a href='#tab2'><em>Try It</em></a></li></ul> " +
- "<div class='yui-content'><div><p>These are the link<br/>Links are here</p></div><div><p>Tab Two Content</p></div>" +
- "</div></div></div>";
-
-
- var str_2 = "<div>hello world \n hello idiot</div>";
- var str = "<ul class='navlist'><li><a href='#'>Hello</a></li><li><a href='#'>Hello</a></li></ul>";
- panel.setBody(str);
- var myTabs = new YAHOO.widget.TabView("demo");
+ panel.setBody(mainEl);
if (!this.col1) {
panel.render('col_1');
Modified: trunk/mashup/java/modules/www/js/wso2/mashup.js
==============================================================================
--- trunk/mashup/java/modules/www/js/wso2/mashup.js (original)
+++ trunk/mashup/java/modules/www/js/wso2/mashup.js Tue Jun 5 09:35:17 2007
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+wso2.mashup.Mashup = {}
/**
* WSO2.Mashup is a JavaScript representation of the Mashup deployed in the server.
@@ -23,7 +24,7 @@
* @param {String} MashupTitle The Title of Mashup
* @param {String} MashupDesc The Description about Mashup
*/
-WSO2.Mashup = function(mashupID, mashupTitle, mashupDesc, eprs) {
+wso2.mashup.Mashup = function(mashupID, mashupTitle, mashupDesc, eprs) {
/**
* String which uniquely represent the Mashup
@@ -95,7 +96,7 @@
* @method getID
* @return {String} String ID of the Mashup
*/
-WSO2.Mashup.prototype.getID = function() {
+wso2.mashup.Mashup.prototype.getID = function() {
return this.ID;
};
@@ -104,7 +105,7 @@
* @method getTitle
* @return {String} String Title of the Mashup
*/
-WSO2.Mashup.prototype.getTitle = function() {
+wso2.mashup.Mashup.prototype.getTitle = function() {
return this.Title;
};
@@ -113,10 +114,10 @@
* @method getDescription
* @return {String} String Description about the Mashup
*/
-WSO2.Mashup.prototype.getDescription = function() {
+wso2.mashup.Mashup.prototype.getDescription = function() {
return this.Description;
};
-WSO2.Mashup.prototype.getEprs = function() {
+wso2.mashup.Mashup.prototype.getEprs = function() {
return this.eprs;
};
More information about the Mashup-dev
mailing list