Skip to content

Commit 45aaf02

Browse files
RubyLouvreRubyLouvre
committed
update
1 parent 727ffdd commit 45aaf02

File tree

5 files changed

+88
-19
lines changed

5 files changed

+88
-19
lines changed

‎components/grid.html

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<html>
2+
3+
<head>
4+
<meta charset="UTF-8">
5+
<title>test</title>
6+
<script src="../dist/avalon.js"></script>
7+
<!-- <script src="./src/vtree/fromString2.js"></script> -->
8+
</head>
9+
10+
<body>
11+
<div ms-controller="grid">
12+
<table border=1>
13+
<tr>
14+
<td>a</td>
15+
<td>b</td>
16+
<td>c</td>
17+
</tr>
18+
<tr ms-for='el in @arr'>
19+
<td>{{ el.a}}</td>
20+
<td>{{ el.b }}</td>
21+
<td>{{ el.c }}</td>
22+
</tr>
23+
24+
</table>
25+
</div>
26+
27+
<style>
28+
29+
</style>
30+
<script>
31+
var vm = avalon.define({
32+
$id: 'grid',
33+
arr: [{
34+
a: 111,
35+
b: 222,
36+
c: 333
37+
}, {
38+
a: 1111,
39+
b: 2222,
40+
c: 3333
41+
}, {
42+
a: 11111,
43+
b: 22222,
44+
c: 33333
45+
}]
46+
});
47+
setTimeout(function() {
48+
vm.arr = [{
49+
a: "aaa",
50+
b: 'bbb',
51+
c: "ccc"
52+
}, {
53+
a: "xxx",
54+
b: 'yyy',
55+
c: "zzz"
56+
}]
57+
}, 1000)
58+
</script>
59+
</body>
60+
61+
</html>

‎dist/avalon.js

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
built in 2017-4-19:18:46 version 2.2.5 by 司徒正美
2+
built in 2017-4-25:13:48 version 2.2.5 by 司徒正美
33
https://github.com/RubyLouvre/avalon/tree/2.2.4
44
55
修正IE下 orderBy BUG
@@ -2505,12 +2505,13 @@ https://github.com/RubyLouvre/avalon/tree/2.2.4
25052505

25062506
function parseTextDir(string) {
25072507
var closeTag = config.closeTag;
2508+
var openTag = config.openTag;
25082509
var closeTagFirst = closeTag.charAt(0);
25092510
var closeTagLength = closeTag.length;
25102511
var state = 'code',
25112512
quote$$1,
25122513
escape;
2513-
for (var i = config.openTag.length, n = string.length; i < n; i++) {
2514+
for (var i = openTag.length, n = string.length; i < n; i++) {
25142515

25152516
var c = string.charAt(i);
25162517
switch (state) {
@@ -2534,16 +2535,17 @@ https://github.com/RubyLouvre/avalon/tree/2.2.4
25342535
}
25352536
break;
25362537
}
2537-
2538-
throw '找不到界定符' + closeTag;
25392538
}
2539+
throw '找不到界定符' + closeTag;
25402540
}
25412541

