Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 91a3c52

Browse files
aOrzaOrz
committed
new version 1.0.11
1 parent eee73cf commit 91a3c52

File tree

15 files changed

+212
-179
lines changed

15 files changed

+212
-179
lines changed

‎dist/vue.common.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,6 @@ function handleError (err, vm, info) {
553553
}
554554

555555
/* */
556-
/* globals MutationObserver */
557556

558557
// can we use __proto__?
559558
var hasProto = '__proto__' in {};
@@ -650,23 +649,23 @@ var nextTick = (function () {
650649
// "force" the microtask queue to be flushed by adding an empty timer.
651650
if (isIOS) { setTimeout(noop); }
652651
};
653-
} else if (typeof MutationObserver !== 'undefined' && (
654-
isNative(MutationObserver) ||
655-
// PhantomJS and iOS 7.x
656-
MutationObserver.toString() === '[object MutationObserverConstructor]'
657-
)) {
658-
// use MutationObserver where native Promise is not available,
659-
// e.g. PhantomJS IE11, iOS7, Android 4.4
660-
var counter = 1;
661-
var observer = new MutationObserver(nextTickHandler);
662-
var textNode = document.createTextNode(String(counter));
663-
observer.observe(textNode, {
664-
characterData: true
665-
});
666-
timerFunc = function () {
667-
counter = (counter + 1) % 2;
668-
textNode.data = String(counter);
669-
};
652+
// } else if (typeof MutationObserver !== 'undefined' && (
653+
// isNative(MutationObserver) ||
654+
// // PhantomJS and iOS 7.x
655+
// MutationObserver.toString() === '[object MutationObserverConstructor]'
656+
// )) {
657+
// // use MutationObserver where native Promise is not available,
658+
// // e.g. PhantomJS IE11, iOS7, Android 4.4
659+
// var counter = 1
660+
// var observer = new MutationObserver(nextTickHandler)
661+
// var textNode = document.createTextNode(String(counter))
662+
// observer.observe(textNode, {
663+
// characterData: true
664+
// })
665+
// timerFunc = () => {
666+
// counter = (counter + 1) % 2
667+
// textNode.data = String(counter)
668+
// }
670669
} else {
671670
// fallback to setTimeout
672671
/* istanbul ignore next */
@@ -4630,6 +4629,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
46304629
});
46314630

46324631
Vue$3.version = '2.4.1';
4632+
Vue$3.mpvueVersion = '1.0.8';
46334633

46344634
/* */
46354635

‎dist/vue.esm.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,6 @@ function handleError (err, vm, info) {
551551
}
552552

553553
/* */
554-
/* globals MutationObserver */
555554

556555
// can we use __proto__?
557556
var hasProto = '__proto__' in {};
@@ -648,23 +647,23 @@ var nextTick = (function () {
648647
// "force" the microtask queue to be flushed by adding an empty timer.
649648
if (isIOS) { setTimeout(noop); }
650649
};
651-
} else if (typeof MutationObserver !== 'undefined' && (
652-
isNative(MutationObserver) ||
653-
// PhantomJS and iOS 7.x
654-
MutationObserver.toString() === '[object MutationObserverConstructor]'
655-
)) {
656-
// use MutationObserver where native Promise is not available,
657-
// e.g. PhantomJS IE11, iOS7, Android 4.4
658-
var counter = 1;
659-
var observer = new MutationObserver(nextTickHandler);
660-
var textNode = document.createTextNode(String(counter));
661-
observer.observe(textNode, {
662-
characterData: true
663-
});
664-
timerFunc = function () {
665-
counter = (counter + 1) % 2;
666-
textNode.data = String(counter);
667-
};
650+
// } else if (typeof MutationObserver !== 'undefined' && (
651+
// isNative(MutationObserver) ||
652+
// // PhantomJS and iOS 7.x
653+
// MutationObserver.toString() === '[object MutationObserverConstructor]'
654+
// )) {
655+
// // use MutationObserver where native Promise is not available,
656+
// // e.g. PhantomJS IE11, iOS7, Android 4.4
657+
// var counter = 1
658+
// var observer = new MutationObserver(nextTickHandler)
659+
// var textNode = document.createTextNode(String(counter))
660+
// observer.observe(textNode, {
661+
// characterData: true
662+
// })
663+
// timerFunc = () => {
664+
// counter = (counter + 1) % 2
665+
// textNode.data = String(counter)
666+
// }
668667
} else {
669668
// fallback to setTimeout
670669
/* istanbul ignore next */
@@ -4628,6 +4627,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
46284627
});
46294628

