Fix test label

This commit is contained in:
guerler
2016-01-14 18:52:08 -05:00
parent 907ce6efd2
commit 03082a7239
7 changed files with 20 additions and 21 deletions
+4 -4
View File
@@ -13,7 +13,7 @@ define(['utils/utils',
/** Label wrapper */
var Label = Backbone.View.extend({
tagName: 'label',
initialize : function( options ) {
initialize: function( options ) {
this.model = options && options.model || new Backbone.Model( options );
this.tagName = options.tagName || this.tagName;
this.setElement( $( '<' + this.tagName + '/>' ) );
@@ -79,7 +79,7 @@ define(['utils/utils',
/** Renders an input element used e.g. in the tool form */
var Input = Backbone.View.extend({
initialize : function( options ) {
initialize: function( options ) {
this.model = options && options.model || new Backbone.Model({
type : 'text',
placeholder : '',
@@ -96,7 +96,7 @@ define(['utils/utils',
events: {
'input': '_onchange'
},
value: function ( new_val ) {
value: function( new_val ) {
new_val !== undefined && this.model.set( 'value', typeof new_val === 'string' ? new_val : '' );
return this.model.get( 'value' );
},
@@ -127,7 +127,7 @@ define(['utils/utils',
this.listenTo( this.model, 'change', this.render, this );
this.render();
},
value: function ( new_val ) {
value: function( new_val ) {
new_val !== undefined && this.model.set( 'value', new_val );
return this.model.get( 'value' );
},
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"ui-misc.js","sources":["../../../src/mvc/ui/ui-misc.js"],"names":["define","Utils","Select","Slider","Options","Drilldown","Buttons","Modal","Label","Backbone","View","extend","tagName","initialize","options","this","model","Model","setElement","$","listenTo","render","title","new_title","set","value","get","$el","removeClass","addClass","html","Message","message","status","cls","persistent","update","fadeIn","timeout","window","clearTimeout","self","setTimeout","fadeOut","Input","type","placeholder","disabled","visible","area","events","input","new_val","undefined","attr","id","val","removeAttr","_onchange","Hidden","append","$info","$hidden","show","hide","Button","ButtonDefault","ButtonIcon","ButtonCheck","ButtonMenu","ButtonLink","RadioButton","Checkbox","Radio"],"mappings":"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"}
{"version":3,"file":"ui-misc.js","sources":["../../../src/mvc/ui/ui-misc.js"],"names":["define","Utils","Select","Slider","Options","Drilldown","Buttons","Modal","Label","Backbone","View","extend","tagName","initialize","options","this","model","Model","setElement","$","listenTo","render","title","new_title","set","value","get","$el","removeClass","addClass","html","Message","message","status","cls","persistent","update","fadeIn","timeout","window","clearTimeout","self","setTimeout","fadeOut","Input","type","placeholder","disabled","visible","area","events","input","new_val","undefined","attr","id","val","removeAttr","_onchange","Hidden","append","$info","$hidden","show","hide","Button","ButtonDefault","ButtonIcon","ButtonCheck","ButtonMenu","ButtonLink","RadioButton","Checkbox","Radio"],"mappings":"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"}
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -20,7 +20,7 @@ define([ 'test-app', 'mvc/ui/ui-misc'
ok( input.tagName === 'input', 'Created input.' );
ok( input.value() === undefined, 'Input empty.' );
input.model.set( 'value', '_value' );
ok( input.$el.val() === '_value', 'Input empty.' );
ok( input.$el.val() === '_value', 'Input with value.' );
ok( !input.$el.hasClass( '_cls' ), 'Has no custom class.' );
input.model.set( 'cls', '_cls' );
ok( input.$el.hasClass( '_cls' ), 'Has custom class.' );
@@ -62,7 +62,7 @@ define([ 'test-app', 'mvc/ui/ui-misc'
ok( message.$el.hasClass( 'alert-info' ), 'Alert info.' );
ok( message.$el.html() === '_message', 'Correct message.' );
message.model.set( 'message', '_new_message' );
ok( message.$el.html() === '_new_message', 'Correct message.' );
ok( message.$el.html() === '_new_message', 'Correct new message.' );
} );
test( 'hidden', function() {