From 4ddd50b0a5ea9766c454d0181f86b3c3ee952f4b Mon Sep 17 00:00:00 2001 From: Emiliano Heyns Date: Sat, 24 Aug 2019 09:47:48 +0200 Subject: [PATCH] eslint cleanup --- .eslintrc.json | 277 +++++ .gitignore | 1 + addon/LICENSE.md | 4 +- addon/bootstrap.js | 68 +- addon/chrome.manifest | 14 +- addon/chrome/content/zutilo/firefoxOverlay.js | 6 +- .../content/zutilo/keyconfig_adapted.js | 18 +- addon/chrome/content/zutilo/keys.js | 54 +- addon/chrome/content/zutilo/preferences.js | 7 +- addon/chrome/content/zutilo/preferences.xul | 358 +++---- addon/chrome/content/zutilo/readme.xul | 30 +- .../chrome/content/zutilo/zoteroNotActive.js | 5 +- .../chrome/content/zutilo/zoteroNotActive.xul | 42 +- addon/chrome/content/zutilo/zoteroOverlay.js | 47 +- addon/chrome/content/zutilo/zutiloChrome.js | 2 +- addon/chrome/content/zutilo/zutiloUpgraded.js | 4 +- .../chrome/content/zutilo/zutiloUpgraded.xul | 26 +- addon/chrome/locale/de/zutilo/zutilo.dtd | 6 +- .../chrome/locale/de/zutilo/zutilo.properties | 216 ++-- addon/chrome/locale/en-US/zutilo/zutilo.dtd | 6 +- .../locale/en-US/zutilo/zutilo.properties | 216 ++-- addon/chrome/locale/es/zutilo/zutilo.dtd | 6 +- .../chrome/locale/es/zutilo/zutilo.properties | 216 ++-- addon/chrome/locale/fr/zutilo/zutilo.dtd | 6 +- .../chrome/locale/fr/zutilo/zutilo.properties | 216 ++-- addon/chrome/locale/zh-CN/zutilo/zutilo.dtd | 6 +- .../locale/zh-CN/zutilo/zutilo.properties | 216 ++-- addon/chrome/skin/default/zutilo/dialog.css | 4 +- addon/install.rdf | 152 +-- package-lock.json | 982 ++++++++++++++++++ package.json | 28 + 31 files changed, 2269 insertions(+), 970 deletions(-) create mode 100644 .eslintrc.json create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..f5b189b --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,277 @@ +{ + "env": { + "es6": true, + "node": true + }, + "extends": "eslint:recommended", + "globals": { + "Atomics": "readonly", + "SharedArrayBuffer": "readonly" + }, + "parserOptions": { + "ecmaVersion": 2018 + }, + "rules": { + "accessor-pairs": "error", + "array-bracket-newline": "off", + "array-bracket-spacing": [ + "error", + "never" + ], + "array-callback-return": "error", + "array-element-newline": "off", + "arrow-body-style": "error", + "arrow-parens": "error", + "arrow-spacing": "error", + "block-scoped-var": "off", + "block-spacing": [ + "error", + "never" + ], + "brace-style": "off", + "callback-return": "error", + "camelcase": "off", + "capitalized-comments": "off", + "class-methods-use-this": "off", + "comma-dangle": "error", + "comma-spacing": [ + "error", + { + "after": true, + "before": false + } + ], + "comma-style": [ + "error", + "last" + ], + "complexity": "off", + "computed-property-spacing": [ + "error", + "never" + ], + "consistent-return": "off", + "consistent-this": "error", + "curly": "off", + "default-case": "off", + "dot-location": "off", + "dot-notation": [ + "error", + { + "allowKeywords": true + } + ], + "eol-last": "error", + "eqeqeq": "off", + "func-call-spacing": "error", + "func-name-matching": "error", + "func-names": "off", + "func-style": "off", + "function-paren-newline": "off", + "generator-star-spacing": "off", + "global-require": "error", + "guard-for-in": "off", + "handle-callback-err": "error", + "id-blacklist": "error", + "id-length": "off", + "id-match": "error", + "implicit-arrow-linebreak": "error", + "indent": "off", + "indent-legacy": "off", + "init-declarations": "off", + "jsx-quotes": "error", + "key-spacing": "error", + "keyword-spacing": "off", + "line-comment-position": "off", + "linebreak-style": [ + "error", + "unix" + ], + "lines-around-comment": "off", + "lines-around-directive": "off", + "lines-between-class-members": "error", + "max-classes-per-file": "off", + "max-depth": "off", + "max-len": ["error", { "code": 520, "ignoreComments": true }], + "max-lines": "off", + "max-lines-per-function": "off", + "max-nested-callbacks": "error", + "max-params": "off", + "max-statements": "off", + "max-statements-per-line": "off", + "multiline-comment-style": "off", + "multiline-ternary": "off", + "new-parens": "off", + "newline-after-var": "off", + "newline-before-return": "off", + "newline-per-chained-call": "error", + "no-alert": "error", + "no-array-constructor": "error", + "no-await-in-loop": "off", + "no-bitwise": "error", + "no-buffer-constructor": "error", + "no-caller": "error", + "no-catch-shadow": "error", + "no-confusing-arrow": "error", + "no-console": "error", + "no-continue": "off", + "no-div-regex": "error", + "no-duplicate-imports": "error", + "no-else-return": "off", + "no-empty-function": "off", + "no-eq-null": "error", + "no-eval": "error", + "no-extend-native": "error", + "no-extra-bind": "error", + "no-extra-label": "error", + "no-extra-parens": "off", + "no-floating-decimal": "error", + "no-implicit-coercion": "error", + "no-implicit-globals": "error", + "no-implied-eval": "error", + "no-inline-comments": "off", + "no-inner-declarations": [ + "error", + "functions" + ], + "no-invalid-this": "off", + "no-iterator": "error", + "no-label-var": "error", + "no-labels": "error", + "no-lone-blocks": "error", + "no-lonely-if": "off", + "no-loop-func": "error", + "no-magic-numbers": "off", + "no-mixed-operators": "error", + "no-mixed-requires": "error", + "no-multi-assign": "off", + "no-multi-spaces": "off", + "no-multi-str": "error", + "no-multiple-empty-lines": "error", + "no-native-reassign": "error", + "no-negated-condition": "error", + "no-negated-in-lhs": "error", + "no-nested-ternary": "error", + "no-new": "error", + "no-new-func": "error", + "no-new-object": "error", + "no-new-require": "error", + "no-new-wrappers": "error", + "no-octal-escape": "error", + "no-param-reassign": "off", + "no-path-concat": "error", + "no-plusplus": "off", + "no-process-env": "error", + "no-process-exit": "error", + "no-proto": "error", + "no-prototype-builtins": "off", + "no-restricted-globals": "error", + "no-restricted-imports": "error", + "no-restricted-modules": "error", + "no-restricted-properties": "error", + "no-restricted-syntax": "error", + "no-return-assign": "error", + "no-return-await": "error", + "no-script-url": "error", + "no-self-compare": "error", + "no-sequences": "error", + "no-shadow": "off", + "no-spaced-func": "error", + "no-sync": "error", + "no-tabs": [ + "error", + { + "allowIndentationTabs": true + } + ], + "no-template-curly-in-string": "error", + "no-ternary": "off", + "no-throw-literal": "error", + "no-trailing-spaces": "error", + "no-undef-init": "error", + "no-undefined": "off", + "no-underscore-dangle": "off", + "no-unmodified-loop-condition": "error", + "no-unneeded-ternary": "error", + "no-unused-expressions": "error", + "no-unused-vars": [ "error", { "argsIgnorePattern": "^_" } ], + "no-use-before-define": "off", + "no-useless-call": "error", + "no-useless-computed-key": "error", + "no-useless-concat": "error", + "no-useless-constructor": "error", + "no-useless-rename": "error", + "no-useless-return": "error", + "no-var": "off", + "no-void": "error", + "no-warning-comments": "off", + "no-whitespace-before-property": "error", + "nonblock-statement-body-position": "error", + "object-curly-newline": "error", + "object-curly-spacing": "off", + "object-shorthand": "off", + "one-var": "off", + "one-var-declaration-per-line": [ + "error", + "initializations" + ], + "operator-assignment": "off", + "operator-linebreak": [ + "error", + "after" + ], + "padded-blocks": "off", + "padding-line-between-statements": "error", + "prefer-arrow-callback": "off", + "prefer-const": "off", + "prefer-destructuring": "off", + "prefer-named-capture-group": "error", + "prefer-numeric-literals": "error", + "prefer-object-spread": "error", + "prefer-promise-reject-errors": "error", + "prefer-reflect": "off", + "prefer-rest-params": "error", + "prefer-spread": "error", + "prefer-template": "off", + "quote-props": "off", + "quotes": "off", + "radix": "error", + "require-await": "error", + "require-jsdoc": "off", + "require-unicode-regexp": "off", + "rest-spread-spacing": "error", + "semi": "off", + "semi-spacing": "off", + "semi-style": [ + "error", + "last" + ], + "sort-imports": "error", + "sort-keys": "off", + "sort-vars": "off", + "space-before-blocks": "off", + "space-before-function-paren": "off", + "space-in-parens": [ + "error", + "never" + ], + "space-infix-ops": "off", + "space-unary-ops": "error", + "spaced-comment": "off", + "strict": "error", + "switch-colon-spacing": "error", + "symbol-description": "error", + "template-curly-spacing": "error", + "template-tag-spacing": "error", + "unicode-bom": [ + "error", + "never" + ], + "valid-jsdoc": "off", + "vars-on-top": "off", + "wrap-iife": "error", + "wrap-regex": "error", + "yield-star-spacing": "error", + "yoda": "off" + } +} diff --git a/.gitignore b/.gitignore index 11c21ea..c33b93c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +node_modules .DS_Store build/ addon/chrome/locale/*/zutilo/README.html diff --git a/addon/LICENSE.md b/addon/LICENSE.md index a6ff6eb..03ca6ff 100644 --- a/addon/LICENSE.md +++ b/addon/LICENSE.md @@ -1,5 +1,5 @@ Copyright 2012 Will Shanks. -Zutilo is licensed under a [Mozilla Public License, v. 2.0](http://mozilla.org/MPL/2.0/) (full text below). +Zutilo is licensed under a [Mozilla Public License, v. 2.0](http://mozilla.org/MPL/2.0/) (full text below). Zotero is licensed under the Affero GPL 3.0. @@ -42,7 +42,7 @@ Mozilla Public License Version 2.0 means any form of the work other than Source Code Form. 1.7. "Larger Work" - means a work that combines Covered Software with other material, in + means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software. 1.8. "License" diff --git a/addon/bootstrap.js b/addon/bootstrap.js index 1276a73..f8c9362 100644 --- a/addon/bootstrap.js +++ b/addon/bootstrap.js @@ -4,7 +4,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; -const {classes: Cc, interfaces: Ci, utils: Cu} = Components; +/* global Components, Services */ +/* global Zutilo */ +const {classes: Cc, utils: Cu} = Components; Cu.import("resource://gre/modules/Services.jsm"); @@ -20,43 +22,47 @@ const BOOTSTRAP_REASONS = [ "ADDON_DOWNGRADE" ]; +// eslint-disable-next-line no-unused-vars function install(data, reason) { - + } +// eslint-disable-next-line no-unused-vars function startup(data, reason) { - Cu.import("chrome://zutilo/content/zutilo.jsm"); - Zutilo.init(); + Cu.import("chrome://zutilo/content/zutilo.jsm"); + Zutilo.init(); } +// eslint-disable-next-line no-unused-vars function shutdown(data, reason) { - if (reason == APP_SHUTDOWN) { - return; - } - - var windows = Services.wm.getEnumerator('navigator:browser'); - while (windows.hasMoreElements()) { - var tmpWin=windows.getNext(); - - tmpWin.ZutiloChrome.removeXUL(); - if (typeof tmpWin.ZutiloChrome.firefoxOverlay != 'undefined') { - tmpWin.ZutiloChrome.firefoxOverlay.unload(); - } - if (typeof tmpWin.ZutiloChrome.zoteroOverlay != 'undefined') { - tmpWin.ZutiloChrome.zoteroOverlay.unload(); - } - delete tmpWin.ZutiloChrome; - delete tmpWin.Zutilo; - } - - Zutilo.cleanup(); - - Cc["@mozilla.org/intl/stringbundle;1"]. - getService(Components.interfaces.nsIStringBundleService).flushBundles(); - - Cu.unload("chrome://zutilo/content/zutilo.jsm"); + if (reason == APP_SHUTDOWN) { + return; + } + + var windows = Services.wm.getEnumerator('navigator:browser'); + while (windows.hasMoreElements()) { + var tmpWin=windows.getNext(); + + tmpWin.ZutiloChrome.removeXUL(); + if (typeof tmpWin.ZutiloChrome.firefoxOverlay != 'undefined') { + tmpWin.ZutiloChrome.firefoxOverlay.unload(); + } + if (typeof tmpWin.ZutiloChrome.zoteroOverlay != 'undefined') { + tmpWin.ZutiloChrome.zoteroOverlay.unload(); + } + delete tmpWin.ZutiloChrome; + delete tmpWin.Zutilo; + } + + Zutilo.cleanup(); + + Cc["@mozilla.org/intl/stringbundle;1"]. + getService(Components.interfaces.nsIStringBundleService).flushBundles(); + + Cu.unload("chrome://zutilo/content/zutilo.jsm"); } +// eslint-disable-next-line no-unused-vars function uninstall(data, reason) { - -} \ No newline at end of file + +} diff --git a/addon/chrome.manifest b/addon/chrome.manifest index a3389b2..aec5f35 100644 --- a/addon/chrome.manifest +++ b/addon/chrome.manifest @@ -1,7 +1,7 @@ -content zutilo chrome/content/zutilo/ -skin zutilo default chrome/skin/default/zutilo/ -locale zutilo en-US chrome/locale/en-US/zutilo/ -locale zutilo de chrome/locale/de/zutilo/ -locale zutilo es chrome/locale/es/zutilo/ -locale zutilo fr chrome/locale/fr/zutilo/ -locale zutilo zh-CN chrome/locale/zh-CN/zutilo/ \ No newline at end of file +content zutilo chrome/content/zutilo/ +skin zutilo default chrome/skin/default/zutilo/ +locale zutilo en-US chrome/locale/en-US/zutilo/ +locale zutilo de chrome/locale/de/zutilo/ +locale zutilo es chrome/locale/es/zutilo/ +locale zutilo fr chrome/locale/fr/zutilo/ +locale zutilo zh-CN chrome/locale/zh-CN/zutilo/ diff --git a/addon/chrome/content/zutilo/firefoxOverlay.js b/addon/chrome/content/zutilo/firefoxOverlay.js index 5ee5e5f..d94159e 100644 --- a/addon/chrome/content/zutilo/firefoxOverlay.js +++ b/addon/chrome/content/zutilo/firefoxOverlay.js @@ -5,7 +5,7 @@ 'use strict'; /* global gBrowser, window, document, Components, Services */ -/* global Zotero, Zotero_Browser, ZoteroPane */ +/* global Zotero, Zotero_Browser */ /* global Zutilo, ZutiloChrome */ Components.utils.import('resource://gre/modules/Services.jsm'); /******************************************/ @@ -119,7 +119,7 @@ ZutiloChrome.firefoxOverlay = { } } - function mimeCallback(mimeType, hasNativeHandler) { + function mimeCallback(mimeType, _hasNativeHandler) { function zoteroImport(attachmentCallback) { if (Zotero.version.split('.')[0] < 5) { // XXX: Legacy 4.0 @@ -470,7 +470,7 @@ function scrapeThisPage(filesBehavior, entry) { Zutilo._bundle. GetStringFromName(strRoot + 'body')) return - } + } // Default to default translator if (typeof entry === 'undefined') { diff --git a/addon/chrome/content/zutilo/keyconfig_adapted.js b/addon/chrome/content/zutilo/keyconfig_adapted.js index c0ca31c..3f2ed93 100644 --- a/addon/chrome/content/zutilo/keyconfig_adapted.js +++ b/addon/chrome/content/zutilo/keyconfig_adapted.js @@ -5,11 +5,10 @@ // Note: this code has been adapted from dorando's Keyconfig extension. 'use strict'; -/* global gBrowser, window, document, Components, KeyEvent, Services */ -/* global Zutilo, ZutiloChrome */ +/* global window, document, Components, KeyEvent, Services */ +/* global Zutilo */ var Cc = Components.classes var Ci = Components.interfaces -var Cu = Components.utils Components.utils.import('resource://gre/modules/Services.jsm'); var gPrefService = Components.classes['@mozilla.org/preferences-service;1']. @@ -42,6 +41,7 @@ if (gPrefService.getPrefType('browser.backspace_action')) { } } +// eslint-disable-next-line no-unused-vars function keyconfigOnLoad() { keyTree = document.getElementById('key-tree'); gEditbox = document.getElementById('editbox'); @@ -141,6 +141,7 @@ function getFormattedKey(keyLabel) { return formatKey(Zutilo.keys.getKey(keyLabel)) } +// eslint-disable-next-line no-unused-vars function Recognize(event) { event.preventDefault(); event.stopPropagation(); @@ -194,6 +195,7 @@ function applyShortcut() { } } +// eslint-disable-next-line no-unused-vars function Disable() { gEdit.value = Zutilo._bundle.GetStringFromName('zutilo.shortcuts.disabled'); gEdit.key = {modifiers: '', key: '', keycode: ''}; @@ -408,9 +410,9 @@ var keyView = { return Zutilo.keys.keyName(gKeys[row]) case 'shortcut-value': return getFormattedKey(gKeys[row]) - case 'shortcut-category': - return Zutilo.keys.categoryName( - Zutilo.keys.categories[gKeys[row]]) + case 'shortcut-category': + return Zutilo.keys.categoryName( + Zutilo.keys.categories[gKeys[row]]) } }, setTree: function(treebox) { @@ -431,7 +433,7 @@ var keyView = { getImageSrc: function() { return null; }, - getRowProperties: function(row, prop) {}, + getRowProperties: function(_row, _prop) {}, canDropBeforeAfter: function() { return false; }, @@ -442,7 +444,7 @@ var keyView = { return -1; }, - getCellProperties: function(row, col, props) {}, + getCellProperties: function(_row, _col, _props) {}, getColumnProperties: function() {}, selectionChanged: function() { var keyLabel = gKeys[this.selection.currentIndex]; diff --git a/addon/chrome/content/zutilo/keys.js b/addon/chrome/content/zutilo/keys.js index 2ec0b7b..59aad7e 100644 --- a/addon/chrome/content/zutilo/keys.js +++ b/addon/chrome/content/zutilo/keys.js @@ -4,9 +4,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 'use strict'; -/* global gBrowser, window, document, Components, AddonManager, Services */ -/* global Zotero, ZoteroPane, Zotero_Browser */ -/* global Zutilo, ZutiloChrome, gKeys */ +/* global Components, AddonManager, Services */ +/* global Zotero */ +/* global Zutilo, gKeys */ /********************************************/ // Include core modules and built-in modules @@ -45,19 +45,17 @@ var keys = { }, getLabels: function() { - var labels = []; - for (var shortcut in Zutilo.keys.shortcuts) { gKeys.push(shortcut) } }, - categoryName: function(categoryLabel) { - return Zutilo._bundle.GetStringFromName('zutilo.shortcuts.category.' + - categoryLabel) - }, + categoryName: function(categoryLabel) { + return Zutilo._bundle.GetStringFromName('zutilo.shortcuts.category.' + + categoryLabel) + }, - categories: {}, + categories: {}, shortcuts: {} }; @@ -214,16 +212,16 @@ keys.shortcuts.renameSelectedAttachmentsFromParents = function(win) { keys.categories.attachURI = 'attachments' keys.shortcuts.attachURI = function(win) { // jscs: disable requireCamelCaseOrUpperCaseIdentifiers - var itemID = win.ZoteroPane_Local.getSelectedItems()[0].id - win.ZoteroPane_Local.addAttachmentFromURI(true, itemID) + var itemID = win.ZoteroPane_Local.getSelectedItems()[0].id + win.ZoteroPane_Local.addAttachmentFromURI(true, itemID) // jscs: enable requireCamelCaseOrUpperCaseIdentifiers } keys.categories.attachStoredFile = 'attachments' keys.shortcuts.attachStoredFile = function(win) { // jscs: disable requireCamelCaseOrUpperCaseIdentifiers - var itemID = win.ZoteroPane_Local.getSelectedItems()[0].id - win.ZoteroPane_Local.addAttachmentFromDialog(false, itemID) + var itemID = win.ZoteroPane_Local.getSelectedItems()[0].id + win.ZoteroPane_Local.addAttachmentFromDialog(false, itemID) // jscs: enable requireCamelCaseOrUpperCaseIdentifiers } @@ -260,28 +258,28 @@ keys.shortcuts.duplicateItem = function(win) { }; keys.categories.openStyleEditor = 'uinavigation' -keys.shortcuts.openStyleEditor = function(win) { - var prefs_context = {} - Services.scriptloader. - loadSubScript('chrome://zotero/content/include.js', prefs_context) - Services.scriptloader. - loadSubScript('chrome://zotero/content/preferences/preferences.js', - prefs_context) - prefs_context.Zotero_Preferences. - openInViewer('chrome://zotero/content/tools/csledit.xul', true) +keys.shortcuts.openStyleEditor = function(_win) { + var prefs_context = {} + Services.scriptloader. + loadSubScript('chrome://zotero/content/include.js', prefs_context) + Services.scriptloader. + loadSubScript('chrome://zotero/content/preferences/preferences.js', + prefs_context) + prefs_context.Zotero_Preferences. + openInViewer('chrome://zotero/content/tools/csledit.xul', true) } keys.categories.generateReport = 'other' keys.shortcuts.generateReport = function(win) { - let context = win.ZoteroPane.document.defaultView + let context = win.ZoteroPane.document.defaultView if (context.document.activeElement.id == "zotero-collections-tree") { context.Zotero_Report_Interface.loadCollectionReport() } else { // "zotero-items-tree" whether it is the active element or not - let zitems = win.ZoteroPane.getSelectedItems() - if (zitems.length > 0) { - context.Zotero_Report_Interface.loadItemReport() - } + let zitems = win.ZoteroPane.getSelectedItems() + if (zitems.length > 0) { + context.Zotero_Report_Interface.loadItemReport() + } } }; diff --git a/addon/chrome/content/zutilo/preferences.js b/addon/chrome/content/zutilo/preferences.js index b0bf243..df56750 100644 --- a/addon/chrome/content/zutilo/preferences.js +++ b/addon/chrome/content/zutilo/preferences.js @@ -4,10 +4,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 'use strict'; -/* global gBrowser, window, document, Components */ -/* global keyconfigOnLoad, Zutilo, ZutiloChrome */ +/* global window, document, Components */ +/* global keyconfigOnLoad, Zutilo */ Components.utils.import('chrome://zutilo/content/zutilo.jsm'); +// eslint-disable-next-line no-unused-vars function initializePrefWindow() { if (Zutilo.appName == 'Firefox') { // Hide Zotero Standalone specific preference window elements @@ -24,6 +25,7 @@ function initializePrefWindow() { keyconfigOnLoad(); } +// eslint-disable-next-line no-unused-vars function buildMenuPrefs() { for (const menuName of ['item', 'collection']) { for (const functionName of Zutilo._menuFunctions[menuName]) { @@ -75,6 +77,7 @@ function addMenuRadiogroup(menuName, menuFunction) { menuRows.appendChild(newRow); } +// eslint-disable-next-line no-unused-vars function showReadme() { window.openDialog('chrome://zutilo/content/readme.xul', 'zutilo-readme-window', 'chrome'); diff --git a/addon/chrome/content/zutilo/preferences.xul b/addon/chrome/content/zutilo/preferences.xul index 4c0ae0e..db55b5c 100644 --- a/addon/chrome/content/zutilo/preferences.xul +++ b/addon/chrome/content/zutilo/preferences.xul @@ -12,35 +12,35 @@ - - - - - - - - - - - + title="&zutilo.preferences.title;" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + onload="initializePrefWindow();"> + + + + + + + + + + + - - - - - - - + + + + + + + @@ -69,157 +69,157 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - -