Skip to content

Commit 69f2c1c

Browse files
author
Olivier Giulieri
committed
Fixed missing dropdown values in FF.
1 parent f0c25e0 commit 69f2c1c

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

dist/evolutility.js

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,7 +1953,7 @@ Evol.ViewOne = Backbone.View.extend({
19531953
var $fc=$f.children().removeAttr('selected');
19541954
if(fv!==''){
19551955
$fc.filter('[value='+fv+']')
1956-
.attr('selected', true);
1956+
.prop('selected', 'selected'); // FF need prop not attr
19571957
}
19581958
break;
19591959
case fTypes.bool:
@@ -3056,6 +3056,7 @@ Evol.ViewAction.Export = Backbone.View.extend({
30563056
initialize: function (opts) {
30573057
this.options = _.extend({}, this.options, opts);
30583058
this.uiModel = this.options.uiModel;
3059+
this.filterOn = this.options.filterOn;
30593060
this.render();
30603061
return this;
30613062
},
@@ -3125,7 +3126,7 @@ Evol.ViewAction.Export = Backbone.View.extend({
31253126
_.each(['XML','HTML','SQL','JSON'], function(f){
31263127
h.push('<div id="', prefix, f, '" style="display:none;"></div>');
31273128
});
3128-
h.push('</div>',
3129+
h.push('<div class="clearfix"></div></div>',
31293130
//# Preview #######
31303131
'<label>',i18nXpt.preview,'</label><div class="evol-xpt-preview">',
31313132
// ## Samples
@@ -6175,12 +6176,12 @@ Evol.Shell = Backbone.View.extend({
61756176
this.setupRouter();
61766177
},
61776178

6178-
render: function() {
6179-
//this.$el.html(this._HTML());
6180-
this.$nav2.html(this._HTMLentities(this.options.uiModels));
6181-
//this.$content;
6182-
return this;
6183-
},
6179+
//render: function() {
6180+
//this.$el.html(...
6181+
//this.$nav2.html(this._HTMLentities(this.options.uiModels));
6182+
//this.$content.html(...;
6183+
//return this;
6184+
//},
61846185

61856186
setupRouter: function(){
61866187
var that=this,
@@ -6221,6 +6222,8 @@ Evol.Shell = Backbone.View.extend({
62216222
setEntity: function(eName, view, options){
62226223
var that=this;
62236224

6225+
view = view || 'list';
6226+
62246227
function cb(){
62256228
that._ents[eName].show().siblings().hide();
62266229
var tb=that._tbs[eName];
@@ -6309,15 +6312,15 @@ Evol.Shell = Backbone.View.extend({
63096312
}
63106313
}
63116314
});
6312-
},
6315+
}/*,
63136316
63146317
_HTMLentities: function (es) {
63156318
var h=[];
63166319
_.each(es, function(e){
63176320
h.push('<li><a href="#', e.id, '/list" data-id="', e.id, '">', e.entities, '</a></li>');
63186321
});
63196322
return h.join('');
6320-
}
6323+
}*/
63216324

63226325
});
63236326

0 commit comments

Comments
 (0)