Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling #6535

Merged
merged 15 commits into from
Sep 7, 2017
2 changes: 1 addition & 1 deletion benchmarks/dbmon/lib/memory-stats.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var MemoryStats = function (){
}

// TODO, add a sanity check to see if values are bucketed.
// If so, reminde user to adopt the --enable-precise-memory-info flag.
// If so, remind user to adopt the --enable-precise-memory-info flag.
// open -a "/Applications/Google Chrome.app" --args --enable-precise-memory-info

var lastTime = Date.now();
Expand Down
2 changes: 1 addition & 1 deletion examples/svg/svg.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var stats = [
{ label: 'F', value: 100 }
]

// A resusable polygon graph component
// A reusable polygon graph component
Vue.component('polygraph', {
props: ['stats'],
template: '#polygraph-template',
Expand Down
2 changes: 1 addition & 1 deletion src/core/instance/lifecycle.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export function updateChildComponent (
}
vm.$options._renderChildren = renderChildren

// update $attrs and $listensers hash
// update $attrs and $listeners hash
// these are also reactive so they may trigger child update if the child
// used them during render
vm.$attrs = (parentVnode.data && parentVnode.data.attrs) || emptyObject
Expand Down
2 changes: 1 addition & 1 deletion src/platforms/web/runtime/modules/style.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function updateStyle (oldVnode: VNodeWithData, vnode: VNodeWithData) {
const style = normalizeStyleBinding(vnode.data.style) || {}

// store normalized style under a different key for next diff
// make sure to clone it if it's reactive, since the user likley wants
// make sure to clone it if it's reactive, since the user likely wants
// to mutate it.
vnode.data.normalizedStyle = isDef(style.__ob__)
? extend({}, style)
Expand Down
2 changes: 1 addition & 1 deletion src/platforms/weex/entry-framework.js
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ function callFunction (globalObjects, body) {
* This function helps speed up bundle compiling. Normally, the V8
* engine needs to download, parse, and compile a bundle on every
* visit. If 'compileBundle()' is available on native side,
* the downloding, parsing, and compiling steps would be skipped.
* the downloading, parsing, and compiling steps would be skipped.
* @param {object} globalObjects
* @param {string} body
* @return {boolean}
Expand Down
2 changes: 1 addition & 1 deletion src/platforms/weex/util/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const isReservedTag = makeMap(
)

// Elements that you can, intentionally, leave open (and which close themselves)
// more flexable than web
// more flexible than web
export const canBeLeftOpenTag = makeMap(
'web,spinner,switch,video,textarea,canvas,' +
'indicator,marquee,countdown',
Expand Down
4 changes: 2 additions & 2 deletions src/server/template-renderer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default class TemplateRenderer {
if (options.clientManifest) {
const clientManifest = this.clientManifest = options.clientManifest
this.publicPath = clientManifest.publicPath.replace(/\/$/, '')
// preload/prefetch drectives
// preload/prefetch directives
this.preloadFiles = clientManifest.initial
this.prefetchFiles = clientManifest.async
// initial async chunk mapping
Expand Down Expand Up @@ -242,7 +242,7 @@ function getPreloadType (ext: string): string {
} else if (/woff2?|ttf|otf|eot/.test(ext)) {
return 'font'
} else {
// not exhausting all possbilities here, but above covers common cases
// not exhausting all possibilities here, but above covers common cases
return ''
}
}
4 changes: 2 additions & 2 deletions test/ssr/compile-with-webpack.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from 'path'
import webpack from 'webpack'
import MemoeryFS from 'memory-fs'
import MemoryFS from 'memory-fs'

export function compileWithWebpack (file, extraConfig, cb) {
const config = Object.assign({
Expand All @@ -27,7 +27,7 @@ export function compileWithWebpack (file, extraConfig, cb) {
}, extraConfig)

const compiler = webpack(config)
const fs = new MemoeryFS()
const fs = new MemoryFS()
compiler.outputFileSystem = fs

compiler.run((err, stats) => {
Expand Down
2 changes: 1 addition & 1 deletion test/ssr/ssr-string.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ describe('SSR: renderToString', () => {
expect(vm.a).toBe(func)
})

it('should prevent xss in attribtues', done => {
it('should prevent xss in attributes', done => {
renderVmWithOptions({
data: {
xss: '"><script>alert(1)</script>'
Expand Down
2 changes: 1 addition & 1 deletion test/unit/features/component/component-slot.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ describe('Component slot', () => {
}).then(done)
})

// Github issue #5888
// GitHub issue #5888
it('should resolve correctly slot with keep-alive', () => {
const vm = new Vue({
template: `
Expand Down
2 changes: 1 addition & 1 deletion test/unit/features/directives/model-select.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Vue from 'vue'
import { looseEqual } from 'shared/util'

// Android 4.4 Chrome 30 has the bug that a multi-select option cannot be
// deseleted by setting its "selected" prop via JavaScript.
// deselected by setting its "selected" prop via JavaScript.
function hasMultiSelectBug () {
var s = document.createElement('select')
s.setAttribute('multiple', '')
Expand Down
6 changes: 3 additions & 3 deletions test/unit/features/directives/on.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ describe('Directive v-on', () => {
}).not.toThrow()
})

// Github Issue #5046
// GitHub Issue #5046
it('should support keyboard modifier', () => {
const spyLeft = jasmine.createSpy()
const spyRight = jasmine.createSpy()
Expand Down Expand Up @@ -570,7 +570,7 @@ describe('Directive v-on', () => {
})
}

// Github Issues #5146
// GitHub Issues #5146
it('should only prevent when match keycode', () => {
let prevented = false
vm = new Vue({
Expand Down Expand Up @@ -652,7 +652,7 @@ describe('Directive v-on', () => {
expect(mouseup.calls.count()).toBe(1)
})

it('object syntax (usage in HOC, mixed with native listners)', () => {
it('object syntax (usage in HOC, mixed with native listeners)', () => {
const click = jasmine.createSpy('click')
const mouseup = jasmine.createSpy('mouseup')
const mousedown = jasmine.createSpy('mousedown')
Expand Down
2 changes: 1 addition & 1 deletion test/unit/features/global-api/use.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('Global API: use', () => {
expect(Ctor.options.directives['plugin-test']).toBe(def)
})

// Github issue #5970
// GitHub issue #5970
it('should work on multi version', () => {
const Ctor1 = Vue.extend({})
const Ctor2 = Vue.extend({})
Expand Down
2 changes: 1 addition & 1 deletion test/unit/features/instance/methods-data.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ describe('Instance methods data', () => {
expect(spy).toHaveBeenCalledWith(1)
})

it('warn expresssion', () => {
it('warn expression', () => {
vm.$watch('a + b', spy)
expect('Watcher only accepts simple dot-delimited paths').toHaveBeenWarned()
})
Expand Down
6 changes: 3 additions & 3 deletions test/unit/features/options/inject.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ describe('Options provide/inject', () => {
expect(child.baz).toBe(3)
})

// Github issue #5194
// GitHub issue #5194
it('should work with functional', () => {
new Vue({
template: `<child/>`,
Expand Down Expand Up @@ -187,7 +187,7 @@ describe('Options provide/inject', () => {
})
}

// Github issue #5223
// GitHub issue #5223
it('should work with reactive array', done => {
const vm = new Vue({
template: `<div><child></child></div>`,
Expand Down Expand Up @@ -362,7 +362,7 @@ describe('Options provide/inject', () => {
expect(`Injection "baz" not found`).not.toHaveBeenWarned()
})

// Github issue #6008
// GitHub issue #6008
it('should merge provide from mixins (objects)', () => {
const mixinA = { provide: { foo: 'foo' }}
const mixinB = { provide: { bar: 'bar' }}
Expand Down
2 changes: 1 addition & 1 deletion test/unit/features/transition/transition-group.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ if (!isIE9) {
expect('<transition-group> children must be keyed: <div>').toHaveBeenWarned()
})

// Github issue #6006
// GitHub issue #6006
it('should work with dynamic name', done => {
const vm = new Vue({
template: `
Expand Down
2 changes: 1 addition & 1 deletion test/unit/karma.cover.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = function (config) {
])
})

// add babel-plugin-istanbul for code intrumentation
// add babel-plugin-istanbul for code instrumentation
options.webpack.module.rules[0].options = {
plugins: [['istanbul', {
exclude: [
Expand Down
2 changes: 1 addition & 1 deletion test/unit/modules/compiler/codegen.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ describe('codegen', () => {
)
})

// Github Issues #5146
// GitHub Issues #5146
it('generate events with generic modifiers and keycode correct order', () => {
assertCodegen(
'<input @keydown.enter.prevent="onInput">',
Expand Down
2 changes: 1 addition & 1 deletion test/unit/modules/observer/scheduler.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ describe('Scheduler', () => {
}).then(done)
})

// Github issue #5191
// GitHub issue #5191
it('emit should work when updated hook called', done => {
const el = document.createElement('div')
const vm = new Vue({
Expand Down
4 changes: 2 additions & 2 deletions test/unit/modules/vdom/modules/directive.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe('vdom directive module', () => {
const vnode1 = new VNode('div', {}, [
new VNode('p', {
directives: [{
name: 'directive1', value: 'hello', arg: 'arg1', modifiers: { modifire1: true }
name: 'directive1', value: 'hello', arg: 'arg1', modifiers: { modifier1: true }
}]
}, undefined, 'hello world', undefined, vm)
])
Expand All @@ -24,7 +24,7 @@ describe('vdom directive module', () => {
const vnode2 = new VNode('div', {}, [
new VNode('p', {
directives: [{
name: 'directive1', value: 'world', arg: 'arg1', modifiers: { modifire1: true }
name: 'directive1', value: 'world', arg: 'arg1', modifiers: { modifier1: true }
}]
}, undefined, 'hello world', undefined, vm)
])
Expand Down