Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[686] CometVisu/trunk/visu
|
From: <j-...@us...> - 2012-02-05 18:04:15
|
Revision: 686
http://openautomation.svn.sourceforge.net/openautomation/?rev=686&view=rev
Author: j-n-k
Date: 2012-02-05 18:04:08 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Rename .setWidgetStyle to .setWidgetLayout to avoid
problems with .setWidgetStyling
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
CometVisu/trunk/visu/plugins/gweather/structure_plugin.js
CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js
CometVisu/trunk/visu/plugins/rss/structure_plugin.js
CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js
CometVisu/trunk/visu/plugins/upnpcontroller/structure_plugin.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2012-02-05 17:53:36 UTC (rev 685)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2012-02-05 18:04:08 UTC (rev 686)
@@ -54,7 +54,7 @@
* implemented: rowspan, colspan
*/
-$.fn.setWidgetStyle = function(page) {
+$.fn.setWidgetLayout = function(page) {
this.data('colspanClass', colspanClass(page.attr('colspan') || 1));
if (page.attr('rowspan')) {
this.data('rowspanClass', rowspanClass(page.attr('rowspan') || 1));
@@ -154,7 +154,7 @@
ret_val=$('');
} else { // default is visible
ret_val = $('<div class="widget clearfix link pagelink"/>');
- ret_val.setWidgetStyle($p);
+ ret_val.setWidgetLayout($p);
ret_val.append( '<div ' + wstyle + '><a href="javascript:scrollToPage(\''+path+'\')">' + name + '</a></div>' );
}
@@ -272,7 +272,7 @@
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix text" />');
- ret_val.setWidgetStyle($p);
+ ret_val.setWidgetLayout($p);
var style = '';
if( $p.attr('align') ) style += 'text-align:' + $p.attr('align') + ';';
if( style != '' ) style = 'style="' + style + '"';
@@ -295,7 +295,7 @@
var layout = $p.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix info" ' + style + ' />');
- ret_val.setWidgetStyle($p).makeWidgetLabel($p);
+ ret_val.setWidgetLayout($p).makeWidgetLabel($p);
var address = makeAddressList($p);
var actor = '<div class="actor"><div class="value">-</div></div>';
@@ -331,7 +331,7 @@
var layout = $p.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix slide" ' + style + ' />');
- ret_val.setWidgetStyle($p).makeWidgetLabel($p);
+ ret_val.setWidgetLayout($p).makeWidgetLabel($p);
var address = {};
var datatype_min = undefined;
var datatype_max = undefined;
@@ -445,7 +445,7 @@
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix switch" />');
- ret_val.setWidgetStyle($p)
+ ret_val.setWidgetLayout($p)
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = makeAddressList($p);
@@ -502,7 +502,7 @@
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix toggle" />');
- ret_val.setWidgetStyle($p);
+ ret_val.setWidgetLayout($p);
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = makeAddressList($p);
@@ -562,7 +562,7 @@
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix switch" />');
- ret_val.setWidgetStyle($p)
+ ret_val.setWidgetLayout($p)
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = makeAddressList($p);
@@ -706,7 +706,7 @@
var $p = $(page);
var value = $p.attr('value') ? $p.attr('value') : 0;
var ret_val = $('<div class="widget clearfix switch" />');
- ret_val.setWidgetStyle($p);
+ ret_val.setWidgetLayout($p);
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = makeAddressList($p);
@@ -762,7 +762,7 @@
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix image" />');
- ret_val.setWidgetStyle($p);
+ ret_val.setWidgetLayout($p);
var labelElement = $p.find('label')[0];
ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
var style = '';
@@ -798,7 +798,7 @@
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix video" />');
- ret_val.setWidgetStyle($p);
+ ret_val.setWidgetLayout($p);
var labelElement = $p.find('label')[0];
ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
var autoplay = ($p.attr('autoplay') && $p.attr('autoplay')=='true') ? ' autoplay="autoplay"' : '';
@@ -828,7 +828,7 @@
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget iframe" />');
- ret_val.setWidgetStyle($p);
+ ret_val.setWidgetLayout($p);
ret_val.append( '<div class="label">' + page.textContent + '</div>' );
var style = '';
if( $p.attr('width' ) ) {
@@ -868,7 +868,7 @@
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix switch" />');
- ret_val.setWidgetStyle($p);
+ ret_val.setWidgetLayout($p);
// handle label
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
@@ -1196,7 +1196,6 @@
return { x: 0, y: 0 }; // sanity return
}
-
function defaultUpdate( e, data, passedElement )
{
var element = passedElement || $(this);
Modified: CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2012-02-05 17:53:36 UTC (rev 685)
+++ CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2012-02-05 18:04:08 UTC (rev 686)
@@ -24,7 +24,7 @@
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix colorChooser" />');
- ret_val.setWidgetStyle($p);
+ ret_val.setWidgetLayout($p);
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
var address = {};
Modified: CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2012-02-05 17:53:36 UTC (rev 685)
+++ CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2012-02-05 18:04:08 UTC (rev 686)
@@ -33,7 +33,7 @@
var id = "diagram_" + uniqid();
var ret_val = $('<div class="widget clearfix diagram" />');
- ret_val.setWidgetStyle($p).makeWidgetLabel($p);
+ ret_val.setWidgetLayout($p).makeWidgetLabel($p);
var actor = $("<div class=\"actor\"><div class=\"diagram_inline\" id=\"" + id + "\">loading...</div></div>");
var diagram = $("#" + id, actor);
Modified: CometVisu/trunk/visu/plugins/gweather/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/gweather/structure_plugin.js 2012-02-05 17:53:36 UTC (rev 685)
+++ CometVisu/trunk/visu/plugins/gweather/structure_plugin.js 2012-02-05 18:04:08 UTC (rev 686)
@@ -32,8 +32,8 @@
var id = "gweather_" + uniqid();
- var ret_val = $('<div class="widget clearfix" />');
- ret_val.addClass( 'gweather' );
+ var ret_val = $('<div class="widget clearfix gweather" />');
+ ret_val.setWidgetLayout($p);
var label = '<div class="label">' + page.textContent + '</div>';
var actor = $("<div class=\"actor\"><div class=\"gweather\" id=\"" + id + "\">loading</div></div>");
var gweather = $("#" + id, actor);
Modified: CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js 2012-02-05 17:53:36 UTC (rev 685)
+++ CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js 2012-02-05 18:04:08 UTC (rev 686)
@@ -32,13 +32,8 @@
var id = "jqclock_" + uniqid();
var ret_val = $('<div class="widget clearfix jqclock" />');
- if ($p.attr("rowspan")) { // add rowspan only if not default
- ret_val.addClass(rowspanClass($p.attr("rowspan")));
- }
- if ($p.attr("colspan")) { // add colspan only if not default
- ret_val.data("colspanClass", colspanClass($p.attr("colspan")));
- }
-
+ ret_val.setWidgetLayout($p);
+
var label = '<div class="label">' + page.textContent + '</div>';
var actor = $("<div class=\"actor\"><div class=\"jqclock_inline\" id=\"" + id + "\"></div></div>");
var jqclock = $("#"+id,actor);
Modified: CometVisu/trunk/visu/plugins/rss/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/rss/structure_plugin.js 2012-02-05 17:53:36 UTC (rev 685)
+++ CometVisu/trunk/visu/plugins/rss/structure_plugin.js 2012-02-05 18:04:08 UTC (rev 686)
@@ -39,8 +39,8 @@
var id = "rss_" + uniqid();
- var ret_val = $('<div class="widget clearfix" />');
- ret_val.addClass( 'rss' );
+ var ret_val = $('<div class="widget clearfix rss" />');
+ ret_val.setWidgetLayout($p);
var label = '<div class="label">' + page.textContent + '</div>';
var actor = $("<div class=\"actor\"><div class=\"rss_inline\" id=\"" + id + "\"></div>");
var rss = $("#" + id, actor);
Modified: CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js 2012-02-05 17:53:36 UTC (rev 685)
+++ CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js 2012-02-05 18:04:08 UTC (rev 686)
@@ -42,7 +42,7 @@
var id = "rss_" + uniqid();
var ret_val = $('<div class="widget clearfix rsslog" />');
- ret_val.setWidgetStyle($p);
+ ret_val.setWidgetLayout($p);
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
Modified: CometVisu/trunk/visu/plugins/upnpcontroller/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/upnpcontroller/structure_plugin.js 2012-02-05 17:53:36 UTC (rev 685)
+++ CometVisu/trunk/visu/plugins/upnpcontroller/structure_plugin.js 2012-02-05 18:04:08 UTC (rev 686)
@@ -35,8 +35,8 @@
var id = "upnpcontroller_" + uniqid();
upnpcontroller_uid = id;
- var ret_val = $('<div class="widget" />');
- ret_val.addClass( 'upnpcontroller' );
+ var ret_val = $('<div class="widget upnpcontroller" />');
+ ret_val.setWidgetLayout($p);
var label = '<div class="label">' + $p.attr("label") + '</div>';
var actor = $("<div class=\"actor\"><div class=\"upnpcontroller\" id=\"" + id + "\">loading</div></div>");
var upnpcontroller = $("#" + id, actor);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