46304629
Vue$3.version = '2.4.1';
4630+
Vue$3.mpvueVersion = '1.0.8';
46314631

46324632
/* */
46334633

‎dist/vue.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,6 @@ function handleError (err, vm, info) {
557557
}
558558

559559
/* */
560-
/* globals MutationObserver */
561560

562561
// can we use __proto__?
563562
var hasProto = '__proto__' in {};
@@ -654,23 +653,23 @@ var nextTick = (function () {
654653
// "force" the microtask queue to be flushed by adding an empty timer.
655654
if (isIOS) { setTimeout(noop); }
656655
};
657-
} else if (typeof MutationObserver !== 'undefined' && (
658-
isNative(MutationObserver) ||
659-
// PhantomJS and iOS 7.x
660-
MutationObserver.toString() === '[object MutationObserverConstructor]'
661-
)) {
662-
// use MutationObserver where native Promise is not available,
663-
// e.g. PhantomJS IE11, iOS7, Android 4.4
664-
var counter = 1;
665-
var observer = new MutationObserver(nextTickHandler);
666-
var textNode = document.createTextNode(String(counter));
667-
observer.observe(textNode, {
668-
characterData: true
669-
});
670-
timerFunc = function () {
671-
counter = (counter + 1) % 2;
672-
textNode.data = String(counter);
673-
};
656+
// } else if (typeof MutationObserver !== 'undefined' && (
657+
// isNative(MutationObserver) ||
658+
// // PhantomJS and iOS 7.x
659+
// MutationObserver.toString() === '[object MutationObserverConstructor]'
660+
// )) {
661+
// // use MutationObserver where native Promise is not available,
662+
// // e.g. PhantomJS IE11, iOS7, Android 4.4
663+
// var counter = 1
664+
// var observer = new MutationObserver(nextTickHandler)
665+
// var textNode = document.createTextNode(String(counter))
666+
// observer.observe(textNode, {
667+
// characterData: true
668+
// })
669+
// timerFunc = () => {
670+
// counter = (counter + 1) % 2
671+
// textNode.data = String(counter)
672+
// }
674673
} else {
675674
// fallback to setTimeout
676675
/* istanbul ignore next */
@@ -4619,6 +4618,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
46194618
});
46204619

46214620
Vue$3.version = '2.4.1';
4621+
Vue$3.mpvueVersion = '1.0.8';
46224622

46234623
/* */
46244624

‎dist/vue.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue.runtime.common.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,6 @@ function handleError (err, vm, info) {
549549
}
550550

551551
/* */
552-
/* globals MutationObserver */
553552

554553
// can we use __proto__?
555554
var hasProto = '__proto__' in {};
@@ -646,23 +645,23 @@ var nextTick = (function () {
646645
// "force" the microtask queue to be flushed by adding an empty timer.
647646
if (isIOS) { setTimeout(noop); }
648647
};
649-
} else if (typeof MutationObserver !== 'undefined' && (
650-
isNative(MutationObserver) ||
651-
// PhantomJS and iOS 7.x
652-
MutationObserver.toString() === '[object MutationObserverConstructor]'
653-
)) {
654-
// use MutationObserver where native Promise is not available,
655-
// e.g. PhantomJS IE11, iOS7, Android 4.4
656-
var counter = 1;
657-
var observer = new MutationObserver(nextTickHandler);
658-
var textNode = document.createTextNode(String(counter));
659-
observer.observe(textNode, {
660-
characterData: true
661-
});
662-
timerFunc = function () {
663-
counter = (counter + 1) % 2;
664-
textNode.data = String(counter);
665-
};
648+
// } else if (typeof MutationObserver !== 'undefined' && (
649+
// isNative(MutationObserver) ||
650+
// // PhantomJS and iOS 7.x
651+
// MutationObserver.toString() === '[object MutationObserverConstructor]'
652+
// )) {
653+
// // use MutationObserver where native Promise is not available,
654+
// // e.g. PhantomJS IE11, iOS7, Android 4.4
655+
// var counter = 1
656+
// var observer = new MutationObserver(nextTickHandler)
657+
// var textNode = document.createTextNode(String(counter))
658+
// observer.observe(textNode, {
659+
// characterData: true
660+
// })
661+
// timerFunc = () => {
662+
// counter = (counter + 1) % 2
663+
// textNode.data = String(counter)
664+
// }
666665
} else {
667666
// fallback to setTimeout
668667
/* istanbul ignore next */
@@ -4626,6 +4625,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
46264625
});
46274626

