Skip to content

Commit c38c8ed

Browse files
author
Olivier Giulieri
committed
Removed action.js super class for action views.
1 parent 3e45954 commit c38c8ed

File tree

4 files changed

+10
-37
lines changed

4 files changed

+10
-37
lines changed

js/action-export.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
*
88
*************************************************************************** */
99

10-
var Evol = Evol || {},
11-
evoLangXpt = Evol.i18n.export;
10+
var evoLangXpt = Evol.i18n.export;
1211

13-
Evol.ViewAction.Export = Evol.ViewAction.extend({
12+
Evol.ViewAction.Export = Backbone.View.extend({
1413

1514
viewName: 'export',
1615

js/action-filter.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
*
88
*************************************************************************** */
99

10-
var Evol = Evol || {},
11-
evoLang=Evol.i18n.filters;
10+
var evoLang=Evol.i18n.filters;
1211

1312
var fOps={
1413
sEqual:'eq',

js/action.js

Lines changed: 0 additions & 26 deletions
This file was deleted.

js/ui.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*************************************************************************** */
99

1010
var Evol = Evol || {};
11+
Evol.ViewAction = {};
1112
/*
1213
Evol.CSS = {
1314
field: 'evo-field form-control ',
@@ -35,10 +36,10 @@ Evol.UI = {
3536
return ['<label for="', fID, '">', fLbl, '</label>'].join('');
3637
},
3738
fieldLabel: function (fID, fLbl) {
38-
return ['<div class="evol-field-label">', this.label(fID, fLbl) , '</div>'].join('');
39+
return ['<div class="evol-field-label">', this.label(fID, fLbl), '</div>'].join('');
3940
},
4041
fieldLabelSpan: function (fID, fLbl) {
41-
return ['<span class="evol-field-label">', this.label(fID, fLbl) , '</span>'].join('');
42+
return ['<span class="evol-field-label">', this.label(fID, fLbl), '</span>'].join('');
4243
},
4344

4445
// --- input fields ---
@@ -233,8 +234,8 @@ Evol.UI = {
233234
//},
234235

235236
// --- icons ---
236-
icon: function (icon, cls) {
237-
return ['<i class="', cls? cls+' ':'', Evol.UI.html.glyphicon, icon, '"></i>'].join('');
237+
icon: function (icon, css) {
238+
return ['<i class="', css? css+' ':'', Evol.UI.html.glyphicon, icon, '"></i>'].join('');
238239
},
239240

240241
iconCustomize: function (id, type) {
@@ -258,12 +259,12 @@ Evol.UI = {
258259
},
259260

260261
// --- status ---
261-
HTMLMsg: function (title, content, style) {
262+
HTMLMsg: function (title, msg, style) {
262263
return [
263264
'<div data-id="msg" class="evo-msg alert alert-',style || 'info',
264265
' alert-dismissable">', this.html.buttonClose,
265266
'<strong>',title,'</strong><br/><div>',
266-
content,'</div></div>'
267+
msg,'</div></div>'
267268
].join('');
268269
},
269270

0 commit comments

Comments
 (0)