Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[1382] CometVisu/trunk/visu
|
From: <pe...@us...> - 2013-02-01 16:51:37
|
Revision: 1382
http://openautomation.svn.sourceforge.net/openautomation/?rev=1382&view=rev
Author: peuter
Date: 2013-02-01 16:51:28 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
- fixes Bug #3602947: Flavours aren?\194?\180t inherited down to icons
- whole Pagejump Widget reacts to click event now. Fixes problem where pagejumps without name weren?\194?\180t klickable
- small Refactoring: removed icons instance from templateEngine to global namespace, initializes in the iconhandler,js and therefore accessible before the templateengine is loaded
Modified Paths:
--------------
CometVisu/trunk/visu/lib/iconhandler.js
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/plugins/svg/structure_plugin.js
CometVisu/trunk/visu/structure/pure/_common.js
CometVisu/trunk/visu/structure/pure/image.js
CometVisu/trunk/visu/structure/pure/imagetrigger.js
CometVisu/trunk/visu/structure/pure/info.js
CometVisu/trunk/visu/structure/pure/infotrigger.js
CometVisu/trunk/visu/structure/pure/multitrigger.js
CometVisu/trunk/visu/structure/pure/navbar.js
CometVisu/trunk/visu/structure/pure/pagejump.js
CometVisu/trunk/visu/structure/pure/rgb.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/urltrigger.js
CometVisu/trunk/visu/structure/pure/video.js
CometVisu/trunk/visu/structure/pure/web.js
CometVisu/trunk/visu/structure/pure/wgplugin_info.js
Modified: CometVisu/trunk/visu/lib/iconhandler.js
===================================================================
--- CometVisu/trunk/visu/lib/iconhandler.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/lib/iconhandler.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -1002,13 +1002,14 @@
'purple' : { 'uri': 'icon/knx-uf-iconset/128x128_purple/fts_markise.png' },
'red' : { 'uri': 'icon/knx-uf-iconset/128x128_red/fts_markise.png' },
'white' : { 'uri': 'icon/knx-uf-iconset/128x128_white/fts_markise.png' } } } },
-'fts_rollo' : { '*': { '*' : { '*' : 'white', 'ws' : 'white', 'sodium' : 'orange',
- 'blue' : { 'uri': 'icon/knx-uf-iconset/128x128_blue/fts_rollo.png' },
- 'green' : { 'uri': 'icon/knx-uf-iconset/128x128_green/fts_rollo.png' },
- 'orange' : { 'uri': 'icon/knx-uf-iconset/128x128_orange/fts_rollo.png' },
- 'purple' : { 'uri': 'icon/knx-uf-iconset/128x128_purple/fts_rollo.png' },
- 'red' : { 'uri': 'icon/knx-uf-iconset/128x128_red/fts_rollo.png' },
- 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_white/fts_rollo.png' } } } },
+'fts_rollo' : { '*' : { 'white' : '*/white', 'ws' : '*/white', 'antimony' : '*/blue', 'boron' : '*/green', 'lithium' : '*/red', 'potassium' : '*/purple', 'sodium' : '*/orange',
+ '*': { '*' : 'white',
+ 'blue' : { 'uri': 'icon/knx-uf-iconset/128x128_blue/fts_rollo.png' },
+ 'green' : { 'uri': 'icon/knx-uf-iconset/128x128_green/fts_rollo.png' },
+ 'orange' : { 'uri': 'icon/knx-uf-iconset/128x128_orange/fts_rollo.png' },
+ 'purple' : { 'uri': 'icon/knx-uf-iconset/128x128_purple/fts_rollo.png' },
+ 'red' : { 'uri': 'icon/knx-uf-iconset/128x128_red/fts_rollo.png' },
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_white/fts_rollo.png' } } } },
'fts_rollo_10' : { '*': { '*' : { '*' : 'white', 'ws' : 'white', 'sodium' : 'orange',
'blue' : { 'uri': 'icon/knx-uf-iconset/128x128_blue/fts_rollo_10.png' },
'green' : { 'uri': 'icon/knx-uf-iconset/128x128_green/fts_rollo_10.png' },
@@ -3838,7 +3839,6 @@
var type = arguments[1];
var flavour = arguments[2];
var color = arguments[3];
-
if (!db[name])
return undefined;
if (!db[name][type])
@@ -3916,3 +3916,4 @@
return db;
}
};
+var icons = new icon();
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/lib/templateengine.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -45,7 +45,6 @@
function TemplateEngine() {
var thisTemplateEngine = this;
this.design = new VisuDesign_Custom();
- this.icons = new icon();
this.pagePartsHandler = new PagePartsHandler();
this.mappings = {}; // store the mappings
@@ -388,7 +387,7 @@
var color = $this.attr('color');
var styling = $this.attr('styling');
var dynamic = $this.attr('dynamic');
- thisTemplateEngine.icons.insert(name, uri, type, flavour, color, styling, dynamic);
+ icons.insert(name, uri, type, flavour, color, styling, dynamic);
});
// then the mappings
@@ -408,7 +407,7 @@
for ( var i = 0; i < origin.length; i++) {
var $v = $(origin[i]);
if ($v.is('icon'))
- value[i] = thisTemplateEngine.icons.getIcon($v.attr('name'), $v.attr('type'), $v.attr('flavour'), $v.attr('color'));
+ value[i] = icons.getIcon($v.attr('name'), $v.attr('type'), $v.attr('flavour'), $v.attr('color'));
else
value[i] = $v.text();
}
@@ -763,7 +762,7 @@
}
}
// set pagejump for this page to active if it exists
- $(".pagejump > .actor").each(
+ $(".pagejump").each(
function(i) {
var activePageJump = null;
var actor = $(this);
@@ -772,12 +771,12 @@
// get page id by name
$('h1:contains(' + target + ')', '#' + page_id).each(function(i) {
if ($(this).text() == target) {
- activePageJump = actor.parent();
+ activePageJump = actor;
return false;
}
});
} else if (page_id == target) {
- activePageJump = actor.parent();
+ activePageJump = actor;
}
if (activePageJump != null) {
activePageJump.addClass('active');
@@ -787,7 +786,7 @@
// root is always an active ancestor, no need to specify that
break;
}
- $(".pagejump > .actor").each(
+ $(".pagejump").each(
function(i) {
var parentActor = $(this);
var parentTarget = parentActor.data().target;
@@ -796,12 +795,12 @@
$('h1:contains(' + parentTarget + ')',
'#' + parentPage.attr('id')).each(function(i) {
if ($(this).text() == parentTarget) {
- parentActor.parent().addClass('active_ancestor');
+ parentActor.addClass('active_ancestor');
return false;
}
});
} else if (parentPage.attr('id') == parentTarget) {
- parentActor.parent().addClass('active_ancestor');
+ parentActor.addClass('active_ancestor');
}
});
parentPage = thisTemplateEngine.getParentPage(parentPage);
Modified: CometVisu/trunk/visu/plugins/svg/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/svg/structure_plugin.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/plugins/svg/structure_plugin.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -27,7 +27,7 @@
var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
var ret_val = $('<div class="widget clearfix image" ' + style + '/>');
ret_val.setWidgetLayout($e);
- ret_val.append( extractLabel( $e.find('label')[0] ) );
+ ret_val.append( extractLabel( $e.find('label')[0], flavour ) );
var address = {};
$e.find('address').each( function(){
Modified: CometVisu/trunk/visu/structure/pure/_common.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/_common.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/_common.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -72,10 +72,10 @@
* this function implements the widget label (JNK)
*/
-$.fn.makeWidgetLabel = function(page) {
+$.fn.makeWidgetLabel = function(page, flavour) {
var labelElement = page.find('label')[0]; // get first label element
if (labelElement) { // if exists, add it
- this.append( extractLabel( labelElement ) );
+ this.append( extractLabel( labelElement, flavour ) );
}
return this;
}
@@ -420,7 +420,7 @@
return ret_val;
}
-function extractLabel( label )
+function extractLabel( label, flavour )
{
if( !label ) return;
@@ -429,7 +429,7 @@
var $v = $(this);
if( $v.is('icon') )
{
- var i = templateEngine.icons.getIcon($v.attr('name'), $v.attr('type'), $v.attr('flavour'));
+ var i = icons.getIcon($v.attr('name'), $v.attr('type'), $v.attr('flavour') || flavour);
if( i ) $div.append( i.clone() );
} else
$div.append( this.textContent );
Modified: CometVisu/trunk/visu/structure/pure/image.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/image.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/image.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -24,7 +24,7 @@
ret_val.setWidgetLayout($e);
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
- ret_val.append( extractLabel( $e.find('label')[0] ) );
+ ret_val.append( extractLabel( $e.find('label')[0], flavour ) );
var imgStyle = '';
if( $e.attr('width' ) ) {
imgStyle += 'width:' + $e.attr('width' ) + ';';
Modified: CometVisu/trunk/visu/structure/pure/imagetrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/imagetrigger.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/imagetrigger.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -24,7 +24,7 @@
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
var value = $e.attr('value') ? $e.attr('value') : 0;
- ret_val.append( extractLabel( $e.find('label')[0] ) );
+ ret_val.append( extractLabel( $e.find('label')[0], flavour ) );
var address = makeAddressList($e);
var layout = $e.children('layout')[0];
var style = layout ? 'style="' + extractLayout( layout, type, {width:'100%'} ) + '"' : '';
Modified: CometVisu/trunk/visu/structure/pure/info.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/info.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/info.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -33,7 +33,7 @@
//type == '3d' && ret_val.data( extractLayout3d( layout ) ).bind( 'update3d', this.update3d );
type == '3d' && $(document).bind( 'update3d', {element: ret_val, layout: extractLayout3d( layout )}, this.update3d );
- ret_val.setWidgetLayout($e).makeWidgetLabel($e);
+ ret_val.setWidgetLayout($e).makeWidgetLabel($e, flavour);
var address = makeAddressList($e);
var actor = '<div class="actor"><div class="value">-</div></div>';
Modified: CometVisu/trunk/visu/structure/pure/infotrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/infotrigger.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/infotrigger.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -20,11 +20,10 @@
var $e = $(element);
var layout = $e.children('layout')[0];
var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
+ if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
var ret_val = $('<div class="widget clearfix infotrigger" ' + style + '/>');
ret_val.setWidgetLayout($e);
- ret_val.append( extractLabel( $e.find('label')[0] ) );
-
- if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
+ ret_val.append( extractLabel( $e.find('label')[0], flavour ) );
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
// handle addresses
var address = makeAddressList($e,
Modified: CometVisu/trunk/visu/structure/pure/multitrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/multitrigger.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/multitrigger.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -22,8 +22,8 @@
var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
var ret_val = $('<div class="widget clearfix multitrigger" ' + style + '/>');
ret_val.setWidgetLayout($e)
- ret_val.append( extractLabel( $e.find('label')[0] ) );
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
+ ret_val.append( extractLabel( $e.find('label')[0], flavour ) );
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
var address = makeAddressList($e);
var showstatus = $e.attr("showstatus") || "false";
Modified: CometVisu/trunk/visu/structure/pure/navbar.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/navbar.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/navbar.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -24,11 +24,12 @@
var scope = $n.attr('scope') || -1;
var container = $( '<div class="navbar clearfix" id="' + id.join('_')+'_'+ position + '_navbar" />' );
if( $n.attr('name') ) container.append( '<h2 ' + hstyle + '>' + $n.attr('name') + '</h2>' );
+ if( $n.attr('flavour') ) flavour = $n.attr('flavour');// sub design choice
$( childs ).each( function(i){
container.append( templateEngine.create_pages( childs[i], path + '_' + i, flavour ) );
} );
container.data('scope',scope);
- if( $n.attr('flavour') ) flavour = $n.attr('flavour');// sub design choice
+
if( flavour ) container.addClass( 'flavour_' + flavour );
var dynamic = $n.attr('dynamic') == 'true' ? true : false;
Modified: CometVisu/trunk/visu/structure/pure/pagejump.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/pagejump.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/pagejump.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -29,7 +29,7 @@
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
ret_val.setWidgetLayout($e);
- var label = extractLabel( $e.find('label')[0] );
+ var label = extractLabel( $e.find('label')[0], flavour );
var address = makeAddressList($e);
var actor = '<div class="actor switchUnpressed ';
if ( $e.attr( 'align' ) )
@@ -41,13 +41,15 @@
var $actor = $(actor).data( {
'styling' : $(element).attr('styling'),
'type' : 'pagejump',
- 'align' : $e.attr('align'),
- 'target' : target
- } ).bind( 'click', this.action ).bind( 'mousedown', function(){
- $(this).removeClass('switchUnpressed').addClass('switchPressed');
+ 'align' : $e.attr('align')
+ } ).setWidgetStyling(target);
+
+ ret_val.bind( 'click', this.action ).bind( 'mousedown', function(){
+ $actor.removeClass('switchUnpressed').addClass('switchPressed');
} ).bind( 'mouseup mouseout', function(){ // not perfect but simple
- $(this).removeClass('switchPressed').addClass('switchUnpressed');
- } ).setWidgetStyling(target);
+ $actor.removeClass('switchPressed').addClass('switchUnpressed');
+ } );
+ ret_val.data('target',target);
ret_val.append( label ).append( $actor );
return ret_val;
},
Modified: CometVisu/trunk/visu/structure/pure/rgb.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/rgb.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/rgb.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -29,7 +29,7 @@
ret_val.setWidgetLayout($e);
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
- var label = extractLabel( $e.find('label')[0] );
+ var label = extractLabel( $e.find('label')[0], flavour );
var address = makeAddressList($e, rgb_handleVariant);
var actor = '<div class="actor" style="background: #ffffff;"></div>';
Modified: CometVisu/trunk/visu/structure/pure/slide.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/slide.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/slide.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -22,7 +22,7 @@
var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
var ret_val = $('<div class="widget clearfix slide" ' + style + ' />');
- ret_val.setWidgetLayout($e).makeWidgetLabel($e);
+ ret_val.setWidgetLayout($e).makeWidgetLabel($e, flavour);
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
var address = makeAddressList($e);
var datatype_min = undefined;
Modified: CometVisu/trunk/visu/structure/pure/switch.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/switch.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/switch.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -28,7 +28,7 @@
ret_val.setWidgetLayout($e);
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
- var label = extractLabel( $e.find('label')[0] );
+ var label = extractLabel( $e.find('label')[0], flavour );
var address = makeAddressList($e);
var actor = '<div class="actor switchUnpressed"><div class="value">-</div></div>';
Modified: CometVisu/trunk/visu/structure/pure/text.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/text.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/text.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -24,13 +24,13 @@
ret_val.setWidgetLayout($e);
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
- var label = extractLabel( $e.find('label')[0] );
+ var label = extractLabel( $e.find('label')[0], flavour );
if (!label) {
label = $('<div/>');
$e.contents().each(function() {
var $v = $(this);
if ($v.is('icon')) {
- var i = templateEngine.icons.getIcon($v.attr('name'), $v.attr('type'), $v.attr('flavour') || flavour);
+ var i = icons.getIcon($v.attr('name'), $v.attr('type'), $v.attr('flavour') || flavour);
if (i)
label.append(i.clone());
} else
Modified: CometVisu/trunk/visu/structure/pure/toggle.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/toggle.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/toggle.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -28,7 +28,7 @@
ret_val.setWidgetLayout($e);
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
- var label = extractLabel( $e.find('label')[0] );
+ var label = extractLabel( $e.find('label')[0], flavour );
var address = makeAddressList($e);
var actor = '<div class="actor switchUnpressed"><div class="value">-</div></div>';
var $actor = $(actor).data( {
Modified: CometVisu/trunk/visu/structure/pure/trigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/trigger.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/trigger.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -30,7 +30,7 @@
ret_val.setWidgetLayout($e);
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
- var label = extractLabel( $e.find('label')[0] );
+ var label = extractLabel( $e.find('label')[0], flavour );
var address = makeAddressList($e, function(src, transform, mode, variant){return [true, variant=='short'];});
var actor = '<div class="actor switchUnpressed ';
if ( $e.attr( 'align' ) )
Modified: CometVisu/trunk/visu/structure/pure/urltrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/urltrigger.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/urltrigger.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -30,7 +30,7 @@
ret_val.setWidgetLayout($e);
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
- var label = extractLabel( $e.find('label')[0] );
+ var label = extractLabel( $e.find('label')[0], flavour );
var actor = '<div class="actor switchUnpressed ';
if ( $e.attr( 'align' ) )
actor += $e.attr( 'align' );
Modified: CometVisu/trunk/visu/structure/pure/video.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/video.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/video.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -24,7 +24,7 @@
ret_val.setWidgetLayout($e);
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
- ret_val.append( extractLabel( $e.find('label')[0] ) );
+ ret_val.append( extractLabel( $e.find('label')[0], flavour ) );
var autoplay = ($e.attr('autoplay') && $e.attr('autoplay')=='true') ? ' autoplay="autoplay"' : '';
var style = '';
if( $e.attr('width' ) ) style += 'width:' + $e.attr('width' ) + ';';
Modified: CometVisu/trunk/visu/structure/pure/web.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/web.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/web.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -24,7 +24,7 @@
ret_val.setWidgetLayout($e);
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
- ret_val.append( extractLabel( $e.find('label')[0] ) );
+ ret_val.append( extractLabel( $e.find('label')[0], flavour ) );
var webStyle = '';
if( $e.attr('width' ) ) {
webStyle += 'width:' + $e.attr('width' ) + ';';
Modified: CometVisu/trunk/visu/structure/pure/wgplugin_info.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/wgplugin_info.js 2013-02-01 13:17:05 UTC (rev 1381)
+++ CometVisu/trunk/visu/structure/pure/wgplugin_info.js 2013-02-01 16:51:28 UTC (rev 1382)
@@ -24,7 +24,7 @@
//type == '3d' && ret_val.data( extractLayout3d( layout ) ).bind( 'update3d', this.update3d );
type == '3d' && $(document).bind( 'update3d', {element: ret_val, layout: extractLayout3d( layout )}, this.update3d );
- ret_val.setWidgetLayout($e).makeWidgetLabel($e);
+ ret_val.setWidgetLayout($e).makeWidgetLabel($e, flavour);
if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
if( flavour ) ret_val.addClass( 'flavour_' + flavour );
var address = makeAddressList($e);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
