Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJohann-S <johann.servoire@gmail.com>2017-07-27 13:58:22 +0300
committerXhmikosR <xhmikosr@gmail.com>2017-08-23 00:05:38 +0300
commit6063b0dc659e7ba3a83cfc9502ad7872f8201a32 (patch)
tree70cb46f86e21b110a11be48f1c098405d393a270 /js
parentef8c77d8dcebd13559a141e419d003c2d10cc5f3 (diff)
Enable the `no-return-assign` rule.
Diffstat (limited to 'js')
-rw-r--r--js/.eslintrc.json2
-rw-r--r--js/src/popover.js3
-rw-r--r--js/src/tooltip.js3
3 files changed, 5 insertions, 3 deletions
diff --git a/js/.eslintrc.json b/js/.eslintrc.json
index fdca9c1dd2..cc4e58ebd1 100644
--- a/js/.eslintrc.json
+++ b/js/.eslintrc.json
@@ -74,7 +74,7 @@
"no-param-reassign": "off",
"no-proto": "error",
"no-restricted-properties": "error",
- "no-return-assign": "off",
+ "no-return-assign": "error",
"no-return-await": "error",
"no-script-url": "error",
"no-self-compare": "error",
diff --git a/js/src/popover.js b/js/src/popover.js
index 7639e3e203..f5820ecbed 100644
--- a/js/src/popover.js
+++ b/js/src/popover.js
@@ -114,7 +114,8 @@ const Popover = (($) => {
}
getTipElement() {
- return this.tip = this.tip || $(this.config.template)[0]
+ this.tip = this.tip || $(this.config.template)[0]
+ return this.tip
}
setContent() {
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index 721f044818..7dfe9dfc03 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -415,7 +415,8 @@ const Tooltip = (($) => {
}
getTipElement() {
- return this.tip = this.tip || $(this.config.template)[0]
+ this.tip = this.tip || $(this.config.template)[0]
+ return this.tip
}
setContent() {