From 5ad70da619149b438c92e626295661778be19076 Mon Sep 17 00:00:00 2001 From: phischdev Date: Tue, 30 May 2017 18:33:10 +0200 Subject: [PATCH] v1.1 --- app/ux/WebView.js | 103 ++++++++++++++++++++-------------- resources/icons/wordpress.png | Bin 0 -> 7300 bytes 2 files changed, 62 insertions(+), 41 deletions(-) create mode 100644 resources/icons/wordpress.png diff --git a/app/ux/WebView.js b/app/ux/WebView.js index e60129f7..53225054 100644 --- a/app/ux/WebView.js +++ b/app/ux/WebView.js @@ -89,33 +89,33 @@ Ext.define('Rambox.ux.WebView',{ } ,'-' ,{ - text: 'Zoom In' + text: 'Reinzoomen' ,glyph: 'xf00e@FontAwesome' ,scope: me ,handler: me.zoomIn } ,{ - text: 'Zoom Out' + text: 'Rauszoomen' ,glyph: 'xf010@FontAwesome' ,scope: me ,handler: me.zoomOut } ,{ - text: 'Reset Zoom' + text: 'Zoom zurücksetzen' ,glyph: 'xf002@FontAwesome' ,scope: me ,handler: me.resetZoom } ,'-' ,{ - text: 'Reload' + text: 'Auf Startseite zurückkehren' ,glyph: 'xf021@FontAwesome' ,scope: me ,handler: me.reloadService } ,'-' ,{ - text: 'Toggle Developer Tools' + text: 'Entwicklerwerkzeuge an-/ausschalten' ,glyph: 'xf121@FontAwesome' ,scope: me ,handler: me.toggleDevTools @@ -216,32 +216,32 @@ Ext.define('Rambox.ux.WebView',{ case 'discourse': console.log("from DISK"); if (e.url.indexOf('auth/facebook?display=popup') > 0) { - console.log("facebookauth"); - me.add({ - xtype: 'window' - , title: 'Anmelden mit Facebook' - , width: '80%' - , height: '80%' - , maximizable: true - , modal: true - , items: { - xtype: 'component' - , hideMode: 'offsets' - , autoRender: true - , autoShow: true - , autoEl: { - tag: 'webview' - , - src: e.url - , - style: 'width:100%;height:100%;' - //,partition: 'persist:' + me.record.get('type') + '_' + me.id.replace('tab_', '') + (localStorage.getItem('id_token') ? '_' + Ext.decode(localStorage.getItem('profile')).user_id : '') - , - useragent: Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent') - } - } - }).show(); - e.preventDefault(); + // console.log("facebookauth"); + // me.add({ + // xtype: 'window' + // , title: 'Anmelden mit Facebook' + // , width: '80%' + // , height: '80%' + // , maximizable: true + // , modal: true + // , items: { + // xtype: 'component' + // , hideMode: 'offsets' + // , autoRender: true + // , autoShow: true + // , autoEl: { + // tag: 'webview' + // , + // src: e.url + // , + // style: 'width:100%;height:100%;' + // //,partition: 'persist:' + me.record.get('type') + '_' + me.id.replace('tab_', '') + (localStorage.getItem('id_token') ? '_' + Ext.decode(localStorage.getItem('profile')).user_id : '') + // , + // useragent: Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent') + // } + // } + // }).show(); + // e.preventDefault(); return; } case 'skype': @@ -324,8 +324,10 @@ Ext.define('Rambox.ux.WebView',{ } break; case 'wordpress': - console.log("WP"); - return; + // Link to our site + if (e.url.indexOf('://parteiderhumanisten.de/') || e.url.indexOf('://diehumanisten.de/') > 0) + if (e.url.indexOf('?preview=true' > 0)) + console.log("WP Preview"); default: break; } @@ -373,10 +375,25 @@ Ext.define('Rambox.ux.WebView',{ selectType = "wiki"; else if (e.url.match('https?:\/\/trello.com\/')) selectType = "trello"; + else if (e.url.match('https?:\/\/hangouts.google.com\/call\/')) + selectType = "hangouts_call"; + else if (e.url.match('https?:\/\/hangouts.google.com\/')) + selectType = "hangouts"; + + // Special case Hangouts + if (selectType == "hangouts_call") + { + // open new window + console.log("opening new google hangouts window in default browser"); + // console.log(e); + e.preventDefault(); + require('electron').shell.openExternal(e.url); + return; + } //console.log(me.record.get('type'), selectType); - if (me.record.get('type') !== selectType) { + if (selectType !== undefined && me.record.get('type') !== selectType) { const tabPanel = Ext.cq1('app-main'); var tabs = tabPanel.items.items; @@ -386,8 +403,8 @@ Ext.define('Rambox.ux.WebView',{ if (tab.id === "ramboxTab") return false; if (tab.record && tab.record.data) { const type = tab.record.data['type']; - //console.log("record:", type); - return (type === selectType); + + return (type === selectType && true); } return false; }); @@ -395,13 +412,17 @@ Ext.define('Rambox.ux.WebView',{ // Tab exists if (tab.length > 0) { tab = tab[0]; - - const web = tab.down("component").el.dom; - web.loadURL(e.url); + const enabled = tab.record.data["enabled"]; + //console.log(tab); + //console.log("enabled", enabled); + if (enabled) { + const web = tab.down("component").el.dom; + web.loadURL(e.url); + } // Select Tab - var index = tabPanel.items.indexOf(tab); - console.log("index", index); + // var index = tabPanel.items.indexOf(tab); + // console.log("index", index); tabPanel.setActiveTab(tab); // Stop from opening diff --git a/resources/icons/wordpress.png b/resources/icons/wordpress.png new file mode 100644 index 0000000000000000000000000000000000000000..222665cfb789cb84c042befc8aa99f75a05aadad GIT binary patch literal 7300 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 eGF*aF*6=S$h>(I9owGy$0000