46284627
Vue$3.version = '2.4.1';
4628+
Vue$3.mpvueVersion = '1.0.8';
46294629

46304630
/* */
46314631

‎dist/vue.runtime.esm.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,6 @@ function handleError (err, vm, info) {
547547
}
548548

549549
/* */
550-
/* globals MutationObserver */
551550

552551
// can we use __proto__?
553552
var hasProto = '__proto__' in {};
@@ -644,23 +643,23 @@ var nextTick = (function () {
644643
// "force" the microtask queue to be flushed by adding an empty timer.
645644
if (isIOS) { setTimeout(noop); }
646645
};
647-
} else if (typeof MutationObserver !== 'undefined' && (
648-
isNative(MutationObserver) ||
649-
// PhantomJS and iOS 7.x
650-
MutationObserver.toString() === '[object MutationObserverConstructor]'
651-
)) {
652-
// use MutationObserver where native Promise is not available,
653-
// e.g. PhantomJS IE11, iOS7, Android 4.4
654-
var counter = 1;
655-
var observer = new MutationObserver(nextTickHandler);
656-
var textNode = document.createTextNode(String(counter));
657-
observer.observe(textNode, {
658-
characterData: true
659-
});
660-
timerFunc = function () {
661-
counter = (counter + 1) % 2;
662-
textNode.data = String(counter);
663-
};
646+
// } else if (typeof MutationObserver !== 'undefined' && (
647+
// isNative(MutationObserver) ||
648+
// // PhantomJS and iOS 7.x
649+
// MutationObserver.toString() === '[object MutationObserverConstructor]'
650+
// )) {
651+
// // use MutationObserver where native Promise is not available,
652+
// // e.g. PhantomJS IE11, iOS7, Android 4.4
653+
// var counter = 1
654+
// var observer = new MutationObserver(nextTickHandler)
655+
// var textNode = document.createTextNode(String(counter))
656+
// observer.observe(textNode, {
657+
// characterData: true
658+
// })
659+
// timerFunc = () => {
660+
// counter = (counter + 1) % 2
661+
// textNode.data = String(counter)
662+
// }
664663
} else {
665664
// fallback to setTimeout
666665
/* istanbul ignore next */
@@ -4624,6 +4623,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
46244623
});
46254624

46264625
Vue$3.version = '2.4.1';
4626+
Vue$3.mpvueVersion = '1.0.8';
46274627

46284628
/* */
46294629

‎dist/vue.runtime.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,6 @@ function handleError (err, vm, info) {
553553
}
554554

555555
/* */
556-
/* globals MutationObserver */
557556