2542+
var rtbody = /^(tbody|thead|tfoot)$/;
2543+
25422544
function insertTbody(nodes) {
25432545
var tbody = false;
25442546
for (var i = 0, n = nodes.length; i < n; i++) {
25452547
var node = nodes[i];
2546-
if (/^(tbody|thead|tfoot)$/.test(node.nodeName)) {
2548+
if (rtbody.test(node.nodeName)) {
25472549
tbody = false;
25482550
continue;
25492551
}
@@ -2587,6 +2589,7 @@ https://github.com/RubyLouvre/avalon/tree/2.2.4
25872589
}
25882590
return null;
25892591
}
2592+
var ropenTag = /\<(\w[^\s\/\>]*)/;
25902593

25912594
function getOpenTag(string) {
25922595
if (string.indexOf("<") === 0) {
@@ -2602,7 +2605,7 @@ https://github.com/RubyLouvre/avalon/tree/2.2.4
26022605
};
26032606
return [string.slice(0, l + 3), node];
26042607
}
2605-
var match = string.match(/\<(\w[^\s\/\>]*)/); //处理元素节点
2608+
var match = string.match(ropenTag); //处理元素节点
26062609
if (match) {
26072610
var leftContent = match[0],
26082611
tag = match[1];

‎dist/avalon.modern.js

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
built in 2017-4-19:18:47 version 2.2.5 by 司徒正美
2+
built in 2017-4-25:13:49 version 2.2.5 by 司徒正美
33
https://github.com/RubyLouvre/avalon/tree/2.2.4
44
55
更改下载Promise的提示
@@ -1916,12 +1916,13 @@ https://github.com/RubyLouvre/avalon/tree/2.2.4
19161916

19171917
function parseTextDir(string) {
19181918
var closeTag = config.closeTag
1919+
var openTag = config.openTag
19191920
var closeTagFirst = closeTag.charAt(0)
19201921
var closeTagLength = closeTag.length
19211922
var state = 'code',
19221923
quote$$1,
19231924
escape
1924-
for (var i = config.openTag.length, n = string.length; i < n; i++) {
1925+
for (var i = openTag.length, n = string.length; i < n; i++) {
19251926

19261927
var c = string.charAt(i)
19271928
switch (state) {
@@ -1945,16 +1946,17 @@ https://github.com/RubyLouvre/avalon/tree/2.2.4
19451946
}
19461947
break
19471948
}
1948-
1949-
throw '找不到界定符' + closeTag
19501949
}
1950+
throw '找不到界定符' + closeTag
19511951
}
19521952

1953+
var rtbody = /^(tbody|thead|tfoot)$/
1954+
19531955
function insertTbody(nodes) {
19541956
var tbody = false
19551957
for (var i = 0, n = nodes.length; i < n; i++) {
19561958
var node = nodes[i]
1957-
if (/^(tbody|thead|tfoot)$/.test(node.nodeName)) {
1959+
if (rtbody.test(node.nodeName)) {
19581960
tbody = false
19591961
continue
19601962
}
@@ -1998,6 +2000,7 @@ https://github.com/RubyLouvre/avalon/tree/2.2.4
19982000
}
19992001
return null
20002002
}
2003+
var ropenTag = /\<(\w[^\s\/\>]*)/
20012004

20022005
function getOpenTag(string) {
20032006
if (string.indexOf("<") === 0) {
@@ -2013,7 +2016,7 @@ https://github.com/RubyLouvre/avalon/tree/2.2.4
20132016
}
20142017
return [string.slice(0, l + 3), node]
20152018
}
2016-
var match = string.match(/\<(\w[^\s\/\>]*)/) //处理元素节点
2019+
var match = string.match(ropenTag) //处理元素节点
20172020
if (match) {
20182021
var leftContent = match[0],
20192022
tag = match[1]

‎karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ module.exports = function(config) {
5757

5858
// start these browsers
5959
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
60-
browsers: ['Chrome', 'PhantomJS', 'Firefox'],//['Chrome', 'PhantomJS', 'Firefox''IE','Firefox', 'IE7','Chrome','Chrome', 'PhantomJS_custom',
60+
browsers: ['Chrome', 'PhantomJS', 'Firefox'], //['Chrome', 'PhantomJS', 'Firefox''IE','Firefox', 'IE7','Chrome','Chrome', 'PhantomJS_custom',
6161

6262
customLaunchers: {
6363
IE6: {

‎src/vtree/fromString.js

+8-6
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,13 @@ function addText(lastNode, text, addNode) {
184184

185185
function parseTextDir(string) {
186186
var closeTag = config.closeTag
187+
var openTag = config.openTag
187188
var closeTagFirst = closeTag.charAt(0)
188189
var closeTagLength = closeTag.length
189190
var state = 'code',
190191
quote,
191192
escape
192-
for (var i = config.openTag.length, n = string.length; i < n; i++) {
193+
for (var i = openTag.length, n = string.length; i < n; i++) {
193194

194195
var c = string.charAt(i)
195196
switch (state) {
@@ -212,18 +213,18 @@ function parseTextDir(string) {
212213
}
213214
break
214215
}
215-
216-
throw '找不到界定符' + closeTag
217-
218216
}
217+
throw '找不到界定符' + closeTag
218+
219219
}
220220

221+
var rtbody = /^(tbody|thead|tfoot)$/
221222

222223
function insertTbody(nodes) {
223224
var tbody = false
224225
for (var i = 0, n = nodes.length; i < n; i++) {
225226
var node = nodes[i]
226-
if (/^(tbody|thead|tfoot)$/.test(node.nodeName)) {
227+
if (rtbody.test(node.nodeName)) {
227228
tbody = false
228229
continue
229230
}
@@ -267,6 +268,7 @@ function getCloseTag(string) {
267268
}
268269
return null
269270
}
271+
var ropenTag = /\<(\w[^\s\/\>]*)/
270272

271273
function getOpenTag(string) {
272274
if (string.indexOf("<") === 0) {
@@ -282,7 +284,7 @@ function getOpenTag(string) {
282284
}
283285
return [string.slice(0, l + 3), node]
284286
}
285-
var match = string.match(/\<(\w[^\s\/\>]*)/) //处理元素节点
287+
var match = string.match(ropenTag) //处理元素节点
286288
if (match) {
287289
var leftContent = match[0],
288290
tag = match[1]

0 commit comments

Comments
 (0)