diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-02-27 18:23:48 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-02-27 18:23:48 +0000 |
commit | d1d69fc64157066f9210801f28c63709db3e60a4 (patch) | |
tree | d566183f708645d47a696c51ac120ce4e15ed344 | |
parent | 202de12377f4cfc8ae835ff2e569e29b273d1cfe (diff) | |
parent | 9960c7610ee9bf44f76e4c16c2e49989f0038f99 (diff) | |
download | gitlab-ce-d1d69fc64157066f9210801f28c63709db3e60a4.tar.gz |
Merge branch '28723-consistent-handling-indexof' into 'master'
Keep consistent in handling indexOf results
Closes #28723
See merge request !9531
-rw-r--r-- | app/assets/javascripts/build.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/gl_dropdown.js | 6 | ||||
-rw-r--r-- | app/assets/javascripts/issuable.js.es6 | 2 | ||||
-rw-r--r-- | app/assets/javascripts/merge_request_widget.js.es6 | 4 | ||||
-rw-r--r-- | app/assets/javascripts/new_branch_form.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/project.js | 2 | ||||
-rw-r--r-- | changelogs/unreleased/28723-consistent-handling-indexof.yml | 4 |
7 files changed, 13 insertions, 9 deletions
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js index d1883f51d47..6e6e9b18686 100644 --- a/app/assets/javascripts/build.js +++ b/app/assets/javascripts/build.js @@ -92,7 +92,7 @@ if (window.location.hash === DOWN_BUILD_TRACE) { $("html,body").scrollTop(this.$buildTrace.height()); } - if (removeRefreshStatuses.indexOf(buildData.status) >= 0) { + if (removeRefreshStatuses.indexOf(buildData.status) !== -1) { this.$buildRefreshAnimation.remove(); return this.initScrollMonitor(); } diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index a01662e2f9e..9e6ed06054b 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -63,7 +63,7 @@ } GitLabDropdownFilter.prototype.shouldBlur = function(keyCode) { - return BLUR_KEYCODES.indexOf(keyCode) >= 0; + return BLUR_KEYCODES.indexOf(keyCode) !== -1; }; GitLabDropdownFilter.prototype.filter = function(search_text) { @@ -605,7 +605,7 @@ var occurrences; occurrences = fuzzaldrinPlus.match(text, term); return text.split('').map(function(character, i) { - if (indexOf.call(occurrences, i) >= 0) { + if (indexOf.call(occurrences, i) !== -1) { return "<b>" + character + "</b>"; } else { return character; @@ -748,7 +748,7 @@ return function(e) { var $listItems, PREV_INDEX, currentKeyCode; currentKeyCode = e.which; - if (ARROW_KEY_CODES.indexOf(currentKeyCode) >= 0) { + if (ARROW_KEY_CODES.indexOf(currentKeyCode) !== -1) { e.preventDefault(); e.stopImmediatePropagation(); PREV_INDEX = currentIndex; diff --git a/app/assets/javascripts/issuable.js.es6 b/app/assets/javascripts/issuable.js.es6 index 8df86f68218..3bfce32768a 100644 --- a/app/assets/javascripts/issuable.js.es6 +++ b/app/assets/javascripts/issuable.js.es6 @@ -116,7 +116,7 @@ formData = $.param(formData); formAction = form.attr('action'); issuesUrl = formAction; - issuesUrl += "" + (formAction.indexOf('?') < 0 ? '?' : '&'); + issuesUrl += "" + (formAction.indexOf('?') === -1 ? '?' : '&'); issuesUrl += formData; return gl.utils.visitUrl(issuesUrl); }; diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6 index 88f08bbaa34..00c6c050612 100644 --- a/app/assets/javascripts/merge_request_widget.js.es6 +++ b/app/assets/javascripts/merge_request_widget.js.es6 @@ -83,7 +83,7 @@ require('./smart_interval'); return function() { var page; page = $('body').data('page').split(':').last(); - if (allowedPages.indexOf(page) < 0) { + if (allowedPages.indexOf(page) === -1) { return _this.clearEventListeners(); } }; @@ -233,7 +233,7 @@ require('./smart_interval'); } $('.ci_widget').hide(); allowed_states = ["failed", "canceled", "running", "pending", "success", "success_with_warnings", "skipped", "not_found"]; - if (indexOf.call(allowed_states, state) >= 0) { + if (indexOf.call(allowed_states, state) !== -1) { $('.ci_widget.ci-' + state).show(); switch (state) { case "failed": diff --git a/app/assets/javascripts/new_branch_form.js b/app/assets/javascripts/new_branch_form.js index 3f678b93f73..5828f460a23 100644 --- a/app/assets/javascripts/new_branch_form.js +++ b/app/assets/javascripts/new_branch_form.js @@ -81,7 +81,7 @@ var errorMessage, errors, formatter, unique, validator; this.branchNameError.empty(); unique = function(values, value) { - if (indexOf.call(values, value) < 0) { + if (indexOf.call(values, value) === -1) { values.push(value); } return values; diff --git a/app/assets/javascripts/project.js b/app/assets/javascripts/project.js index 7c03c8b72d4..db7ceaa2421 100644 --- a/app/assets/javascripts/project.js +++ b/app/assets/javascripts/project.js @@ -116,7 +116,7 @@ if ($('input[name="ref"]').length) { var $form = $dropdown.closest('form'); var action = $form.attr('action'); - var divider = action.indexOf('?') < 0 ? '?' : '&'; + var divider = action.indexOf('?') === -1 ? '?' : '&'; gl.utils.visitUrl(action + '' + divider + '' + $form.serialize()); } } diff --git a/changelogs/unreleased/28723-consistent-handling-indexof.yml b/changelogs/unreleased/28723-consistent-handling-indexof.yml new file mode 100644 index 00000000000..95d6181d5fa --- /dev/null +++ b/changelogs/unreleased/28723-consistent-handling-indexof.yml @@ -0,0 +1,4 @@ +--- +title: Keep consistent in handling indexOf results +merge_request: 9531 +author: Takuya Noguchi |