558557
// can we use __proto__?
559558
var hasProto = '__proto__' in {};
@@ -650,23 +649,23 @@ var nextTick = (function () {
650649
// "force" the microtask queue to be flushed by adding an empty timer.
651650
if (isIOS) { setTimeout(noop); }
652651
};
653-
} else if (typeof MutationObserver !== 'undefined' && (
654-
isNative(MutationObserver) ||
655-
// PhantomJS and iOS 7.x
656-
MutationObserver.toString() === '[object MutationObserverConstructor]'
657-
)) {
658-
// use MutationObserver where native Promise is not available,
659-
// e.g. PhantomJS IE11, iOS7, Android 4.4
660-
var counter = 1;
661-
var observer = new MutationObserver(nextTickHandler);
662-
var textNode = document.createTextNode(String(counter));
663-
observer.observe(textNode, {
664-
characterData: true
665-
});
666-
timerFunc = function () {
667-
counter = (counter + 1) % 2;
668-
textNode.data = String(counter);
669-
};
652+
// } else if (typeof MutationObserver !== 'undefined' && (
653+
// isNative(MutationObserver) ||
654+
// // PhantomJS and iOS 7.x
655+
// MutationObserver.toString() === '[object MutationObserverConstructor]'
656+
// )) {
657+
// // use MutationObserver where native Promise is not available,
658+
// // e.g. PhantomJS IE11, iOS7, Android 4.4
659+
// var counter = 1
660+
// var observer = new MutationObserver(nextTickHandler)
661+
// var textNode = document.createTextNode(String(counter))
662+
// observer.observe(textNode, {
663+
// characterData: true
664+
// })
665+
// timerFunc = () => {
666+
// counter = (counter + 1) % 2
667+
// textNode.data = String(counter)
668+
// }
670669
} else {
671670
// fallback to setTimeout
672671
/* istanbul ignore next */
@@ -4615,6 +4614,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
46154614
});
46164615

46174616
Vue$3.version = '2.4.1';
4617+
Vue$3.mpvueVersion = '1.0.8';
46184618

46194619
/* */
46204620

‎dist/vue.runtime.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/mpvue-template-compiler/build.js

+17-3
Original file line numberDiff line numberDiff line change
@@ -4250,7 +4250,10 @@ var wxmlDirectiveMap = {
42504250
name: '',
42514251
type: 1
42524252
},
4253-
'v-html': noSupport,
4253+
'v-html': {
4254+
name: '',
4255+
type: 1
4256+
},
42544257
'v-on': {
42554258
name: '',
42564259
map: {
@@ -4334,7 +4337,7 @@ var objectToStringVisitor = {
43344337
var key = keyStr ? hyphenate(keyStr) : keyStr;
43354338
var ref = generate(t.ExpressionStatement(propertyItem.value));
43364339
var val = ref.code;
4337-
return ("'" + key + ":' + " + (val.slice(0, -1)) + " + ';'")
4340+
return ("'" + key + ":' + (" + (val.slice(0, -1)) + ") + ';'")
43384341
}).join('+');
43394342

43404343
var p = template(expression)({});
@@ -4399,6 +4402,9 @@ var attrs = {
43994402
text: ("{{" + val + "}}"),
44004403
type: 3
44014404
});
4405+
} else if (key === 'v-html') {
4406+
ast.tag = 'rich-text';
4407+
attrs['nodes'] = "{{" + val + "}}";
44024408
} else if (key === 'v-show') {
44034409
attrs['hidden'] = "{{!(" + val + ")}}";
44044410
} else if (/^v\-on\:/i.test(key)) {
@@ -4472,7 +4478,15 @@ var attrs = {
44724478
wxmlEventName = eventMap.map[eventName];
44734479
}
44744480

4475-
wxmlEventName = (eventNameMap.includes('stop') ? 'catch' : 'bind') + (wxmlEventName || eventName);
4481+
var eventType = 'bind';
4482+
var isStop = eventNameMap.includes('stop');
4483+
if (eventNameMap.includes('capture')) {
4484+
eventType = isStop ? 'capture-catch:' : 'capture-bind:';
4485+
} else if (isStop) {
4486+
eventType = 'catch';
4487+
}
4488+
4489+
wxmlEventName = eventType + (wxmlEventName || eventName);
44764490
attrs[wxmlEventName] = 'handleProxy';
44774491

44784492
return attrs

‎packages/mpvue-template-compiler/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mpvue-template-compiler",
3-
"version": "1.0.8",
3+
"version": "1.0.11",
44
"description": "mpvue template compiler for Vue",
55
"main": "index.js",
66
"repository": {

0 commit comments

Comments
 (0)