Browse Source

Sachen

pull/943/head
phischdev 8 years ago
parent
commit
40340a3038
  1. 36
      app/Application.js
  2. 3
      app/store/ServicesList.js
  3. 2
      app/ux/WebView.js
  4. 2
      app/view/add/Add.js
  5. 23
      package.json

36
app/Application.js

@ -144,23 +144,6 @@ Ext.define('Rambox.Application', {
"zoomLevel": 0, "zoomLevel": 0,
"id": 20 "id": 20
}, },
{
"position": 7,
"type": "roundcube",
"logo": "roundcube.png",
"name": "Mail",
"url": "https://webmail.diehumanisten.de",
"align": "right",
"notifications": true,
"muted": false,
"displayTabUnreadCounter": true,
"includeInGlobalUnreadCounter": true,
"trust": false,
"enabled": false,
"js_unread": "",
"zoomLevel": 0,
"id": 3
},
{ {
"position": 8, "position": 8,
"type": "wordpress", "type": "wordpress",
@ -179,7 +162,24 @@ Ext.define('Rambox.Application', {
"removable": true, "removable": true,
"id": 23 "id": 23
}, },
{ {
"position": 7,
"type": "roundcube",
"logo": "roundcube.png",
"name": "Mail",
"url": "https://webmail.df.eu/roundcube",
"align": "right",
"notifications": true,
"muted": false,
"displayTabUnreadCounter": true,
"includeInGlobalUnreadCounter": true,
"trust": false,
"enabled": false,
"js_unread": "Element.prototype.remove=function(){this.parentElement.removeChild(this)},NodeList.prototype.remove=HTMLCollection.prototype.remove=function(){for(var e=this.length-1;e>=0;e--)this[e]&&this[e].parentElement&&this[e].parentElement.removeChild(this[e])},document.getElementsByClassName('owa-banner').remove(),document.getElementsByTagName('footer').remove(),document.getElementsByTagName('aside').remove(),document.getElementsByTagName('h1').remove(),document.getElementsByTagName('table')[1].remove(),document.getElementsByTagName('dd')[0].remove(),document.getElementsByTagName('dl')[0].getElementsByTagName('dt')[0].remove(),document.getElementsByTagName('dl')[0].style.background='none',document.getElementsByTagName('dl')[0].style.padding='inherit',document.getElementsByTagName('article')[0].style.width='initial';",
"zoomLevel": 0,
"id": 3
},
{
"position": 9, "position": 9,
"type": "hangouts", "type": "hangouts",
"logo": "hangouts.png", "logo": "hangouts.png",

3
app/store/ServicesList.js

@ -112,10 +112,11 @@ Ext.define('Rambox.store.ServicesList', {
{ {
id: 'roundcube' id: 'roundcube'
,logo: 'roundcube.png' ,logo: 'roundcube.png'
,name: 'Roundcube' ,name: 'Webmail'
,description: 'Free and open source webmail software for the masses, written in PHP.' ,description: 'Free and open source webmail software for the masses, written in PHP.'
,url: '___' ,url: '___'
,type: 'mitarbeiter' ,type: 'mitarbeiter'
,js_unread: 'Element.prototype.remove=function(){this.parentElement.removeChild(this)},NodeList.prototype.remove=HTMLCollection.prototype.remove=function(){for(var e=this.length-1;e>=0;e--)this[e]&&this[e].parentElement&&this[e].parentElement.removeChild(this[e])},document.getElementsByClassName("owa-banner").remove(),document.getElementsByTagName("footer").remove(),document.getElementsByTagName("aside").remove(),document.getElementsByTagName("h1").remove();'
}, },
{ {
id: 'hootsuite' id: 'hootsuite'

2
app/ux/WebView.js

@ -365,7 +365,7 @@ Ext.define('Rambox.ux.WebView',{
//console.log("EXTERN", e); //console.log("EXTERN", e);
var selectType = undefined; var selectType = undefined;
if (e.url.match('https?:\/\/www.facebook.com\/')) if (e.url.match('https?:\/\/(www)?(m)?.facebook.com\/'))
selectType = "facebook"; selectType = "facebook";
else if (e.url.match('https?:\/\/pgs-diehumanisten.slack.com\/')) else if (e.url.match('https?:\/\/pgs-diehumanisten.slack.com\/'))
selectType = "slack"; selectType = "slack";

2
app/view/add/Add.js

@ -211,7 +211,7 @@ Ext.define('Rambox.view.add.Add',{
,value: me.edit ? me.record.get('js_unread') : '' ,value: me.edit ? me.record.get('js_unread') : ''
,anchor: '100%' ,anchor: '100%'
,height: 120 ,height: 120
,disabled: function(view, rowIndex, colIndex, item, record) {return !record.get('editable'); } ,disabled: removable
} }
] ]

23
package.json

@ -4,12 +4,15 @@
"start": "electron electron/main.js", "start": "electron electron/main.js",
"start:debug": "electron electron/main.js --enable-logging", "start:debug": "electron electron/main.js --enable-logging",
"test": "./node_modules/.bin/mocha test/tests/**/*.spec.js", "test": "./node_modules/.bin/mocha test/tests/**/*.spec.js",
"sencha:clean": "rm -rf ./build/production", "sencha:clean": "rm -rf ./build/production",
"sencha:compile": "sencha app build && cp app/package.json build/production/Rambox/ && npm --prefix ./build/production/Rambox/ install ./build/production/Rambox/", "sencha:compile": "sencha app build && cp app/package.json build/production/Rambox/ && npm --prefix ./build/production/Rambox/ install ./build/production/Rambox/",
"sencha:compile:build": "sencha app build && cp app/package.json build/production/Rambox/ && cp -R build/production/Rambox/* ../rambox-build", "sencha:compile:build": "sencha app build && cp app/package.json build/production/Rambox/ && cp -R build/production/Rambox/* ../rambox-build",
"clean": "rm -rf ./dist", "clean": "rm -rf ./dist",
"clean:osx": "rm -rf ./dist/Rambox-darwin-*", "clean:osx": "rm -rf ./dist/Rambox-darwin-*",
"clean:win": "rm -rf ./dist/Rambox-win32-*", "clean:win": "rm -rf ./dist/Rambox-win32-*",
"pack": "npm run pack:osx && npm run pack:win && npm run pack:linux", "pack": "npm run pack:osx && npm run pack:win && npm run pack:linux",
"pack:osx": "electron-packager \"./build/production/Rambox/\" \"HumanistenBox\" --out=dist --platform=darwin --arch=x64 --version=1.3.4 --icon=resources/installer/Icon.icns --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Die Humanisten\" --version-string.ProductName=\"pdhBox\" --asar --prune --overwrite", "pack:osx": "electron-packager \"./build/production/Rambox/\" \"HumanistenBox\" --out=dist --platform=darwin --arch=x64 --version=1.3.4 --icon=resources/installer/Icon.icns --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Die Humanisten\" --version-string.ProductName=\"pdhBox\" --asar --prune --overwrite",
"pack:win": "npm run pack:win32 && npm run pack:win64", "pack:win": "npm run pack:win32 && npm run pack:win64",
@ -18,6 +21,7 @@
"pack:linux": "npm run pack:linux32 && npm run pack:linux64", "pack:linux": "npm run pack:linux32 && npm run pack:linux64",
"pack:linux32": "electron-packager \"./build/production/Rambox/\" \"HumanistenBox\" --out=dist --platform=linux --arch=ia32 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Die Humanisten\" --version-string.ProductName=\"pdhBox\" --asar --prune --overwrite", "pack:linux32": "electron-packager \"./build/production/Rambox/\" \"HumanistenBox\" --out=dist --platform=linux --arch=ia32 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Die Humanisten\" --version-string.ProductName=\"pdhBox\" --asar --prune --overwrite",
"pack:linux64": "electron-packager \"./build/production/Rambox/\" \"HumanistenBox\" --out=dist --platform=linux --arch=x64 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Die Humanisten\" --version-string.ProductName=\"pdhBox\" --asar --prune --overwrite", "pack:linux64": "electron-packager \"./build/production/Rambox/\" \"HumanistenBox\" --out=dist --platform=linux --arch=x64 --version=1.3.4 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Die Humanisten\" --version-string.ProductName=\"pdhBox\" --asar --prune --overwrite",
"build": "npm run build:linux && npm run build:osx && npm run build:win && npm run build:linux ", "build": "npm run build:linux && npm run build:osx && npm run build:win && npm run build:linux ",
"build:osx": "build --macos", "build:osx": "build --macos",
"build:linux": "npm run build:linux32 && npm run build:linux64", "build:linux": "npm run build:linux32 && npm run build:linux64",
@ -25,10 +29,23 @@
"build:linux64": "build --linux --x64", "build:linux64": "build --linux --x64",
"build:win32": "build --win --ia32", "build:win32": "build --win --ia32",
"build:win64": "build --win --x64", "build:win64": "build --win --x64",
"setup:osx": "npm run sencha:clean && npm run sencha:compile && npm run clean:osx && npm run pack:osx && npm run build:osx",
"setup:osx": "npm run sencha:clean && npm run sencha:compile && npm run clean:osx && npm run pack:osx && npm run build:osx",
"setup:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run build:win", "setup:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run build:win",
"all:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run zip:win32 && npm run zip:win64 && npm run build:win",
"all:linux": "npm run sencha:clean && npm run sencha:compile && npm run build:linux" "all:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run zip:win32 && npm run zip:win64 && npm run build:win",
"all:linux": "npm run sencha:clean && npm run sencha:compile && npm run build:linux",
"zip:osx": "zip -qr HumanistenBox-darwin-x64.zip HumanistenBox-darwin-x64/",
"zip:win32": "zip -qr HumanistenBox-win32-ia32.zip HumanistenBox-win32-ia32/",
"zip:win64": "zip -qr HumanistenBox-win32-x64.zip HumanistenBox-win32-x64/",
"zip:win": "npm run zip:win32 && npm run zip:win64",
"zip:linux32": "zip -qr HumanistenBox-linux-ia32.zip HumanistenBox-linux-ia32/",
"zip:linux64": "zip -qr HumanistenBox-linux-x64.zip HumanistenBox-linux-x64/",
"zip:linux": "npm run zip:linux32 && npm run zip:linux64",
"zip": "cd dist && npm run zip:osx && npm run zip:win && npm run zip:linux",
"fixi": "npm run sencha:clean && npm run sencha:compile && npm run clean && npm run pack && npm run zip"
}, },
"build": { "build": {
"productName": "HumanistenBox", "productName": "HumanistenBox",

Loading…
Cancel
Save