Skip to content

Commit 69fda2b

Browse files
author
RubyLouvre
committed
update
1 parent 729fd71 commit 69fda2b

File tree

7 files changed

+52
-50
lines changed

7 files changed

+52
-50
lines changed

.codeclimate.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ exclude_paths:
1919
- test/**/*
2020
- tutorials/**/*
2121
- components/**/*
22-
- perf/**/*
22+
- perf/**/*
23+
- dist/**/*

dist/avalon.js

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
built in 2016-12-2:0:42 version 2.2.2 by 司徒正美
2+
built in 2016-12-2:1:46 version 2.2.2 by 司徒正美
33
https://github.com/RubyLouvre/avalon/tree/2.2.1
44
添加计算属性
55
添加事务
@@ -2564,7 +2564,7 @@ fix 空字符串不生成节点的BUG
25642564
node.end = true;
25652565
} else {
25662566
this.stack.push(node);
2567-
if (orphanTag[nodeName] || nodeName == 'option') {
2567+
if (orphanTag[nodeName] || nodeName === 'option') {
25682568
var index = str.indexOf('</' + nodeName + '>');
25692569
var innerHTML = str.slice(0, index).trim();
25702570
str = str.slice(index);
@@ -4799,10 +4799,11 @@ fix 空字符串不生成节点的BUG
47994799
var aIsArray = Array.isArray(a);
48004800
if (aIsArray !== Array.isArray(b)) {
48014801
return false;
4802-
} else if (aIsArray) {
4803-
return equalArray(a, b);
4802+
}
4803+
if (aIsArray) {
4804+
return equalArray(a, b, level);
48044805
} else if (typeof a === "object" && typeof b === "object") {
4805-
return equalObject(a, b);
4806+
return equalObject(a, b, level);
48064807
}
48074808
return a === b;
48084809
}
@@ -6257,7 +6258,7 @@ fix 空字符串不生成节点的BUG
62576258
//http://www.cnblogs.com/rubylouvre/archive/2013/02/17/2914604.html
62586259
//http://www.matts411.com/post/internet-explorer-9-oninput/
62596260
if (msie < 10) {
6260-
//IE6-8的propertychange有BUG,第一次用JS修改值时不会触发,而且你是全部清空value也不会触发
6261+
//IE6-8的propertychange有问题,第一次用JS修改值时不会触发,而且你是全部清空value也不会触发
62616262
//IE9的propertychange不支持自动完成,退格,删除,复制,贴粘,剪切或点击右边的小X的清空操作
62626263
events.propertychange = updateModelHack;
62636264
events.paste = updateModelDelay;
@@ -6267,7 +6268,7 @@ fix 空字符串不生成节点的BUG
62676268
} else {
62686269
events.input = updateDataHandle;
62696270
events.compositionstart = openComposition;
6270-
//微软拼音输入法的BUG需要在compositionend事件中处理
6271+
//微软拼音输入法的问题需要在compositionend事件中处理
62716272
events.compositionend = closeComposition;
62726273
//https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray
62736274
//处理低版本的标准浏览器,通过Int8Array进行区分
@@ -6376,12 +6377,12 @@ fix 空字符串不生成节点的BUG
63766377
var len;
63776378
var endRange;
63786379

6379-
if (typeof target.selectionStart == 'number' && typeof target.selectionEnd == 'number') {
6380+
if (target.selectionStart + target.selectionEnd > -1) {
63806381
start = target.selectionStart;
63816382
} else {
63826383
range$$1 = document$1.selection.createRange();
63836384

6384-
if (range$$1 && range$$1.parentElement() == target) {
6385+
if (range$$1 && range$$1.parentElement() === target) {
63856386
len = target.value.length;
63866387
normalizedValue = target.value.replace(/\r\n/g, '\n');
63876388

@@ -7293,8 +7294,8 @@ fix 空字符串不生成节点的BUG
72937294
el.dispose();
72947295
}
72957296
//防止其他地方的this.innerRender && this.innerRender.dispose报错
7296-
for (var i in this) {
7297-
if (i !== 'dispose') delete this[i];
7297+
for (var _i6 in this) {
7298+
if (_i6 !== 'dispose') delete this[_i6];
72987299
}
72997300
},
73007301

dist/avalon.modern.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
built in 2016-12-2:0:42 version 2.2.2 by 司徒正美
2+
built in 2016-12-2:1:45 version 2.2.2 by 司徒正美
33
https://github.com/RubyLouvre/avalon/tree/2.2.1
44
添加计算属性
55
添加事务
@@ -1991,7 +1991,7 @@ https://github.com/RubyLouvre/avalon/tree/2.2.1
19911991
node.end = true
19921992
} else {
19931993
this.stack.push(node)
1994-
if (orphanTag[nodeName] || nodeName == 'option') {
1994+
if (orphanTag[nodeName] || nodeName === 'option') {
19951995
var index = str.indexOf('</' + nodeName + '>')
19961996
var innerHTML = str.slice(0, index).trim()
19971997
str = str.slice(index)
@@ -4095,10 +4095,11 @@ https://github.com/RubyLouvre/avalon/tree/2.2.1
40954095
var aIsArray = Array.isArray(a)
40964096
if (aIsArray !== Array.isArray(b)) {
40974097
return false
4098-
} else if (aIsArray) {
4099-
return equalArray(a, b)
4098+
}
4099+
if (aIsArray) {
4100+
return equalArray(a, b, level)
41004101
} else if (typeof a === "object" && typeof b === "object") {
4101-
return equalObject(a, b)
4102+
return equalObject(a, b, level)
41024103
}
41034104
return a === b
41044105
}
@@ -6461,8 +6462,8 @@ https://github.com/RubyLouvre/avalon/tree/2.2.1
64616462
el.dispose()
64626463
}
64636464
//防止其他地方的this.innerRender && this.innerRender.dispose报错
6464-
for (var i in this) {
6465-
if (i !== 'dispose') delete this[i]
6465+
for (var _i8 in this) {
6466+
if (_i8 !== 'dispose') delete this[_i8]
64666467
}
64676468
},
64686469

src/directives/css.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ export function deepEquals(a, b, level) {
8585
const aIsArray = Array.isArray(a)
8686
if (aIsArray !== Array.isArray(b)) {
8787
return false
88-
} else if (aIsArray) {
89-
return equalArray(a, b)
90-
88+
}
89+
if (aIsArray) {
90+
return equalArray(a, b, level)
9191
} else if (typeof a === "object" && typeof b === "object") {
92-
return equalObject(a, b)
92+
return equalObject(a, b, level)
9393
}
9494
return a === b
9595
}

src/directives/duplex/updateDataEvents.compact.js

+23-24
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { updateModel } from './updateDataHandle'
1212

1313
export function updateDataEvents(dom, data) {
1414
var events = {}
15-
//添加需要监听的事件
15+
//添加需要监听的事件
1616
switch (data.dtype) {
1717
case 'radio':
1818
case 'checkbox':
@@ -25,7 +25,7 @@ export function updateDataEvents(dom, data) {
2525
/* istanbul ignore if */
2626
if (data.isChanged) {
2727
events.blur = updateModel
28-
/* istanbul ignore else */
28+
/* istanbul ignore else */
2929
} else {
3030
/* istanbul ignore if*/
3131

@@ -38,7 +38,7 @@ export function updateDataEvents(dom, data) {
3838
events.DOMCharacterDataModified = updateModel
3939
}
4040
events.input = updateModel
41-
/* istanbul ignore else */
41+
/* istanbul ignore else */
4242
} else {
4343
events.keydown = updateModelKeyDown
4444
events.paste = updateModelDelay
@@ -53,29 +53,29 @@ export function updateDataEvents(dom, data) {
5353
/* istanbul ignore if */
5454
if (data.isChanged) {
5555
events.change = updateModel
56-
/* istanbul ignore else */
56+
/* istanbul ignore else */
5757
} else {
5858
//http://www.cnblogs.com/rubylouvre/archive/2013/02/17/2914604.html
5959
//http://www.matts411.com/post/internet-explorer-9-oninput/
6060
if (msie < 10) {
61-
//IE6-8的propertychange有BUG,第一次用JS修改值时不会触发,而且你是全部清空value也不会触发
61+
//IE6-8的propertychange有问题,第一次用JS修改值时不会触发,而且你是全部清空value也不会触发
6262
//IE9的propertychange不支持自动完成,退格,删除,复制,贴粘,剪切或点击右边的小X的清空操作
6363
events.propertychange = updateModelHack
6464
events.paste = updateModelDelay
6565
events.cut = updateModelDelay
66-
//IE9在第一次删除字符时不会触发oninput
66+
//IE9在第一次删除字符时不会触发oninput
6767
events.keyup = updateModelKeyDown
6868
} else {
6969
events.input = updateModel
7070
events.compositionstart = openComposition
71-
//微软拼音输入法的BUG需要在compositionend事件中处理
71+
//微软拼音输入法的问题需要在compositionend事件中处理
7272
events.compositionend = closeComposition
73-
//https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray
74-
//处理低版本的标准浏览器,通过Int8Array进行区分
73+
//https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray
74+
//处理低版本的标准浏览器,通过Int8Array进行区分
7575
if (!/\[native code\]/.test(window.Int8Array)) {
7676
events.keydown = updateModelKeyDown //safari < 5 opera < 11
77-
events.paste = updateModelDelay//safari < 5
78-
events.cut = updateModelDelay//safari < 5
77+
events.paste = updateModelDelay //safari < 5
78+
events.cut = updateModelDelay //safari < 5
7979
if (window.netscape) {
8080
// Firefox <= 3.6 doesn't fire the 'input' event when text is filled in through autocomplete
8181
events.DOMAutoComplete = updateModel
@@ -107,7 +107,7 @@ function updateModelHack(e) {
107107

108108
function updateModelDelay(e) {
109109
var elem = this
110-
setTimeout(function () {
110+
setTimeout(function() {
111111
updateModel.call(elem, e)
112112
}, 0)
113113
}
@@ -132,8 +132,8 @@ function closeComposition(e) {
132132
/* istanbul ignore next */
133133
function updateModelKeyDown(e) {
134134
var key = e.keyCode
135-
// ignore
136-
// command modifiers arrows
135+
// ignore
136+
// command modifiers arrows
137137
if (key === 91 || (15 < key && key < 19) || (37 <= key && key <= 40))
138138
return
139139
updateModel.call(this, e)
@@ -149,14 +149,14 @@ markID(updateModelDelay)
149149
markID(updateModelKeyDown)
150150

151151
//IE6-8要处理光标时需要异步
152-
var mayBeAsync = function (fn) {
153-
setTimeout(fn, 0)
154-
}
155-
/* istanbul ignore next */
152+
var mayBeAsync = function(fn) {
153+
setTimeout(fn, 0)
154+
}
155+
/* istanbul ignore next */
156156
function setCaret(target, cursorPosition) {
157157
var range
158158
if (target.createTextRange) {
159-
mayBeAsync(function () {
159+
mayBeAsync(function() {
160160
target.focus()
161161
range = target.createTextRange()
162162
range.collapse(true)
@@ -171,7 +171,7 @@ function setCaret(target, cursorPosition) {
171171
}
172172
}
173173
}
174-
/* istanbul ignore next*/
174+
/* istanbul ignore next*/
175175
function getCaret(target) {
176176
var start = 0
177177
var normalizedValue
@@ -180,12 +180,12 @@ function getCaret(target) {
180180
var len
181181
var endRange
182182

183-
if (typeof target.selectionStart == 'number' && typeof target.selectionEnd == 'number') {
183+
if (target.selectionStart + target.selectionEnd > -1) {
184184
start = target.selectionStart
185185
} else {
186186
range = document.selection.createRange()
187187

188-
if (range && range.parentElement() == target) {
188+
if (range && range.parentElement() === target) {
189189
len = target.value.length
190190
normalizedValue = target.value.replace(/\r\n/g, '\n')
191191

@@ -205,5 +205,4 @@ function getCaret(target) {
205205
}
206206

207207
return start
208-
}
209-
208+
}

src/renders/domRender.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -292,11 +292,11 @@ Render.prototype = {
292292
*/
293293
dispose() {
294294
var list = this.directives || []
295-
for (var i = 0, el; el = list[i++];) {
295+
for (let i = 0, el; el = list[i++];) {
296296
el.dispose()
297297
}
298298
//防止其他地方的this.innerRender && this.innerRender.dispose报错
299-
for (var i in this) {
299+
for (let i in this) {
300300
if (i !== 'dispose')
301301
delete this[i]
302302
}

src/vtree/fromString.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ AST.prototype = {
147147
node.end = true
148148
} else {
149149
this.stack.push(node)
150-
if (orphanTag[nodeName] || nodeName == 'option') {
150+
if (orphanTag[nodeName] || nodeName === 'option') {
151151
var index = str.indexOf('</' + nodeName + '>')
152152
var innerHTML = str.slice(0, index).trim()
153153
str = str.slice(index)

0 commit comments

Comments
 (0)