diff --git a/dev/Common/Audio.js b/dev/Common/Audio.js index 5fc7fe704..8a8565baf 100644 --- a/dev/Common/Audio.js +++ b/dev/Common/Audio.js @@ -44,15 +44,19 @@ class Audio { } createNewObject() { - const player = window.Audio ? new window.Audio() : null; - if (player && player.canPlayType && player.pause && player.play) { - player.preload = 'none'; - player.loop = false; - player.autoplay = false; - player.muted = false; - } + try { + const player = window.Audio ? new window.Audio() : null; + if (player && player.canPlayType && player.pause && player.play) { + player.preload = 'none'; + player.loop = false; + player.autoplay = false; + player.muted = false; + } - return player; + return player; + } catch (e) {} // eslint-disable-line no-empty + + return null; } paused() { diff --git a/dev/Settings/Admin/Branding.js b/dev/Settings/Admin/Branding.js index a42ab5f6c..54f8fe82f 100644 --- a/dev/Settings/Admin/Branding.js +++ b/dev/Settings/Admin/Branding.js @@ -37,7 +37,6 @@ class BrandingAdminSettings { ]; }); - this.loginPowered = ko.observable(!!settingsGet('LoginPowered')); this.community = RL_COMMUNITY || AppStore.community(); } diff --git a/dev/Settings/Admin/Prem/Branding.js b/dev/Settings/Admin/Prem/Branding.js index 50b30110b..9abea1478 100644 --- a/dev/Settings/Admin/Prem/Branding.js +++ b/dev/Settings/Admin/Prem/Branding.js @@ -90,11 +90,6 @@ class BrandingPremAdminSettings extends BrandingAdminSettings { }); }); - this.loginPowered.subscribe((value) => { - Remote.saveAdminConfig(null, { - 'LoginPowered': boolToAjax(value) - }); - }); }, Magics.Time50ms); } } diff --git a/dev/View/Admin/Login.js b/dev/View/Admin/Login.js index 98523c993..7e90e761d 100644 --- a/dev/View/Admin/Login.js +++ b/dev/View/Admin/Login.js @@ -25,8 +25,6 @@ class LoginAdminView extends AbstractViewNext { constructor() { super(); - this.loginPowered = !!Settings.settingsGet('LoginPowered'); - this.mobile = !!Settings.appSettingsGet('mobile'); this.mobileDevice = !!Settings.appSettingsGet('mobileDevice'); diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js index 855ae2cc1..2b92da9a5 100644 --- a/dev/View/User/Login.js +++ b/dev/View/User/Login.js @@ -57,7 +57,6 @@ class LoginUserView extends AbstractViewNext { this.additionalCodeSignMe = ko.observable(false); this.logoImg = trim(Settings.settingsGet('LoginLogo')); - this.loginPowered = !!Settings.settingsGet('LoginPowered'); this.loginDescription = trim(Settings.settingsGet('LoginDescription')); this.mobile = !!Settings.appSettingsGet('mobile'); diff --git a/package.json b/package.json index e62ad6c95..00396847b 100644 --- a/package.json +++ b/package.json @@ -47,13 +47,13 @@ ], "readmeFilename": "README.md", "devDependencies": { - "@babel/core": "7.5.0", + "@babel/core": "7.5.4", "@babel/plugin-proposal-class-properties": "7.5.0", "@babel/plugin-proposal-decorators": "7.4.4", "@babel/plugin-transform-runtime": "7.5.0", - "@babel/preset-env": "7.5.0", - "@babel/runtime": "7.5.0", - "@babel/runtime-corejs3": "7.5.0", + "@babel/preset-env": "7.5.4", + "@babel/runtime": "7.5.4", + "@babel/runtime-corejs3": "7.5.4", "autolinker": "3.1.0", "babel-eslint": "10.0.2", "babel-loader": "8.0.6", @@ -118,7 +118,7 @@ "simplestatemanager": "4.1.1", "style-loader": "0.23.1", "underscore": "1.9.1", - "webpack": "4.35.2", + "webpack": "4.35.3", "webpack-cli": "3.3.5" } } diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index 500669d0e..1e1263eca 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -1511,7 +1511,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack 'LoadingDescriptionEsc' => 'RainLoop', 'FaviconUrl' => $oConfig->Get('webmail', 'favicon_url', ''), 'LoginDescription' => '', - 'LoginPowered' => true, 'LoginLogo' => '', 'LoginBackground' => '', 'LoginCss' => '', diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php index da53c3d3e..c4316703b 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -169,7 +169,6 @@ class Application extends \RainLoop\Config\AbstractConfig 'login_background' => array(''), 'login_desc' => array(''), 'login_css' => array(''), - 'login_powered' => array(true), 'user_css' => array(''), 'user_logo' => array(''), diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Prem.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Prem.php index 5472079aa..c3098738d 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Prem.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Prem.php @@ -71,7 +71,6 @@ class Prem $aAppData['LoginBackground'] = $oConfig->Get('branding', 'login_background', ''); $aAppData['LoginCss'] = $oConfig->Get('branding', 'login_css', ''); $aAppData['LoginDescription'] = $oConfig->Get('branding', 'login_desc', ''); - $aAppData['LoginPowered'] = !!$oConfig->Get('branding', 'login_powered', true); $aAppData['UserLogo'] = $oConfig->Get('branding', 'user_logo', ''); $aAppData['UserLogoTitle'] = $oConfig->Get('branding', 'user_logo_title', ''); $aAppData['UserLogoMessage'] = $oConfig->Get('branding', 'user_logo_message', ''); @@ -86,7 +85,7 @@ class Prem public function PremSection(&$oActions, &$oConfig) { if ($oActions && $oActions->HasOneOfActionParams(array( - 'LoginLogo', 'LoginBackground', 'LoginDescription', 'LoginCss', 'LoginPowered', + 'LoginLogo', 'LoginBackground', 'LoginDescription', 'LoginCss', 'UserLogo', 'UserLogoTitle', 'UserLogoMessage', 'UserIframeMessage', 'UserCss', 'WelcomePageUrl', 'WelcomePageDisplay' )) && $this->Type()) @@ -95,7 +94,6 @@ class Prem $oActions->setConfigFromParams($oConfig, 'LoginBackground', 'branding', 'login_background', 'string'); $oActions->setConfigFromParams($oConfig, 'LoginDescription', 'branding', 'login_desc', 'string'); $oActions->setConfigFromParams($oConfig, 'LoginCss', 'branding', 'login_css', 'string'); - $oActions->setConfigFromParams($oConfig, 'LoginPowered', 'branding', 'login_powered', 'bool'); $oActions->setConfigFromParams($oConfig, 'UserLogo', 'branding', 'user_logo', 'string'); $oActions->setConfigFromParams($oConfig, 'UserLogoTitle', 'branding', 'user_logo_title', 'string'); diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminLogin.html index 6c98c1c86..7ca7aca50 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminLogin.html +++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminLogin.html @@ -41,9 +41,6 @@ -
- Powered by RainLoop -
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html index 8f6c90368..645b6c3fd 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html +++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html @@ -122,18 +122,6 @@ }"> -
-
-
-
-
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/Login.html b/rainloop/v/0.0.0/app/templates/Views/User/Login.html index 39f1c122a..7aa4f8693 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/Login.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/Login.html @@ -117,7 +117,6 @@ -
Powered by RainLoop
diff --git a/yarn.lock b/yarn.lock index 5488d93be..d87745bca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8,14 +8,14 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.0.tgz#6ed6a2881ad48a732c5433096d96d1b0ee5eb734" - integrity sha512-6Isr4X98pwXqHvtigw71CKgmhL1etZjPs5A67jL/w0TkLM9eqmFR40YrnJvEc1WnMZFsskjsmid8bHZyxKEAnw== +"@babel/core@7.5.4": + version "7.5.4" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.4.tgz#4c32df7ad5a58e9ea27ad025c11276324e0b4ddd" + integrity sha512-+DaeBEpYq6b2+ZmHx3tHspC+ZRflrvLqwfv8E3hNr5LVQoyBnL8RPKSBCg+rK2W2My9PWlujBiqd0ZPsR9Q6zQ== dependencies: "@babel/code-frame" "^7.0.0" "@babel/generator" "^7.5.0" - "@babel/helpers" "^7.5.0" + "@babel/helpers" "^7.5.4" "@babel/parser" "^7.5.0" "@babel/template" "^7.4.4" "@babel/traverse" "^7.5.0" @@ -259,10 +259,10 @@ "@babel/traverse" "^7.1.0" "@babel/types" "^7.2.0" -"@babel/helpers@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.0.tgz#7f0c17666e7ed8355ed6eff643dde12fb681ddb4" - integrity sha512-EgCUEa8cNwuMrwo87l2d7i2oShi8m2Q58H7h3t4TWtqATZalJYFwfL9DulRe02f3KdqM9xmMCw3v/7Ll+EiaWg== +"@babel/helpers@^7.5.4": + version "7.5.4" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.4.tgz#2f00608aa10d460bde0ccf665d6dcf8477357cf0" + integrity sha512-6LJ6xwUEJP51w0sIgKyfvFMJvIb9mWAfohJp0+m6eHJigkFdcH8duZ1sfhn0ltJRzwUIT/yqqhdSfRpCpL7oow== dependencies: "@babel/template" "^7.4.4" "@babel/traverse" "^7.5.0" @@ -330,10 +330,10 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-json-strings" "^7.2.0" -"@babel/plugin-proposal-object-rest-spread@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.0.tgz#4838ce3cbc9a84dd00bce7a17e9e9c36119f83a0" - integrity sha512-G1qy5EdcO3vYhbxlXjRSR2SXB8GsxYv9hoRKT1Jdn3qy/NUnFqUUnqymKZ00Pbj+3FXNh06B+BUZzecrp3sxNw== +"@babel/plugin-proposal-object-rest-spread@^7.5.4": + version "7.5.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.4.tgz#250de35d867ce8260a31b1fdac6c4fc1baa99331" + integrity sha512-KCx0z3y7y8ipZUMAEEJOyNi11lMb/FOPUjjB113tfowgw0c16EGYos7worCKBcUAh2oG+OBnoUhsnTSoLpV9uA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-object-rest-spread" "^7.2.0" @@ -636,17 +636,17 @@ "@babel/helper-regex" "^7.4.4" regexpu-core "^4.5.4" -"@babel/preset-env@7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.0.tgz#1122a751e864850b4dbce38bd9b4497840ee6f01" - integrity sha512-/5oQ7cYg+6sH9Dt9yx5IiylnLPiUdyMHl5y+K0mKVNiW2wJ7FpU5bg8jKcT8PcCbxdYzfv6OuC63jLEtMuRSmQ== +"@babel/preset-env@7.5.4": + version "7.5.4" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.4.tgz#64bc15041a3cbb0798930319917e70fcca57713d" + integrity sha512-hFnFnouyRNiH1rL8YkX1ANCNAUVC8Djwdqfev8i1415tnAG+7hlA5zhZ0Q/3Q5gkop4HioIPbCEWAalqcbxRoQ== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-proposal-async-generator-functions" "^7.2.0" "@babel/plugin-proposal-dynamic-import" "^7.5.0" "@babel/plugin-proposal-json-strings" "^7.2.0" - "@babel/plugin-proposal-object-rest-spread" "^7.5.0" + "@babel/plugin-proposal-object-rest-spread" "^7.5.4" "@babel/plugin-proposal-optional-catch-binding" "^7.2.0" "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" "@babel/plugin-syntax-async-generators" "^7.2.0" @@ -692,18 +692,18 @@ js-levenshtein "^1.1.3" semver "^5.5.0" -"@babel/runtime-corejs3@7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.5.0.tgz#a1d87e8ad9c8f41fb9346ea23424d5cd2cfbe6f5" - integrity sha512-hS5GOWvqnYGG4GRbSe63nIc+45DmrIEa/lMGZPgCBq9BSCAZNcKxSDQJKtPDl2T+vaA/an+3G5rVmuh6cJLfqw== +"@babel/runtime-corejs3@7.5.4": + version "7.5.4" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.5.4.tgz#88dab70e4915c8e8c7212b01ebd73e57159190cf" + integrity sha512-zTLh6E+I7jk03bW4pBahDLW04XF+ZWhzBS+7CKtz/C5OG2/PKHJDxSmI8oDEznVDhmKskh6RblHluTjMWY/P7Q== dependencies: core-js-pure "^3.0.0" regenerator-runtime "^0.13.2" -"@babel/runtime@7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.0.tgz#49dcbcd637099a55d3a61e590a00d6861393b1b5" - integrity sha512-2xsuyZ0R0RBFwjgae5NpXk8FcfH4qovj5cEM5VEeB7KXnKqzaisIu2HSV/mCEISolJJuR4wkViUGYujA8MH9tw== +"@babel/runtime@7.5.4": + version "7.5.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.4.tgz#cb7d1ad7c6d65676e66b47186577930465b5271b" + integrity sha512-Na84uwyImZZc3FKf4aUF1tysApzwf3p2yuFBIyBfbzT5glzKTdvYI4KVW4kcgjrzoGUjC7w3YyCHcJKaRxsr2Q== dependencies: regenerator-runtime "^0.13.2" @@ -977,10 +977,6 @@ accord@^0.29.0: uglify-js "^2.8.22" when "^3.7.8" -acorn-dynamic-import@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" - acorn-jsx@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e" @@ -990,14 +986,15 @@ acorn@5.X, acorn@^5.0.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== -acorn@^6.0.5: - version "6.0.6" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.6.tgz#cd75181670d5b99bdb1b1c993941d3a239ab1f56" - acorn@^6.0.7: version "6.1.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f" +acorn@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.0.tgz#67f0da2fc339d6cfb5d6fb244fd449f33cd8bbe3" + integrity sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw== + ajv-errors@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" @@ -6682,17 +6679,16 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@4.35.2: - version "4.35.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.2.tgz#5c8b8a66602cbbd6ec65c6e6747914a61c1449b1" - integrity sha512-TZAmorNymV4q66gAM/h90cEjG+N3627Q2MnkSgKlX/z3DlNVKUtqy57lz1WmZU2+FUZwzM+qm7cGaO95PyrX5A== +webpack@4.35.3: + version "4.35.3" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.3.tgz#66bc35ef215a7b75e8790f84d560013ffecf0ca3" + integrity sha512-xggQPwr9ILlXzz61lHzjvgoqGU08v5+Wnut19Uv3GaTtzN4xBTcwnobodrXE142EL1tOiS5WVEButooGzcQzTA== dependencies: "@webassemblyjs/ast" "1.8.5" "@webassemblyjs/helper-module-context" "1.8.5" "@webassemblyjs/wasm-edit" "1.8.5" "@webassemblyjs/wasm-parser" "1.8.5" - acorn "^6.0.5" - acorn-dynamic-import "^4.0.0" + acorn "^6.2.0" ajv "^6.1.0" ajv-keywords "^3.1.0" chrome-trace-event "^1.0.0"