Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[754] CometVisu/trunk/visu/structure/pure
|
From: <ma...@us...> - 2012-04-14 22:05:16
|
Revision: 754
http://openautomation.svn.sourceforge.net/openautomation/?rev=754&view=rev
Author: mayerch
Date: 2012-04-14 22:05:09 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Clean up: the API sends an element to the widgets and not a page
Modified Paths:
--------------
CometVisu/trunk/visu/structure/pure/group.js
CometVisu/trunk/visu/structure/pure/iframe.js
CometVisu/trunk/visu/structure/pure/image.js
CometVisu/trunk/visu/structure/pure/imagetrigger.js
CometVisu/trunk/visu/structure/pure/infotrigger.js
CometVisu/trunk/visu/structure/pure/line.js
CometVisu/trunk/visu/structure/pure/multitrigger.js
CometVisu/trunk/visu/structure/pure/slide.js
CometVisu/trunk/visu/structure/pure/switch.js
CometVisu/trunk/visu/structure/pure/text.js
CometVisu/trunk/visu/structure/pure/toggle.js
CometVisu/trunk/visu/structure/pure/trigger.js
CometVisu/trunk/visu/structure/pure/unknown.js
CometVisu/trunk/visu/structure/pure/video.js
Modified: CometVisu/trunk/visu/structure/pure/group.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/group.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/group.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -17,20 +17,20 @@
basicdesign.addCreator('group', {
maturity: Maturity.development,
- create: function( page, path, flavour ) {
- var $p = $(page);
+ create: function( element, path, flavour ) {
+ var $e = $(element);
var ret_val = $('<div class="widget clearfix group" />');
- if( $p.attr('flavour') ) flavour = $p.attr('flavour');// sub design choice
+ if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
var hstyle = ''; // heading style
- if( $p.attr('align') ) hstyle += 'text-align:' + $p.attr('align') + ';';
+ if( $e.attr('align') ) hstyle += 'text-align:' + $e.attr('align') + ';';
if( hstyle != '' ) hstyle = 'style="' + hstyle + '"';
- ret_val.setWidgetLayout($p);
- if ($p.attr('nowidget')=='true') {
+ ret_val.setWidgetLayout($e);
+ if ($e.attr('nowidget')=='true') {
ret_val.removeClass('widget');
}
- var childs = $p.children();
+ var childs = $e.children();
var container = $( '<div class="clearfix"/>' );
- if( $p.attr('name') ) container.append( '<h2 ' + hstyle + '>' + $p.attr('name') + '</h2>' );
+ if( $e.attr('name') ) container.append( '<h2 ' + hstyle + '>' + $e.attr('name') + '</h2>' );
$( childs ).each( function(i){
container.append( create_pages( childs[i], path + '_' + i, flavour ) );
} );
Modified: CometVisu/trunk/visu/structure/pure/iframe.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/iframe.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/iframe.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -16,26 +16,26 @@
*/
basicdesign.addCreator('iframe', {
- create: function( page, path ) {
- var $p = $(page);
- var layout = $p.find('layout')[0];
+ create: function( element, path ) {
+ var $e = $(element);
+ var layout = $e.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget iframe" ' + style + '/>');
- ret_val.setWidgetLayout($p);
- ret_val.append( '<div class="label">' + page.textContent + '</div>' );
+ ret_val.setWidgetLayout($e);
+ ret_val.append( '<div class="label">' + element.textContent + '</div>' );
var iframeStyle = '';
- if( $p.attr('width' ) ) {
- iframeStyle += 'width:' + $p.attr('width' ) + ';';
+ if( $e.attr('width' ) ) {
+ iframeStyle += 'width:' + $e.attr('width' ) + ';';
} else { // default width is 100% of widget space (fix bug #3175343 part 1)
iframeStyle += 'width: 100%;';
}
- if( $p.attr('height') ) iframeStyle += 'height:' + $p.attr('height') + ';';
- if( $p.attr('frameborder') == 'false' ) style += 'border: 0px ;';
- if( $p.attr('background') ) iframeStyle += 'background-color:' + $p.attr('background') + ';';
+ if( $e.attr('height') ) iframeStyle += 'height:' + $e.attr('height') + ';';
+ if( $e.attr('frameborder') == 'false' ) style += 'border: 0px ;';
+ if( $e.attr('background') ) iframeStyle += 'background-color:' + $e.attr('background') + ';';
if( iframeStyle != '' ) iframeStyle = 'style="' + iframeStyle + '"';
- var actor = '<div class="actor"><iframe src="' +$p.attr('src') + '" ' + iframeStyle + '></iframe></div>';
+ var actor = '<div class="actor"><iframe src="' +$e.attr('src') + '" ' + iframeStyle + '></iframe></div>';
- var refresh = $p.attr('refresh') ? $p.attr('refresh')*1000 : 0;
+ var refresh = $e.attr('refresh') ? $e.attr('refresh')*1000 : 0;
ret_val.append( $(actor).data( {
'refresh': refresh
} ).each(setupRefreshAction) ); // abuse "each" to call in context...
Modified: CometVisu/trunk/visu/structure/pure/image.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/image.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/image.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -16,24 +16,24 @@
*/
basicdesign.addCreator('image', {
- create: function( page, path ) {
- var $p = $(page);
- var layout = $p.find('layout')[0];
+ create: function( element, path ) {
+ var $e = $(element);
+ var layout = $e.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix image" ' + style + '/>');
- ret_val.setWidgetLayout($p);
- var labelElement = $p.find('label')[0];
+ ret_val.setWidgetLayout($e);
+ var labelElement = $e.find('label')[0];
ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
var imgStyle = '';
- if( $p.attr('width' ) ) {
- imgStyle += 'width:' + $p.attr('width' ) + ';';
+ if( $e.attr('width' ) ) {
+ imgStyle += 'width:' + $e.attr('width' ) + ';';
} else {
imgStyle += 'width: 100%;';
}
- if( $p.attr('height') ) imgStyle += 'height:' + $p.attr('height') + ';';
+ if( $e.attr('height') ) imgStyle += 'height:' + $e.attr('height') + ';';
if( imgStyle != '' ) imgStyle = 'style="' + imgStyle + '"';
- var actor = '<div class="actor"><img src="' +$p.attr('src') + '" ' + imgStyle + '/></div>';
- var refresh = $p.attr('refresh') ? $p.attr('refresh')*1000 : 0;
+ var actor = '<div class="actor"><img src="' +$e.attr('src') + '" ' + imgStyle + '/></div>';
+ var refresh = $e.attr('refresh') ? $e.attr('refresh')*1000 : 0;
ret_val.append( $(actor).data( {
'refresh': refresh
} ).each(setupRefreshAction) ); // abuse "each" to call in context...
Modified: CometVisu/trunk/visu/structure/pure/imagetrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/imagetrigger.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/imagetrigger.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -16,16 +16,16 @@
*/
basicdesign.addCreator('imagetrigger', {
- create: function( page, path ) {
- var $p = $(page);
+ create: function( element, path ) {
+ var $e = $(element);
var ret_val = $('<div class="widget clearfix image" />');
- ret_val.setWidgetLayout($p);
+ ret_val.setWidgetLayout($e);
ret_val.addClass ('imagetrigger');
- var value = $p.attr('value') ? $p.attr('value') : 0;
- var labelElement = $p.find('label')[0];
+ var value = $e.attr('value') ? $e.attr('value') : 0;
+ var labelElement = $e.find('label')[0];
ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
var address = {};
- $p.find('address').each( function(){
+ $e.find('address').each( function(){
var src = this.textContent;
ga_list.push( src )
address[ '_' + src ] = [
@@ -39,22 +39,22 @@
var style = layout ? 'style="' + extractLayout( layout, {width:'100%'} ) + '"' : '';
var actor = '<div class="actor">';
- if ( $p.attr('type')=='show' )
- actor += '<img src="' + $p.attr('src') + '.' + $p.attr('suffix') + '" ' + style + ' />';
+ if ( $e.attr('type')=='show' )
+ actor += '<img src="' + $e.attr('src') + '.' + $e.attr('suffix') + '" ' + style + ' />';
else
actor += '<img src="" ' + style + ' />';
actor += '</div>';
actor += '</div>';
- var refresh = $p.attr('refresh') ? $p.attr('refresh')*1000 : 0;
+ var refresh = $e.attr('refresh') ? $e.attr('refresh')*1000 : 0;
var $actor = $(actor).data( {
'address': address,
'refresh': refresh,
- 'src': $p.attr('src'),
- 'suffix': $p.attr('suffix'),
- 'type': $p.attr('type'),
+ 'src': $e.attr('src'),
+ 'suffix': $e.attr('suffix'),
+ 'type': $e.attr('type'),
'mapping': map,
- 'sendValue': $p.attr('sendValue') || ""
+ 'sendValue': $e.attr('sendValue') || ""
} )
.each(setupRefreshAction) // abuse "each" to call in context... refresh is broken with select right now
.bind( 'click', this.action );
Modified: CometVisu/trunk/visu/structure/pure/infotrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/infotrigger.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/infotrigger.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -16,20 +16,20 @@
*/
basicdesign.addCreator('infotrigger', {
- create: function( page, path ) {
- var $p = $(page);
- var layout = $p.find('layout')[0];
+ create: function( element, path ) {
+ var $e = $(element);
+ var layout = $e.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix switch" ' + style + '/>');
- ret_val.setWidgetLayout($p);
+ ret_val.setWidgetLayout($e);
// handle label
- var labelElement = $p.find('label')[0];
+ var labelElement = $e.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
ret_val.append( label );
// handle addresses
var address = {};
- $p.find('address').each( function(){
+ $e.find('address').each( function(){
var src = this.textContent;
var transform = this.getAttribute('transform');
var readonly = this.getAttribute('readonly' ) == 'true';
@@ -45,20 +45,20 @@
var buttonCount = 2;
var actordown = '<div class="actor switchUnpressed '
- if ( $p.attr( 'align' ) )
- actordown += $p.attr( 'align' );
+ if ( $e.attr( 'align' ) )
+ actordown += $e.attr( 'align' );
actordown += '">';
- actordown += '<div class="value">' + ($p.attr('downlabel') ? $p.attr('downlabel') : '-') + '</div>';
+ actordown += '<div class="value">' + ($e.attr('downlabel') ? $e.attr('downlabel') : '-') + '</div>';
actordown += '</div>';
var $actordown = $(actordown).data( {
'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'value' : $p.attr('downvalue') || 0,
- 'align' : $p.attr('align'),
- 'change' : $p.attr('change') || 'relative',
- 'min' : parseFloat($p.attr('min')) || 0,
- 'max' : parseFloat($p.attr('max')) || 255,
+ 'mapping' : $e.attr('mapping'),
+ 'styling' : $e.attr('styling'),
+ 'value' : $e.attr('downvalue') || 0,
+ 'align' : $e.attr('align'),
+ 'change' : $e.attr('change') || 'relative',
+ 'min' : parseFloat($e.attr('min')) || 0,
+ 'max' : parseFloat($e.attr('max')) || 255,
'type' : 'switch'
} ).bind( 'click', this.action ).bind( 'mousedown', function(){
$(this).removeClass('switchUnpressed').addClass('switchPressed');
@@ -67,20 +67,20 @@
} );
var actorup = '<div class="actor switchUnpressed '
- if ( $p.attr( 'align' ) )
- actorup += $p.attr( 'align' );
+ if ( $e.attr( 'align' ) )
+ actorup += $e.attr( 'align' );
actorup += '">';
- actorup += '<div class="value">' + ($p.attr('uplabel') ? $p.attr('uplabel') : '+') + '</div>';
+ actorup += '<div class="value">' + ($e.attr('uplabel') ? $e.attr('uplabel') : '+') + '</div>';
actorup += '</div>';
var $actorup = $(actorup).data( {
'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'value' : $p.attr('upvalue') || 1,
- 'align' : $p.attr('align'),
- 'change' : $p.attr('change') || 'relative',
- 'min' : parseFloat($p.attr('min')) || 0,
- 'max' : parseFloat($p.attr('max')) || 255,
+ 'mapping' : $e.attr('mapping'),
+ 'styling' : $e.attr('styling'),
+ 'value' : $e.attr('upvalue') || 1,
+ 'align' : $e.attr('align'),
+ 'change' : $e.attr('change') || 'relative',
+ 'min' : parseFloat($e.attr('min')) || 0,
+ 'max' : parseFloat($e.attr('max')) || 255,
'type' : 'switch'
} ).bind( 'click', this.action ).bind( 'mousedown', function(){
$(this).removeClass('switchUnpressed').addClass('switchPressed');
@@ -89,15 +89,15 @@
} );
var actorinfo = '<div class="actor switchInvisible" ';
- if ( $p.attr( 'align' ) )
- actorinfo += 'style="text-align: '+$p.attr( 'align' )+'" ';
+ if ( $e.attr( 'align' ) )
+ actorinfo += 'style="text-align: '+$e.attr( 'align' )+'" ';
actorinfo += '" ><div class="value">-</div></div>';
var $actorinfo = $(actorinfo).data({
'address' : address,
- 'format' : $p.attr('format'),
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'align' : $p.attr('align'),
+ 'format' : $e.attr('format'),
+ 'mapping' : $e.attr('mapping'),
+ 'styling' : $e.attr('styling'),
+ 'align' : $e.attr('align'),
});
for( var addr in address )
{
@@ -105,11 +105,11 @@
$actorinfo.bind( addr, this.update );
}
- if ( $p.attr('infoposition' )==1 ) {
+ if ( $e.attr('infoposition' )==1 ) {
buttons.append( $actordown );
buttons.append( $actorinfo );
buttons.append( $actorup );
- } else if ( $p.attr('infoposition' )==2 ) {
+ } else if ( $e.attr('infoposition' )==2 ) {
buttons.append( $actordown );
buttons.append( $actorup );
buttons.append( $actorinfo );
Modified: CometVisu/trunk/visu/structure/pure/line.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/line.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/line.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -16,7 +16,7 @@
*/
basicdesign.addCreator('line', {
- create: function( page, path ) {
+ create: function( element, path ) {
return $( '<hr />' );
},
attributes: {},
Modified: CometVisu/trunk/visu/structure/pure/multitrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -16,35 +16,35 @@
*/
basicdesign.addCreator('multitrigger', {
- create: function( page, path ) {
- var $p = $(page);
- var layout = $p.find('layout')[0];
+ create: function( element, path ) {
+ var $e = $(element);
+ var layout = $e.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix switch" ' + style + '/>');
- ret_val.setWidgetLayout($p)
- var labelElement = $p.find('label')[0];
+ ret_val.setWidgetLayout($e)
+ var labelElement = $e.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
- var address = makeAddressList($p);
- var showstatus = $p.attr("showstatus") || "false";
+ var address = makeAddressList($e);
+ var showstatus = $e.attr("showstatus") || "false";
ret_val.append( label );
var buttons = $('<div style="float:left"/>');
var buttonCount = 0;
- if( $p.attr('button1label') )
+ if( $e.attr('button1label') )
{
//buttonCount++;
var actor = '<div class="actor switchUnpressed ';
- if ( $p.attr( 'align' ) )
- actor += $p.attr( 'align' );
+ if ( $e.attr( 'align' ) )
+ actor += $e.attr( 'align' );
actor += '">';
- actor += '<div class="value">' + $p.attr('button1label') + '</div>';
+ actor += '<div class="value">' + $e.attr('button1label') + '</div>';
actor += '</div>';
var $actor = $(actor).data( {
'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'value' : $p.attr('button1value'),
- 'align' : $p.attr('align'),
+ 'mapping' : $e.attr('mapping'),
+ 'styling' : $e.attr('styling'),
+ 'value' : $e.attr('button1value'),
+ 'align' : $e.attr('align'),
'type' : 'switch'
} ).bind( 'click', this.action );
if( showstatus == "true" ) {
@@ -53,21 +53,21 @@
buttons.append( $actor );
if( 1 == (buttonCount++ % 2) ) buttons.append( $('<br/>') );
}
- if( $p.attr('button2label') )
+ if( $e.attr('button2label') )
{
var actor = '<div class="actor switchUnpressed ';
- if ( $p.attr( 'align' ) )
- actor += $p.attr( 'align' );
+ if ( $e.attr( 'align' ) )
+ actor += $e.attr( 'align' );
actor += '">';
- actor += '<div class="value">' + $p.attr('button2label') + '</div>';
+ actor += '<div class="value">' + $e.attr('button2label') + '</div>';
actor += '</div>';
var $actor = $(actor).data( {
'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'value' : $p.attr('button2value'),
+ 'mapping' : $e.attr('mapping'),
+ 'styling' : $e.attr('styling'),
+ 'value' : $e.attr('button2value'),
'type' : 'switch',
- 'align' : $p.attr('align')
+ 'align' : $e.attr('align')
} ).bind( 'click', this.action );
if( showstatus == "true" ) {
for( var addr in address ) $actor.bind( addr, this.update );
@@ -75,19 +75,19 @@
buttons.append( $actor );
if( 1 == (buttonCount++ % 2) ) buttons.append( $('<br/>') );
}
- if( $p.attr('button3label') )
+ if( $e.attr('button3label') )
{
var actor = '<div class="actor switchUnpressed ';
- if ( $p.attr( 'align' ) )
- actor += $p.attr( 'align' );
+ if ( $e.attr( 'align' ) )
+ actor += $e.attr( 'align' );
actor += '">';
- actor += '<div class="value">' + $p.attr('button3label') + '</div>';
+ actor += '<div class="value">' + $e.attr('button3label') + '</div>';
actor += '</div>';
var $actor = $(actor).data( {
'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'value' : $p.attr('button3value'),
+ 'mapping' : $e.attr('mapping'),
+ 'styling' : $e.attr('styling'),
+ 'value' : $e.attr('button3value'),
'type' : 'switch'
} ).bind( 'click', this.action );
if( showstatus == "true" ) {
@@ -96,19 +96,19 @@
buttons.append( $actor );
if( 1 == buttonCount++ % 2 ) buttons.append( $('<br/>') );
}
- if( $p.attr('button4label') )
+ if( $e.attr('button4label') )
{
var actor = '<div class="actor switchUnpressed ';
- if ( $p.attr( 'align' ) )
- actor += $p.attr( 'align' );
+ if ( $e.attr( 'align' ) )
+ actor += $e.attr( 'align' );
actor += '">';
- actor += '<div class="value">' + $p.attr('button4label') + '</div>';
+ actor += '<div class="value">' + $e.attr('button4label') + '</div>';
actor += '</div>';
var $actor = $(actor).data( {
'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'value' : $p.attr('button4value'),
+ 'mapping' : $e.attr('mapping'),
+ 'styling' : $e.attr('styling'),
+ 'value' : $e.attr('button4value'),
'type' : 'switch',
} ).bind( 'click', this.action );
if( showstatus == "true" ) {
Modified: CometVisu/trunk/visu/structure/pure/slide.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/slide.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/slide.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -16,16 +16,16 @@
*/
basicdesign.addCreator('slide', {
- create: function( page, path ) {
- var $p = $(page);
- var layout = $p.find('layout')[0];
+ create: function( element, path ) {
+ var $e = $(element);
+ var layout = $e.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix slide" ' + style + ' />');
- ret_val.setWidgetLayout($p).makeWidgetLabel($p);
+ ret_val.setWidgetLayout($e).makeWidgetLabel($e);
var address = {};
var datatype_min = undefined;
var datatype_max = undefined;
- $p.find('address').each( function(){
+ $e.find('address').each( function(){
var src = this.textContent;
var transform = this.getAttribute('transform');
var readonly = this.getAttribute('readonly');
@@ -41,14 +41,14 @@
}
});
var actor = $('<div class="actor">');
- var min = parseFloat( $p.attr('min') || datatype_min || 0 );
- var max = parseFloat( $p.attr('max') || datatype_max || 100 );
- var step = parseFloat( $p.attr('step') || 0.5 );
+ var min = parseFloat( $e.attr('min') || datatype_min || 0 );
+ var max = parseFloat( $e.attr('max') || datatype_max || 100 );
+ var step = parseFloat( $e.attr('step') || 0.5 );
var $actor = $(actor).data({
'events': $(actor).data( 'events' ),
'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
+ 'mapping' : $e.attr('mapping'),
+ 'styling' : $e.attr('styling'),
'min' : min,
'max' : max,
'step' : step,
Modified: CometVisu/trunk/visu/structure/pure/switch.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/switch.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/switch.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -16,23 +16,23 @@
*/
basicdesign.addCreator('switch', {
- create: function( page, path ) {
- var $p = $(page);
- var layout = $p.find('layout')[0];
+ create: function( element, path ) {
+ var $e = $(element);
+ var layout = $e.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix switch" ' + style + '/>');
- ret_val.setWidgetLayout($p)
- var labelElement = $p.find('label')[0];
+ ret_val.setWidgetLayout($e)
+ var labelElement = $e.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
- var address = makeAddressList($p);
+ var address = makeAddressList($e);
var actor = '<div class="actor switchUnpressed"><div class="value">-</div></div>';
var $actor = $(actor).data( {
'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'on_value' : $p.attr('on_value' ) || 1,
- 'off_value' : $p.attr('off_value') || 0,
- 'align' : $p.attr('align'),
+ 'mapping' : $e.attr('mapping'),
+ 'styling' : $e.attr('styling'),
+ 'on_value' : $e.attr('on_value' ) || 1,
+ 'off_value' : $e.attr('off_value') || 0,
+ 'align' : $e.attr('align'),
'type' : 'switch'
} ).bind( 'click', this.action );
for( var addr in address )
Modified: CometVisu/trunk/visu/structure/pure/text.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/text.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/text.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -16,16 +16,16 @@
*/
basicdesign.addCreator('text', {
- create: function( page, path ) {
- var $p = $(page);
- var layout = $p.find('layout')[0];
+ create: function( element, path ) {
+ var $e = $(element);
+ var layout = $e.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix text" ' + style + '/>');
- ret_val.setWidgetLayout($p);
+ ret_val.setWidgetLayout($e);
var style = '';
- if( $p.attr('align') ) style += 'text-align:' + $p.attr('align') + ';';
+ if( $e.attr('align') ) style += 'text-align:' + $e.attr('align') + ';';
if( style != '' ) style = 'style="' + style + '"';
- ret_val.append( '<div ' + style + '>' + page.textContent + '</div>' );
+ ret_val.append( '<div ' + style + '>' + element.textContent + '</div>' );
return ret_val;
},
attributes: {
Modified: CometVisu/trunk/visu/structure/pure/toggle.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/toggle.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/toggle.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -16,21 +16,21 @@
*/
basicdesign.addCreator('toggle', {
- create: function( page, path ) {
- var $p = $(page);
- var layout = $p.find('layout')[0];
+ create: function( element, path ) {
+ var $e = $(element);
+ var layout = $e.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix toggle" ' + style + '/>');
- ret_val.setWidgetLayout($p);
- var labelElement = $p.find('label')[0];
+ ret_val.setWidgetLayout($e);
+ var labelElement = $e.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
- var address = makeAddressList($p);
+ var address = makeAddressList($e);
var actor = '<div class="actor switchUnpressed"><div class="value">-</div></div>';
var $actor = $(actor).data( {
'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'align' : $p.attr('align'),
+ 'mapping' : $e.attr('mapping'),
+ 'styling' : $e.attr('styling'),
+ 'align' : $e.attr('align'),
'type' : 'switch'
} ).bind( 'click', this.action );
for( var addr in address ) $actor.bind( addr, this.update );
Modified: CometVisu/trunk/visu/structure/pure/trigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/trigger.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/trigger.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -16,21 +16,21 @@
*/
basicdesign.addCreator('trigger', {
- create: function( page, path ) {
- var $p = $(page);
- var layout = $p.find('layout')[0];
+ create: function( element, path ) {
+ var $e = $(element);
+ var layout = $e.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
- var value = $p.attr('value') ? $p.attr('value') : 0;
+ var value = $e.attr('value') ? $e.attr('value') : 0;
var ret_val = $('<div class="widget clearfix switch" ' + style + ' />');
- ret_val.setWidgetLayout($p);
- var labelElement = $p.find('label')[0];
+ ret_val.setWidgetLayout($e);
+ var labelElement = $e.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
- var address = makeAddressList($p);
+ var address = makeAddressList($e);
var actor = '<div class="actor switchUnpressed ';
- if ( $p.attr( 'align' ) )
- actor += $p.attr( 'align' );
+ if ( $e.attr( 'align' ) )
+ actor += $e.attr( 'align' );
actor += '">';
- var map = $p.attr('mapping');
+ var map = $e.attr('mapping');
if( mappings[map] && mappings[map][value] )
actor += '<div class="value">' + mappings[map][value] + '</div>';
else
@@ -38,10 +38,10 @@
actor += '</div>';
var $actor = $(actor).data( {
'address' : address,
- 'mapping' : $(page).attr('mapping'),
- 'styling' : $(page).attr('styling'),
+ 'mapping' : $(element).attr('mapping'),
+ 'styling' : $(element).attr('styling'),
'type' : 'trigger',
- 'align' : $p.attr('align'),
+ 'align' : $e.attr('align'),
'sendValue': value
} ).bind( 'click', this.action ).bind( 'mousedown', function(){
$(this).removeClass('switchUnpressed').addClass('switchPressed');
Modified: CometVisu/trunk/visu/structure/pure/unknown.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/unknown.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/unknown.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -16,9 +16,9 @@
*/
basicdesign.addCreator('unknown', {
- create: function( page, path ) {
+ create: function( element, path ) {
var ret_val = $('<div class="widget clearfix" />');
- ret_val.append( '<pre>unknown: ' + page.nodeName + '</pre>' );
+ ret_val.append( '<pre>unknown: ' + element.nodeName + '</pre>' );
return ret_val;
},
attributes: {},
Modified: CometVisu/trunk/visu/structure/pure/video.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/video.js 2012-04-14 21:10:37 UTC (rev 753)
+++ CometVisu/trunk/visu/structure/pure/video.js 2012-04-14 22:05:09 UTC (rev 754)
@@ -16,20 +16,20 @@
*/
basicdesign.addCreator('video', {
- create: function( page, path ) {
- var $p = $(page);
- var layout = $p.find('layout')[0];
+ create: function( element, path ) {
+ var $e = $(element);
+ var layout = $e.find('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix video" ' + style + '/>');
- ret_val.setWidgetLayout($p);
- var labelElement = $p.find('label')[0];
+ ret_val.setWidgetLayout($e);
+ var labelElement = $e.find('label')[0];
ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
- var autoplay = ($p.attr('autoplay') && $p.attr('autoplay')=='true') ? ' autoplay="autoplay"' : '';
+ var autoplay = ($e.attr('autoplay') && $e.attr('autoplay')=='true') ? ' autoplay="autoplay"' : '';
var style = '';
- if( $p.attr('width' ) ) style += 'width:' + $p.attr('width' ) + ';';
- if( $p.attr('height') ) style += 'height:' + $p.attr('height') + ';';
+ if( $e.attr('width' ) ) style += 'width:' + $e.attr('width' ) + ';';
+ if( $e.attr('height') ) style += 'height:' + $e.attr('height') + ';';
if( style != '' ) style = 'style="' + style + '"';
- var actor = '<div class="actor"><video src="' +$p.attr('src') + '" ' + style + autoplay + ' controls="controls" /></div>';
+ var actor = '<div class="actor"><video src="' +$e.attr('src') + '" ' + style + autoplay + ' controls="controls" /></div>';
ret_val.append( $(actor).data( {} ) );
return ret_val;
},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
