Skip to content

Commit e3523d7

Browse files
committed
[build] 1.0.24
1 parent b913aab commit e3523d7

File tree

4 files changed

+19
-41
lines changed

4 files changed

+19
-41
lines changed

dist/vue.common.js

+7-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v1.0.23
2+
* Vue.js v1.0.24
33
* (c) 2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -1135,22 +1135,11 @@ function query(el) {
11351135
* @return {Boolean}
11361136
*/
11371137

1138-
function inDoc(node, win) {
1139-
win = win || window;
1140-
var doc = win.document.documentElement;
1141-
var parent = node && node.parentNode;
1142-
var isInDoc = doc === node || doc === parent || !!(parent && parent.nodeType === 1 && doc.contains(parent));
1143-
if (!isInDoc) {
1144-
var frames = win.frames;
1145-
if (frames) {
1146-
for (var i = 0; i < frames.length; i++) {
1147-
if (inDoc(node, frames[i])) {
1148-
return true;
1149-
}
1150-
}
1151-
}
1152-
}
1153-
return isInDoc;
1138+
function inDoc(node) {
1139+
if (!node) return false;
1140+
var doc = node.ownerDocument.documentElement;
1141+
var parent = node.parentNode;
1142+
return doc === node || doc === parent || !!(parent && parent.nodeType === 1 && doc.contains(parent));
11541143
}
11551144

11561145
/**
@@ -10024,7 +10013,7 @@ function installGlobalAPI (Vue) {
1002410013

1002510014
installGlobalAPI(Vue);
1002610015

10027-
Vue.version = '1.0.23';
10016+
Vue.version = '1.0.24';
1002810017

1002910018
// devtools global hook
1003010019
/* istanbul ignore next */

dist/vue.js

+7-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v1.0.23
2+
* Vue.js v1.0.24
33
* (c) 2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -1139,22 +1139,11 @@ var transition = Object.freeze({
11391139
* @return {Boolean}
11401140
*/
11411141

1142-
function inDoc(node, win) {
1143-
win = win || window;
1144-
var doc = win.document.documentElement;
1145-
var parent = node && node.parentNode;
1146-
var isInDoc = doc === node || doc === parent || !!(parent && parent.nodeType === 1 && doc.contains(parent));
1147-
if (!isInDoc) {
1148-
var frames = win.frames;
1149-
if (frames) {
1150-
for (var i = 0; i < frames.length; i++) {
1151-
if (inDoc(node, frames[i])) {
1152-
return true;
1153-
}
1154-
}
1155-
}
1156-
}
1157-
return isInDoc;
1142+
function inDoc(node) {
1143+
if (!node) return false;
1144+
var doc = node.ownerDocument.documentElement;
1145+
var parent = node.parentNode;
1146+
return doc === node || doc === parent || !!(parent && parent.nodeType === 1 && doc.contains(parent));
11581147
}
11591148

11601149
/**
@@ -10021,7 +10010,7 @@ var template = Object.freeze({
1002110010

1002210011
installGlobalAPI(Vue);
1002310012

10024-
Vue.version = '1.0.23';
10013+
Vue.version = '1.0.24';
1002510014

1002610015
// devtools global hook
1002710016
/* istanbul ignore next */

dist/vue.min.js

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

src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import config from './config'
55

66
installGlobalAPI(Vue)
77

8-
Vue.version = '1.0.23'
8+
Vue.version = '1.0.24'
99

1010
export default Vue
1111

0 commit comments

Comments
 (0)