diff --git a/dev/Component/EmailAddresses.js b/dev/Component/EmailAddresses.js index ac7813361..e9d6ee80a 100644 --- a/dev/Component/EmailAddresses.js +++ b/dev/Component/EmailAddresses.js @@ -116,7 +116,7 @@ export class EmailAddressesComponent { ) } }).throttle(500) - : () => {}; + : () => 0; } _focusTrigger(bValue) { diff --git a/dev/boot.js b/dev/boot.js index 8ef7dd1a6..35e68b0e9 100644 --- a/dev/boot.js +++ b/dev/boot.js @@ -60,27 +60,21 @@ win.rl = { }, setWindowTitle: title => { title = null == title ? '' : '' + title; - if (RL_APP_DATA.Title) { - title += (title ? ' - ' : '') + RL_APP_DATA.Title; - } - doc.title = title; + doc.title = RL_APP_DATA.Title ? title + (title ? ' - ' : '') + RL_APP_DATA.Title : title; }, initData: appData => { RL_APP_DATA = appData; - - if (appData) { - loadScript(appData.StaticLibJsLink) + appData + ? loadScript(appData.StaticLibJsLink) .then(() => loadScript(appData.StaticAppJsLink)) .then(() => appData.PluginsLink ? loadScript(appData.PluginsLink) : Promise.resolve()) .then(() => win.__APP_BOOT()) .catch(e => { showError(e.message); throw e; - }); - } else { - showError(); - } + }) + : showError(); } }; @@ -108,6 +102,6 @@ try { css.href = css.dataset.href; loadScript(`./?/${admin ? 'Admin' : ''}AppData/0/${Math.random().toString().substr(2)}/`) - .then(() => {}); + .then(() => 0); })(this); diff --git a/vendors/normalize.css/normalize.css b/vendors/normalize.css/normalize.css index 7d73fe13c..92aaf10c1 100644 --- a/vendors/normalize.css/normalize.css +++ b/vendors/normalize.css/normalize.css @@ -31,10 +31,7 @@ sup { * Correct the inability to style clickable types in iOS and Safari. */ -button, -[type="button"], -[type="reset"], -[type="submit"] { +button { -webkit-appearance: button; } @@ -42,10 +39,7 @@ button, * Remove the inner border and padding in Firefox. */ -button::-moz-focus-inner, -[type="button"]::-moz-focus-inner, -[type="reset"]::-moz-focus-inner, -[type="submit"]::-moz-focus-inner { +button::-moz-focus-inner { border-style: none; padding: 0; } @@ -54,10 +48,7 @@ button::-moz-focus-inner, * Restore the focus styles unset by the previous rule. */ -button:-moz-focusring, -[type="button"]:-moz-focusring, -[type="reset"]:-moz-focusring, -[type="submit"]:-moz-focusring { +button:-moz-focusring { outline: 1px dotted ButtonText; } @@ -65,8 +56,8 @@ button:-moz-focusring, * Correct the cursor style of increment and decrement buttons in Chrome. */ -[type="number"]::-webkit-inner-spin-button, -[type="number"]::-webkit-outer-spin-button { +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { height: auto; } @@ -75,7 +66,7 @@ button:-moz-focusring, * 2. Correct the outline style in Safari. */ -[type="search"] { +input[type="search"] { -webkit-appearance: textfield; /* 1 */ outline-offset: -2px; /* 2 */ } @@ -84,7 +75,7 @@ button:-moz-focusring, * Remove the inner padding in Chrome and Safari on macOS. */ -[type="search"]::-webkit-search-decoration { +input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }