File tree 4 files changed +19
-41
lines changed
4 files changed +19
-41
lines changed Original file line number Diff line number Diff line change 1
1
/*!
2
- * Vue.js v1.0.23
2
+ * Vue.js v1.0.24
3
3
* (c) 2016 Evan You
4
4
* Released under the MIT License.
5
5
*/
@@ -1135,22 +1135,11 @@ function query(el) {
1135
1135
* @return {Boolean }
1136
1136
*/
1137
1137
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 ) ) ;
1154
1143
}
1155
1144
1156
1145
/**
@@ -10024,7 +10013,7 @@ function installGlobalAPI (Vue) {
10024
10013
10025
10014
installGlobalAPI ( Vue ) ;
10026
10015
10027
- Vue . version = '1.0.23 ' ;
10016
+ Vue . version = '1.0.24 ' ;
10028
10017
10029
10018
// devtools global hook
10030
10019
/* istanbul ignore next */
Original file line number Diff line number Diff line change 1
1
/*!
2
- * Vue.js v1.0.23
2
+ * Vue.js v1.0.24
3
3
* (c) 2016 Evan You
4
4
* Released under the MIT License.
5
5
*/
@@ -1139,22 +1139,11 @@ var transition = Object.freeze({
1139
1139
* @return {Boolean }
1140
1140
*/
1141
1141
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 ) ) ;
1158
1147
}
1159
1148
1160
1149
/**
@@ -10021,7 +10010,7 @@ var template = Object.freeze({
10021
10010
10022
10011
installGlobalAPI ( Vue ) ;
10023
10012
10024
- Vue . version = '1.0.23 ' ;
10013
+ Vue . version = '1.0.24 ' ;
10025
10014
10026
10015
// devtools global hook
10027
10016
/* istanbul ignore next */
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ import config from './config'
5
5
6
6
installGlobalAPI ( Vue )
7
7
8
- Vue . version = '1.0.23 '
8
+ Vue . version = '1.0.24 '
9
9
10
10
export default Vue
11
11
You can’t perform that action at this time.
0 commit comments