Browse Source

Rip out the remaining "statusbar" toggle logic.

pull/3202/head
TheGoddessInari 7 years ago
parent
commit
6693bfed09
  1. 4
      app/model/Service.js
  2. 12
      app/ux/WebView.js
  3. 2
      app/view/add/AddController.js

4
app/model/Service.js

@ -41,10 +41,6 @@ Ext.define('Rambox.model.Service', {
name: 'tabname' name: 'tabname'
,type: 'boolean' ,type: 'boolean'
,defaultValue: true ,defaultValue: true
},{
name: 'statusbar'
,type: 'boolean'
,defaultValue: false
},{ },{
name: 'displayTabUnreadCounter' name: 'displayTabUnreadCounter'
,type: 'boolean' ,type: 'boolean'

12
app/ux/WebView.js

@ -130,13 +130,7 @@ Ext.define('Rambox.ux.WebView',{
} }
}); });
if ( me.record.get('statusbar') ) {
Ext.apply(me, {
bbar: me.statusBarConstructor(false)
});
} else {
me.items.push(me.statusBarConstructor(true)); me.items.push(me.statusBarConstructor(true));
}
me.callParent(config); me.callParent(config);
} }
@ -192,8 +186,8 @@ Ext.define('Rambox.ux.WebView',{
return { return {
xtype: 'statusbar' xtype: 'statusbar'
,hidden: !me.record.get('statusbar') ,hidden: true
,keep: me.record.get('statusbar') ,keep: false
,y: floating ? '-18px' : 'auto' ,y: floating ? '-18px' : 'auto'
,height: 19 ,height: 19
,dock: 'bottom' ,dock: 'bottom'
@ -663,7 +657,7 @@ Ext.define('Rambox.ux.WebView',{
me.down('statusbar').hide(); me.down('statusbar').hide();
me.down('statusbar').closed = true; me.down('statusbar').closed = true;
me.down('statusbar').keep = me.record.get('statusbar'); me.down('statusbar').keep = false;
} }
,setStatusBar: function(keep) { ,setStatusBar: function(keep) {

2
app/view/add/AddController.js

@ -49,8 +49,6 @@ Ext.define('Rambox.view.add.AddController', {
view.setTitle( formValues.tabname ? formValues.serviceName : '' ); view.setTitle( formValues.tabname ? formValues.serviceName : '' );
// Change sound of the Tab // Change sound of the Tab
view.setAudioMuted(formValues.muted); view.setAudioMuted(formValues.muted);
// Change statusbar of the Tab
view.setStatusBar(formValues.statusbar);
// Change notifications of the Tab // Change notifications of the Tab
view.setNotifications(formValues.notifications); view.setNotifications(formValues.notifications);
// Change the icon of the Tab // Change the icon of the Tab

Loading…
Cancel
Save