Skip to content

Commit 3e307de

Browse files
committed
Toolbar: Changed toaster options + moved toolbar.js to /view-action/ directory + cleanups.
1 parent 8029850 commit 3e307de

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

js/dico/toolbar.js renamed to js/view-action/toolbar.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ _.forEach([ 'filter', 'export', 'import'],function(vn){
3131

3232
if(toastr){
3333
toastr.options = {
34-
hideDuration: 800,
35-
preventDuplicates: true,
34+
hideDuration: 0,
35+
//preventDuplicates: true,
3636
closeButton: true,
3737
progressBar: true
3838
};
@@ -451,7 +451,7 @@ return Backbone.View.extend({
451451

452452
setIcons: function(mode){
453453
var showOrHide = dom.showOrHide,
454-
importExport = mode==='export' || mode==='import';
454+
importOrExport = mode==='export' || mode==='import';
455455

456456
function oneMany(mode, showOne, showMany){
457457
showOrHide(tbBs.ones, showOne);
@@ -464,7 +464,7 @@ return Backbone.View.extend({
464464
var tbBs=this.getToolbarButtons();
465465
//showOrHide(tbBs.customize, mode!='json');
466466
tbBs.prevNext.hide();//.removeClass('disabled');
467-
showOrHide(tbBs.views, !(importExport || mode=='new'));
467+
showOrHide(tbBs.views, !(importOrExport || mode=='new'));
468468
tbBs.del.hide();
469469

470470
if(Evol.Def.isViewMany(mode)){
@@ -475,7 +475,7 @@ return Backbone.View.extend({
475475
pSize=this.curView.pageSize;
476476
if(cSize > pSize){
477477
tbBs.prevNext.show();/*
478-
// TODO finish disabling of paging buttons
478+
// TODO: finish disabling of paging buttons
479479
// use ui.addRemClass
480480
if(this.curView.pageIndex===0){
481481
tbBs.prevNext.eq(0).addClass('disabled');
@@ -489,12 +489,12 @@ return Backbone.View.extend({
489489
}*/
490490
}
491491
}
492-
}else if((this.model && this.model.isNew()) || mode==='new' || importExport){
492+
}else if((this.model && this.model.isNew()) || mode==='new' || importOrExport){
493493
oneMany(mode, false, false);
494494
tbBs.del.hide();
495495
tbBs.views.hide();
496-
tbBs.more.show();
497-
showOrHide(tbBs.save, !importExport);
496+
showOrHide(tbBs.more, importOrExport);
497+
showOrHide(tbBs.save, !importOrExport);
498498
}else{
499499
this._prevViewOne=mode;
500500
oneMany(mode, true, false);
@@ -818,6 +818,7 @@ return Backbone.View.extend({
818818

819819
clearMessage: function(){
820820
this.$('[data-id="msg"]').remove();
821+
toastr.clear();
821822
return this;
822823
},
823824

0 commit comments

Comments
 (0)