Skip to content

Commit

Permalink
Merge pull request facebook#3133 from zpao/more-lint
Browse files Browse the repository at this point in the history
More lint rules, fixes
  • Loading branch information
zpao committed Feb 12, 2015
2 parents a411f3e + 7e5eb4b commit fffe135
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 18 deletions.
2 changes: 2 additions & 0 deletions src/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ rules:
consistent-return: 2
no-unused-vars: [2, args: none]
quotes: [2, 'single']
space-before-blocks: 2
indent: [2, 2, indentSwitchCase: true]

# WARNINGS
# This is the only one that's hard to track since we don't lint just changes.
Expand Down
2 changes: 1 addition & 1 deletion src/browser/ReactBrowserEventEmitter.js
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ var ReactBrowserEventEmitter = assign({}, ReactEventEmitterMixin, {
*
* @see http://www.quirksmode.org/dom/events/scroll.html
*/
ensureScrollValueMonitoring: function(){
ensureScrollValueMonitoring: function() {
if (!isMonitoringScrollValue) {
var refresh = ViewportMetrics.refreshScrollValues;
ReactBrowserEventEmitter.ReactEventListener.monitorScrollValue(refresh);
Expand Down
2 changes: 1 addition & 1 deletion src/browser/eventPlugins/DefaultEventPluginOrder.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

'use strict';

var keyOf = require('keyOf');
var keyOf = require('keyOf');

/**
* Module that is injectable into `EventPluginHub`, that specifies a
Expand Down
4 changes: 2 additions & 2 deletions src/browser/ui/ReactDOMIDOperations.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ var ReactDOMIDOperations = {
* @see {Danger.dangerouslyReplaceNodeWithMarkup}
*/
dangerouslyReplaceNodeWithMarkupByID: function(id, markup) {
var node = ReactMount.getNode(id);
DOMChildrenOperations.dangerouslyReplaceNodeWithMarkup(node, markup);
var node = ReactMount.getNode(id);
DOMChildrenOperations.dangerouslyReplaceNodeWithMarkup(node, markup);
},

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/**
* Copyright 2013-2014, Facebook, Inc.
* All rights reserved.
Expand Down
17 changes: 5 additions & 12 deletions src/browser/ui/dom/setTextContent.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
/**
* Copyright 2013-2014 Facebook, Inc.
* Copyright 2013-2014, Facebook, Inc.
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*
* @providesModule setTextContent
*/
Expand Down
2 changes: 1 addition & 1 deletion src/core/ReactCompositeComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ var ReactCompositeComponentMixin = {
ReactLifeCycle.currentlyMountingInstance = this;
try {
if (inst.componentWillMount) {
inst.componentWillMount();
inst.componentWillMount();
// When mounting, calls to `setState` by `componentWillMount` will set
// `this._pendingStateQueue` without triggering a re-render.
if (this._pendingStateQueue) {
Expand Down

0 comments on commit fffe135

Please sign in to comment.