Skip to content

Commit 22b790d

Browse files
author
RubyLouvre
committed
update
1 parent 266079f commit 22b790d

File tree

7 files changed

+54
-11
lines changed

7 files changed

+54
-11
lines changed

‎dist/avalon.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* built in 2016-7-14:20 version 2.16 by 司徒正美
2+
* built in 2016-7-15:0 version 2.16 by 司徒正美
33
* 修正注释节点包括HTML结构(里面有引号),节点对齐算法崩溃的BUG
44
* 修正tap事件误触发BUG
55
* 升级ms-widget的slot机制,让它们的值也放到组件VM中
@@ -6888,7 +6888,7 @@ return /******/ (function(modules) { // webpackBootstrap
68886888
collectNodes(node, stack, ret)
68896889
if (rmsForEnd.test(nodeValue)) {
68906890
var p = stack.last()
6891-
var nodes = p.children
6891+
var nodes = p ? p.children: ret
68926892
markeRepeatRange(nodes, nodes.pop())
68936893
}
68946894
}

‎dist/avalon.modern.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* built in 2016-7-14:20 version 2.16 by 司徒正美
2+
* built in 2016-7-15:0 version 2.16 by 司徒正美
33
* 修正注释节点包括HTML结构(里面有引号),节点对齐算法崩溃的BUG
44
* 修正tap事件误触发BUG
55
* 升级ms-widget的slot机制,让它们的值也放到组件VM中
@@ -4661,7 +4661,7 @@ return /******/ (function(modules) { // webpackBootstrap
46614661
collectNodes(node, stack, ret)
46624662
if (rmsForEnd.test(nodeValue)) {
46634663
var p = stack.last()
4664-
var nodes = p.children
4664+
var nodes = p ? p.children: ret
46654665
markeRepeatRange(nodes, nodes.pop())
46664666
}
46674667
}

‎dist/avalon.next.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* built in 2016-7-14:20 version 2.16 by 司徒正美
2+
* built in 2016-7-15:0 version 2.16 by 司徒正美
33
* 修正注释节点包括HTML结构(里面有引号),节点对齐算法崩溃的BUG
44
* 修正tap事件误触发BUG
55
* 升级ms-widget的slot机制,让它们的值也放到组件VM中
@@ -4662,7 +4662,7 @@ return /******/ (function(modules) { // webpackBootstrap
46624662
collectNodes(node, stack, ret)
46634663
if (rmsForEnd.test(nodeValue)) {
46644664
var p = stack.last()
4665-
var nodes = p.children
4665+
var nodes = p ? p.children: ret
46664666
markeRepeatRange(nodes, nodes.pop())
46674667
}
46684668
}

‎dist/avalon.test.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* built in 2016-7-14:20 version 2.16 by 司徒正美
2+
* built in 2016-7-15:0 version 2.16 by 司徒正美
33
* 修正注释节点包括HTML结构(里面有引号),节点对齐算法崩溃的BUG
44
* 修正tap事件误触发BUG
55
* 升级ms-widget的slot机制,让它们的值也放到组件VM中
@@ -78,7 +78,7 @@ return /******/ (function(modules) { // webpackBootstrap
7878
/***/ function(module, exports, __webpack_require__) {
7979

8080
/*!
81-
* built in 2016-7-14:20 version 2.16 by 司徒正美
81+
* built in 2016-7-15:0 version 2.16 by 司徒正美
8282
* 修正注释节点包括HTML结构(里面有引号),节点对齐算法崩溃的BUG
8383
* 修正tap事件误触发BUG
8484
* 升级ms-widget的slot机制,让它们的值也放到组件VM中
@@ -4740,7 +4740,7 @@ return /******/ (function(modules) { // webpackBootstrap
47404740
collectNodes(node, stack, ret)
47414741
if (rmsForEnd.test(nodeValue)) {
47424742
var p = stack.last()
4743-
var nodes = p.children
4743+
var nodes = p ? p.children: ret
47444744
markeRepeatRange(nodes, nodes.pop())
47454745
}
47464746
}

‎karma/directives/for.js‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,4 +565,47 @@ describe('for', function () {
565565
done()
566566
}, 150)
567567
})
568+
569+
it('注解for指令嵌套问题', function (done) {
570+
div.innerHTML = heredoc(function () {
571+
/*
572+
573+
<style>
574+
.c-red {
575+
color: red;
576+
}
577+
.c-green {
578+
color: green;
579+
}
580+
.c-blue {
581+
color: blue;
582+
}
583+
</style>
584+
<div ms-controller="for14">
585+
<!--ms-for:(idx1, item1) in @arr-->
586+
<p>Group这是标题</p>
587+
<!--ms-for:(idx2, item2) in item1-->
588+
<div>内容1</div>
589+
<strong :class="'c-' + (idx1 < 1 ? 'red' : idx1 > 1 ? 'green' : 'blue')">
590+
内容2 {{ (idx1 < 1 ? 'red' : idx1 > 1 ? 'green' : 'blue') + '-' + item2 }}
591+
</strong>
592+
<!--ms-for-end:-->
593+
<!--ms-for-end:-->
594+
</div>
595+
*/
596+
})
597+
598+
vm = avalon.define({
599+
$id: 'for14',
600+
arr: [
601+
{a: 'a1', b: 'b1'}, {a: 'a2', b: 'b2'}, {a: 'a3', b: 'b3'}
602+
]
603+
});
604+
avalon.scan(div)
605+
setTimeout(function () {
606+
var strongs = div.getElementsByTagName('strong')
607+
expect(strongs.length).to.equal(6)
608+
done()
609+
}, 150)
610+
})
568611
})

‎src/avalon.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
var avalon = require('../dist/avalon')
2+
var avalon = require('../dist/avalon.modern')
33
require('../components/button/index')
44
require('../components/panel/index')
55

‎src/strategy/lexer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function lexer(str) {
5252
collectNodes(node, stack, ret)
5353
if (rmsForEnd.test(nodeValue)) {
5454
var p = stack.last()
55-
var nodes = p.children
55+
var nodes = p ? p.children: ret
5656
markeRepeatRange(nodes, nodes.pop())
5757
}
5858
}

0 commit comments

Comments
 (0)