Browse Source

Use the proper equality operators.

pull/3202/head
TheGoddessInari 7 years ago
parent
commit
021022b307
  1. 2
      app/Application.js
  2. 4
      app/ux/WebView.js
  3. 2
      app/view/add/AddController.js
  4. 6
      app/view/main/MainController.js

2
app/Application.js

@ -182,7 +182,7 @@ Ext.define('Rambox.Application', {
// Mouse Wheel zooming // Mouse Wheel zooming
document.addEventListener('mousewheel', function(e) { document.addEventListener('mousewheel', function(e) {
if( e.ctrlKey ) { if( e.ctrlKey ) {
var delta = Math.max(-1, Math.min(1, (e.wheelDelta || -e.detail))); var delta = Math.max(-1, Math.min(1, e.wheelDelta || -e.detail));
var tabPanel = Ext.cq1('app-main'); var tabPanel = Ext.cq1('app-main');
if ( tabPanel.items.indexOf(tabPanel.getActiveTab()) === 0 ) return false; if ( tabPanel.items.indexOf(tabPanel.getActiveTab()) === 0 ) return false;

4
app/ux/WebView.js

@ -396,7 +396,7 @@ Ext.define('Rambox.ux.WebView',{
{ {
if ( me.record ) { if ( me.record ) {
let custom_css_complex = me.record.get('custom_css_complex'); let custom_css_complex = me.record.get('custom_css_complex');
if (custom_css_complex == true) { if (custom_css_complex === true) {
let custom_css = Ext.getStore('ServicesList').getById(me.record.get('type')).get('custom_css'); let custom_css = Ext.getStore('ServicesList').getById(me.record.get('type')).get('custom_css');
custom_css = custom_css + me.record.get('custom_css'); custom_css = custom_css + me.record.get('custom_css');
if ( custom_css !== '' ) { if ( custom_css !== '' ) {
@ -404,7 +404,7 @@ Ext.define('Rambox.ux.WebView',{
console.info(me.type); console.info(me.type);
console.log(custom_css); console.log(custom_css);
let js_before = '{let mystyle=`'; let js_before = '{let mystyle=`';
let js_after = '`,mycss=document.createElement("style");mycss.type="text/css",mycss.styleSheet?mycss.styleSheet.cssText=mystyle:mycss.appendChild(document.createTextNode(mystyle));let myDocHead=document.head;null==myDocHead||myDocHead.ramboxStyled||(myDocHead.appendChild(mycss),myDocHead.ramboxStyled=!0);let myframes=document.getElementsByTagName("iframe");for(let myframe of myframes){let mydocument,mydochead=(myframe.contentDocument||myframe.contentWindow.document).head;if(null!=mydochead&&!mydochead.ramboxStyled){let myclonedcss=mycss.cloneNode(deep=!0);mydochead.appendChild(myclonedcss),mydochead.ramboxStyled=!0}}}'; let js_after = '`,mycss=document.createElement("style");mycss.type="text/css",mycss.styleSheet?mycss.styleSheet.cssText=mystyle:mycss.appendChild(document.createTextNode(mystyle));let myDocHead=document.head;null===myDocHead||myDocHead.ramboxStyled||(myDocHead.appendChild(mycss),myDocHead.ramboxStyled=!0);let myframes=document.getElementsByTagName("iframe");for(let myframe of myframes){let mydocument,mydochead=(myframe.contentDocument||myframe.contentWindow.document).head;if(null!==mydochead&&!mydochead.ramboxStyled){let myclonedcss=mycss.cloneNode(deep=!0);mydochead.appendChild(myclonedcss),mydochead.ramboxStyled=!0}}}';
webview.executeJavaScript(js_before + custom_css + js_after); webview.executeJavaScript(js_before + custom_css + js_after);
} }
} }

2
app/view/add/AddController.js

@ -131,7 +131,7 @@ Ext.define('Rambox.view.add.AddController', {
,onEnter: function(field, e) { ,onEnter: function(field, e) {
var me = this; var me = this;
if ( e.getKey() == e.ENTER && field.up('form').isValid() ) me.doSave(); if ( e.getKey() === e.ENTER && field.up('form').isValid() ) me.doSave();
} }
,onShow: function(win) { ,onShow: function(win) {

6
app/view/main/MainController.js

@ -9,7 +9,7 @@ Ext.define('Rambox.view.main.MainController', {
tabPanel.setTabPosition(config.tabbar_location); tabPanel.setTabPosition(config.tabbar_location);
tabPanel.setTabRotation(0); tabPanel.setTabRotation(0);
let reorderer = tabPanel.plugins.find((plugin) => plugin.ptype == "tabreorderer"); let reorderer = tabPanel.plugins.find((plugin) => plugin.ptype === "tabreorderer");
if ( reorderer !== undefined ) { if ( reorderer !== undefined ) {
const names = reorderer.container.getLayout().names; const names = reorderer.container.getLayout().names;
@ -234,7 +234,7 @@ Ext.define('Rambox.view.main.MainController', {
,onSearchEnter: function( field, e ) { ,onSearchEnter: function( field, e ) {
var me = this; var me = this;
if ( e.getKey() == e.ENTER && Ext.getStore('ServicesList').getCount() === 2 ) { // Two because we always shows Custom Service option if ( e.getKey() === e.ENTER && Ext.getStore('ServicesList').getCount() === 2 ) { // Two because we always shows Custom Service option
me.onNewServiceSelect(field.up().down('dataview'), Ext.getStore('ServicesList').getAt(0)); me.onNewServiceSelect(field.up().down('dataview'), Ext.getStore('ServicesList').getAt(0));
me.onClearClick(field); me.onClearClick(field);
} }
@ -422,7 +422,7 @@ Ext.define('Rambox.view.main.MainController', {
,width: 256 ,width: 256
,listeners: { ,listeners: {
specialkey: function(field, e){ specialkey: function(field, e){
if ( e.getKey() == e.ENTER ) { if ( e.getKey() === e.ENTER ) {
validateFn(); validateFn();
} }
} }

Loading…
Cancel
Save