リビジョン | 4e5a06c9c610f8d3777f9d2eef71ec1365ffff1b (tree) |
---|---|
日時 | 2014-07-16 01:04:23 |
作者 | itozyun <itozyun@user...> |
コミッター | itozyun |
Version 0.6.57, fixed NS of X.UI & X.Class for proto.
@@ -17,7 +17,7 @@ X.Class = ( function(){ | ||
17 | 17 | CONSTRUCTOR = 'Constructor', |
18 | 18 | killPrivateFlag = false, |
19 | 19 | traits = null, |
20 | - _slice = Array.prototype.slice; | |
20 | + use__proto__ = !!X.emptyFunction.prototype.__proto__; | |
21 | 21 | |
22 | 22 | /* サブクラスを作るメソッド |
23 | 23 | * var subClass = superClass.inherits( ... ) |
@@ -63,9 +63,13 @@ X.Class = ( function(){ | ||
63 | 63 | params.push( args[ 0 ] ); /* props サブクラスでは未定義でも可 */ |
64 | 64 | |
65 | 65 | // 継承クラスの作成 |
66 | - Super.__new = null; | |
67 | - traits = new Super(); | |
68 | - Super.__new = C; | |
66 | + if( use__proto__ ){ | |
67 | + traits = Super.prototype; | |
68 | + } else { | |
69 | + Super.__new = null; | |
70 | + traits = new Super(); | |
71 | + Super.__new = C; | |
72 | + }; | |
69 | 73 | klass = X.Class.create.apply( X.Class, params ); |
70 | 74 | traits = null; |
71 | 75 |
@@ -243,9 +247,16 @@ X.Class = ( function(){ | ||
243 | 247 | klass.superClassOf = X.Class._superClassOf; |
244 | 248 | klass.subClassOf = X.Class._subClassOf; |
245 | 249 | |
246 | - if( X.UA.Safari && X.UA.Safari < 3 ){ // TODO Gecko もこちらへ | |
247 | - X.Class._override( X.Class._override( traits || klass.prototype, props, true ), CommonProps, false ); | |
248 | - if( traits ) klass.prototype.__proto__ = traits; | |
250 | + if( use__proto__ ){ | |
251 | + X.Class._override( klass.prototype, props, true ); | |
252 | + if( traits ){ | |
253 | + klass.prototype.__proto__ = traits; | |
254 | + } else { | |
255 | + X.Class._override( klass.prototype, CommonProps, false ); | |
256 | + }; | |
257 | + //if( X.UA.Safari && X.UA.Safari < 3 ){ // TODO Gecko もこちらへ | |
258 | + // X.Class._override( X.Class._override( traits || klass.prototype, props, true ), CommonProps, false ); | |
259 | + // if( traits ) klass.prototype.__proto__ = traits; | |
249 | 260 | } else { |
250 | 261 | klass.prototype = X.Class._override( X.Class._override( traits || klass.prototype, props, true ), CommonProps, false ); |
251 | 262 | klass.prototype.constructor = klass; |
@@ -78,7 +78,7 @@ X.Dom = X.Class._override( | ||
78 | 78 | new Node( document.all.tags( 'html' )[ 0 ] ) : |
79 | 79 | null; |
80 | 80 | |
81 | - r = Node.root = new Node( document.body ); | |
81 | + r = Node._body = new Node( document.body ); | |
82 | 82 | h.appendTo = h.appendToRoot = h.before = h.after = h.clone = h.remove = h.destroy = h.prevNode = h.nextNode = h.createText = h.append = h.appendAt = h.empty = h.html = h.text = |
83 | 83 | r.appendTo = r.appendToRoot = r.before = r.after = r.clone = r.remove = r.destroy = r.prevNode = r.nextNode = new Function( 'return this' ); |
84 | 84 |
@@ -94,7 +94,7 @@ X.Dom = X.Class._override( | ||
94 | 94 | X.Dom.listenOnce( X.Dom.Event.DOM_BUILDER_COMPLETE, function(){ |
95 | 95 | X.Dom.readyState = X.Dom.Event.DOM_INIT; |
96 | 96 | //X.UA.Opera7 && alert( 'bc' ); |
97 | - Node.root.appendAt( 0, | |
97 | + Node._body.appendAt( 0, | |
98 | 98 | Node._systemNode = Node.create( 'div', { 'class' : 'hidden-system-node' } ), |
99 | 99 | Node._fontSizeNode = Node.create( 'div', { 'class' : 'hidden-system-node' } ).cssText( 'line-height:1;height:1em;' ).text( 'X' ) |
100 | 100 | )._startUpdate(); |
@@ -219,7 +219,7 @@ X.Dom = X.Class._override( | ||
219 | 219 | //http://onozaty.hatenablog.com/entry/20060803/p1 |
220 | 220 | // Safari2.0.4では標準・互換どちらも document.body |
221 | 221 | |
222 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
222 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
223 | 223 | /*X.UA.Opera ? |
224 | 224 | ( document.documentElement && document.documentElement.clientWidth ? |
225 | 225 | new Function( 'return[document.documentElement.clientWidth,document.documentElement.clientHeight]' ) : |
@@ -234,16 +234,16 @@ X.Dom = X.Class._override( | ||
234 | 234 | getScrollPosition : |
235 | 235 | window.pageXOffset !== undefined ? |
236 | 236 | ( function(){ |
237 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
237 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
238 | 238 | return[ window.pageXOffset, window.pageYOffset ]; |
239 | 239 | } ) : |
240 | 240 | window.scrollLeft !== undefined ? |
241 | 241 | ( function(){ |
242 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
242 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
243 | 243 | return[ window.scrollLeft, window.scrollTop ]; |
244 | 244 | } ) : |
245 | 245 | ( function(){ |
246 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
246 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
247 | 247 | // body は Safari2- |
248 | 248 | return[ X.Dom._root.scrollLeft || document.body.scrollLeft, X.Dom._root.scrollTop || document.body.scrollTop ]; |
249 | 249 | } ), |
@@ -297,6 +297,9 @@ if( document.layers ){ | ||
297 | 297 | |
298 | 298 | }; |
299 | 299 | |
300 | +X.Dom.EVENT_POINTER = navigator.msPointerEnabled || navigator.pointerEnabled; | |
301 | +X.Dom.EVENT_TOUCH = !X.Dom.EVENT_POINTER && window.ontouchstart !== undefined; | |
302 | + | |
300 | 303 | X.Dom.moveToHead = { |
301 | 304 | STYLE : true, |
302 | 305 | LINK : true, |
@@ -239,7 +239,7 @@ Node.createText = function( text ){ | ||
239 | 239 | |
240 | 240 | Node.getRoot = function( xnode ){ |
241 | 241 | return Node._document; |
242 | - //return xnode.root._rawNode.documentElement ? node : node.ownerDocument || node.document; | |
242 | + //return xNode._body._rawNode.documentElement ? node : node.ownerDocument || node.document; | |
243 | 243 | }; |
244 | 244 | // XMLかどうかを判別する |
245 | 245 | Node.isXmlDocument = |
@@ -255,7 +255,7 @@ Node.none = Node._chashe[ 0 ] = new Node(); | ||
255 | 255 | Node._window = new Node( window ); // Node._chashe[ 1 ] |
256 | 256 | Node._document = new Node( document ); // Node._chashe[ 2 ] |
257 | 257 | Node._html = null; // Node._chashe[ 3 ] |
258 | -Node.root = null;// = Node._chashe[ 4 ] body | |
258 | +Node._body = null;// = Node._chashe[ 4 ] body | |
259 | 259 | Node._systemNode = null;// = Node._chashe[ ? ] |
260 | 260 | |
261 | 261 | Node._reserveRemoval = []; |
@@ -469,7 +469,7 @@ Node.prototype.appendTo = function( parent, opt_index ){ | ||
469 | 469 | }; |
470 | 470 | |
471 | 471 | Node.prototype.appendToRoot = function( opt_index ){ |
472 | - opt_index === undefined ? Node.root.append( this ) : Node.root.appendAt( opt_index, this ); | |
472 | + opt_index === undefined ? Node._body.append( this ) : Node._body.appendAt( opt_index, this ); | |
473 | 473 | return this; |
474 | 474 | }; |
475 | 475 |
@@ -821,7 +821,7 @@ Node.prototype.each = function( func ){ | ||
821 | 821 | */ |
822 | 822 | |
823 | 823 | Node.prototype._reserveUpdate = function(){ |
824 | - var root = Node.root; | |
824 | + var root = Node._body; | |
825 | 825 | if( root && !root._updateTimerID ) root._updateTimerID = X.Timer.requestFrame( root, root._startUpdate ); |
826 | 826 | }; |
827 | 827 |
@@ -177,19 +177,72 @@ X.Dom.Event.RenameTo = {}; | ||
177 | 177 | // https://github.com/georgeadamson/jQuery.prefixfree-events/blob/master/jQuery.prefixfree-events.js |
178 | 178 | |
179 | 179 | if( window.onwebkitanimationend !== undefined && window.onanimationend === undefined ){ |
180 | - X.Dom.Event.Rename[ 'animationend' ] = 'webkitAnimationEnd'; | |
180 | + X.Dom.Event.Rename[ 'animationend' ] = 'webkitAnimationEnd'; | |
181 | 181 | X.Dom.Event.RenameTo[ 'webkitAnimationEnd' ] = 'animationend'; |
182 | - X.Dom.Event.Rename[ 'animationstart' ] = 'webkitAnimationStart'; | |
182 | + X.Dom.Event.Rename[ 'animationstart' ] = 'webkitAnimationStart'; | |
183 | 183 | X.Dom.Event.RenameTo[ 'webkitAnimationStart' ] = 'animationstart'; |
184 | - X.Dom.Event.Rename[ 'animationiteration' ] = 'webkitAnimationIteration'; | |
184 | + X.Dom.Event.Rename[ 'animationiteration' ] = 'webkitAnimationIteration'; | |
185 | 185 | X.Dom.Event.RenameTo[ 'webkitAnimationIteration' ] = 'animationiteration'; |
186 | +} else | |
187 | +if( window.onoanimationend !== undefined && window.onanimationend === undefined ){ | |
188 | + X.Dom.Event.Rename[ 'animationend' ] = 'oAnimationEnd'; | |
189 | + X.Dom.Event.RenameTo[ 'oAnimationEnd' ] = 'animationend'; | |
190 | + X.Dom.Event.Rename[ 'animationstart' ] = 'oAnimationStart'; | |
191 | + X.Dom.Event.RenameTo[ 'oAnimationStart' ] = 'animationstart'; | |
192 | + X.Dom.Event.Rename[ 'animationiteration' ] = 'oAnimationIteration'; | |
193 | + X.Dom.Event.RenameTo[ 'oAnimationIteration' ] = 'animationiteration'; | |
194 | +} else | |
195 | +/* | |
196 | +if( window.onmozanimationend !== undefined && window.onanimationend === undefined ){ | |
197 | + X.Dom.Event.Rename[ 'animationend' ] = 'mozAnimationEnd'; | |
198 | + X.Dom.Event.RenameTo[ 'mozAnimationEnd' ] = 'animationend'; | |
199 | + X.Dom.Event.Rename[ 'animationstart' ] = 'mozAnimationStart'; | |
200 | + X.Dom.Event.RenameTo[ 'mozAnimationStart' ] = 'animationstart'; | |
201 | + X.Dom.Event.Rename[ 'animationiteration' ] = 'mozAnimationIteration'; | |
202 | + X.Dom.Event.RenameTo[ 'mozAnimationIteration' ] = 'animationiteration'; | |
203 | +} else*/ | |
204 | +if( document.documentElement && document.documentElement.style.msAnimation !== undefined && document.documentElement.style.animation === undefined ){ //document.documentElement.style.msAnimation | |
205 | + X.Dom.Event.Rename[ 'animationend' ] = 'MSAnimationEnd'; | |
206 | + X.Dom.Event.RenameTo[ 'MSAnimationEnd' ] = 'animationend'; | |
207 | + X.Dom.Event.Rename[ 'animationstart' ] = 'MSAnimationStart'; | |
208 | + X.Dom.Event.RenameTo[ 'MSAnimationStart' ] = 'animationstart'; | |
209 | + X.Dom.Event.Rename[ 'animationiteration' ] = 'MSAnimationIteration'; | |
210 | + X.Dom.Event.RenameTo[ 'MSAnimationIteration' ] = 'animationiteration'; | |
186 | 211 | }; |
187 | - | |
212 | +// https://developer.mozilla.org/en-US/docs/Web/Events/transitionend | |
213 | +// chrome1+, firefox4+, IE10+, Opera10.5+, Safari3.2+, Android2.1+ | |
188 | 214 | if( window.onwebkittransitionend !== undefined && window.ontransitionend === undefined ){ |
189 | - X.Dom.Event.Rename[ 'transitionend' ] = 'webkitTransitionEnd'; | |
215 | + X.Dom.Event.Rename[ 'transitionend' ] = 'webkitTransitionEnd'; | |
190 | 216 | X.Dom.Event.RenameTo[ 'webkitTransitionEnd' ] = 'transitionend'; |
217 | +} else | |
218 | +if( window.onotransitionend !== undefined && window.ontransitionend === undefined ){ | |
219 | + if( X.UA.Opera < 12 ){ | |
220 | + X.Dom.Event.Rename[ 'transitionend' ] = 'oTransitionEnd'; | |
221 | + X.Dom.Event.RenameTo[ 'oTransitionEnd' ] = 'transitionend'; | |
222 | + } else { | |
223 | + X.Dom.Event.Rename[ 'transitionend' ] = 'otransitionEnd'; | |
224 | + X.Dom.Event.RenameTo[ 'otransitionEnd' ] = 'transitionend'; | |
225 | + }; | |
226 | +} else | |
227 | +if( window.onmoztransitionend !== undefined && window.ontransitionend === undefined ){ | |
228 | + X.Dom.Event.Rename[ 'transitionend' ] = 'mozTransitionEnd'; | |
229 | + X.Dom.Event.RenameTo[ 'mozTransitionEnd' ] = 'transitionend'; | |
191 | 230 | }; |
192 | 231 | |
232 | + | |
233 | +if( navigator.msPointerEnabled && !navigator.pointerEnabled ){ | |
234 | + X.Dom.Event.Rename[ 'pointerdown' ] = 'MSPointerDown'; | |
235 | + X.Dom.Event.RenameTo[ 'MSPointerDown' ] = 'pointerdown'; | |
236 | + X.Dom.Event.Rename[ 'pointerup' ] = 'MSPointerUp'; | |
237 | + X.Dom.Event.RenameTo[ 'MSPointerUp' ] = 'pointerup'; | |
238 | + X.Dom.Event.Rename[ 'pointermove' ] = 'MSPointerMove'; | |
239 | + X.Dom.Event.RenameTo[ 'MSPointerMove' ] = 'pointermove'; | |
240 | + X.Dom.Event.Rename[ 'pointercancel' ] = 'MSPointerCancel'; | |
241 | + X.Dom.Event.RenameTo[ 'MSPointerCancel' ] = 'pointercancel'; | |
242 | +}; | |
243 | + | |
244 | + | |
245 | + | |
193 | 246 | X.Dom.Node.prototype.listen = function( type, arg1, arg2, arg3 /* [ listener || ( context + function ) || function ][ arguments ] */ ){ |
194 | 247 | var elm; |
195 | 248 |
@@ -82,7 +82,7 @@ Node.prototype.width = function(){ | ||
82 | 82 | console.log( 'xnode.width() : no parent' ); |
83 | 83 | return 0; |
84 | 84 | }; |
85 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
85 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
86 | 86 | if( !this._root ){ |
87 | 87 | console.log( 'xnode.width() : not belong tree.' ); |
88 | 88 | return 0; |
@@ -104,7 +104,7 @@ Node.prototype.height = function(){ | ||
104 | 104 | console.log( 'xnode.height() : no parent' ); |
105 | 105 | return 0; |
106 | 106 | }; |
107 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
107 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
108 | 108 | if( !this._root ){ |
109 | 109 | console.log( 'xnode.height() : not belong tree.' ); |
110 | 110 | return 0; |
@@ -126,7 +126,7 @@ Node.prototype.scrollWidth = function(){ | ||
126 | 126 | console.log( 'xnode.width() : no parent' ); |
127 | 127 | return 0; |
128 | 128 | }; |
129 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
129 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
130 | 130 | if( !this._root ){ |
131 | 131 | console.log( 'xnode.width() : not belong tree.' ); |
132 | 132 | return 0; |
@@ -148,7 +148,7 @@ Node.prototype.scrollHeight = function(){ | ||
148 | 148 | console.log( 'xnode.height() : no parent' ); |
149 | 149 | return 0; |
150 | 150 | }; |
151 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
151 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
152 | 152 | if( !this._root ){ |
153 | 153 | console.log( 'xnode.height() : not belong tree.' ); |
154 | 154 | return 0; |
@@ -170,7 +170,7 @@ Node.prototype.scrollLeft = function(){ | ||
170 | 170 | console.log( 'xnode.scrollLeft() : no parent' ); |
171 | 171 | return 0; |
172 | 172 | }; |
173 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
173 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
174 | 174 | if( !this._root ){ |
175 | 175 | console.log( 'xnode.scrollLeft() : not belong tree.' ); |
176 | 176 | return 0; |
@@ -192,7 +192,7 @@ Node.prototype.scrollTop = function(){ | ||
192 | 192 | console.log( 'xnode.scrollTop() : no parent' ); |
193 | 193 | return 0; |
194 | 194 | }; |
195 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
195 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
196 | 196 | if( !this._root ){ |
197 | 197 | console.log( 'xnode.scrollTop() : not belong tree.' ); |
198 | 198 | return 0; |
@@ -222,7 +222,7 @@ Node.prototype.x = function(){ | ||
222 | 222 | console.log( 'xnode.x() : no parent' ); |
223 | 223 | return 0; |
224 | 224 | }; |
225 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
225 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
226 | 226 | if( !this._root ){ |
227 | 227 | console.log( 'xnode.x() : not belong tree.' ); |
228 | 228 | return 0; |
@@ -245,7 +245,7 @@ Node.prototype.y = function(){ | ||
245 | 245 | console.log( 'xnode.y() : no parent' ); |
246 | 246 | return 0; |
247 | 247 | }; |
248 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
248 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
249 | 249 | if( !this._root ){ |
250 | 250 | console.log( 'xnode.y() : not belong tree.' ); |
251 | 251 | return 0; |
@@ -1075,23 +1075,23 @@ X.Dom.Node.prototype.cssText = function( v ){ | ||
1075 | 1075 | X.Dom.Node.prototype._getCharSize = |
1076 | 1076 | window.getComputedStyle ? |
1077 | 1077 | (function(){ |
1078 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
1079 | - if( this === Node.root && X.Dom.baseFontSize ) return X.Dom.baseFontSize; | |
1078 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
1079 | + if( this === Node._body && X.Dom.baseFontSize ) return X.Dom.baseFontSize; | |
1080 | 1080 | if( this._fontSize ) return this._fontSize; |
1081 | 1081 | return this._fontSize = parseFloat( getComputedStyle( this._rawNode, null ).fontSize ); |
1082 | 1082 | }) : |
1083 | 1083 | document.defaultView && document.defaultView.getComputedStyle ? |
1084 | 1084 | (function(){ |
1085 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
1086 | - if( this === Node.root && X.Dom.baseFontSize ) return X.Dom.baseFontSize; | |
1085 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
1086 | + if( this === Node._body && X.Dom.baseFontSize ) return X.Dom.baseFontSize; | |
1087 | 1087 | if( this._fontSize ) return this._fontSize; |
1088 | 1088 | return this._fontSize = parseFloat( document.defaultView.getComputedStyle( this._rawNode, null ).fontSize ); |
1089 | 1089 | }) : |
1090 | 1090 | X.UA.IE && 5.5 <= X.UA.IE ? |
1091 | 1091 | (function(){ |
1092 | 1092 | var font, vu, v, u, _v; |
1093 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
1094 | - if( this === Node.root && X.Dom.baseFontSize ) return X.Dom.baseFontSize; | |
1093 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
1094 | + if( this === Node._body && X.Dom.baseFontSize ) return X.Dom.baseFontSize; | |
1095 | 1095 | if( this._fontSize ) return this._fontSize; |
1096 | 1096 | |
1097 | 1097 | font = this._rawNode.currentStyle.fontSize; |
@@ -1121,8 +1121,8 @@ X.Dom.Node.prototype._getCharSize = | ||
1121 | 1121 | X.Dom.DOM_W3C ? |
1122 | 1122 | (function(){ |
1123 | 1123 | var elm, v; |
1124 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
1125 | - if( this === Node.root && X.Dom.baseFontSize ) return X.Dom.baseFontSize; | |
1124 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
1125 | + if( this === Node._body && X.Dom.baseFontSize ) return X.Dom.baseFontSize; | |
1126 | 1126 | if( this._fontSize ) return this._fontSize; |
1127 | 1127 | |
1128 | 1128 | this._rawNode.appendChild( elm = document.createElement( 'span' ) ); |
@@ -1135,8 +1135,8 @@ X.Dom.Node.prototype._getCharSize = | ||
1135 | 1135 | X.Dom.DOM_IE4 ? |
1136 | 1136 | (function(){ |
1137 | 1137 | var font, vu, v, u, _v; |
1138 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
1139 | - if( this === Node.root && X.Dom.baseFontSize ) return X.Dom.baseFontSize; | |
1138 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
1139 | + if( this === Node._body && X.Dom.baseFontSize ) return X.Dom.baseFontSize; | |
1140 | 1140 | if( this._fontSize ) return this._fontSize; |
1141 | 1141 | |
1142 | 1142 | if( this._css && ( font = this._css.fontSize ) ){ |
@@ -1169,8 +1169,8 @@ X.Dom.Node.prototype._getCharSize = | ||
1169 | 1169 | }) : |
1170 | 1170 | (function(){ |
1171 | 1171 | var elm, v; |
1172 | - if( this === Node.root && X.Dom.baseFontSize ) return X.Dom.baseFontSize; | |
1173 | - Node.root._updateTimerID && Node.root._startUpdate(); | |
1172 | + if( this === Node._body && X.Dom.baseFontSize ) return X.Dom.baseFontSize; | |
1173 | + Node._body._updateTimerID && Node._body._startUpdate(); | |
1174 | 1174 | if( this._fontSize ) return this._fontSize; |
1175 | 1175 | |
1176 | 1176 | elm = this._rawNode || this._ie4getRawNode(); |
@@ -207,7 +207,7 @@ X.Dom.Query._parse = function( query, last ){ | ||
207 | 207 | // セレクター |
208 | 208 | X.Dom.find = X._shortcut = Node.prototype.find = X.Dom.NodeList.prototype.find = function( queryString ){ |
209 | 209 | var HTML = Node._html, |
210 | - scope = this.constructor === X.Dom.NodeList && this.length ? this : [ this.constructor === Node ? this : Node.root ], | |
210 | + scope = this.constructor === X.Dom.NodeList && this.length ? this : [ this.constructor === Node ? this : Node._body ], | |
211 | 211 | parents = scope, // 探索元の親要素 XNodeList の場合あり |
212 | 212 | noLower = 'title id name class for action archive background cite classid codebase data href longdesc profile src usemap',// + X.Dom.DTD.ATTR_VAL_IS_URI.join( ' ' ), |
213 | 213 | ARY_PUSH = Array.prototype.push, |
@@ -22,7 +22,7 @@ X.Dom.Image = { | ||
22 | 22 | position : 'absolute' |
23 | 23 | } |
24 | 24 | ); |
25 | - Node.root._startUpdate(); | |
25 | + Node._body._startUpdate(); | |
26 | 26 | img = xnode._ie4getRawNode ? xnode._ie4getRawNode() : xnode._rawNode; |
27 | 27 | remove = true; |
28 | 28 | } else { |
@@ -108,7 +108,7 @@ if( X.UA.Opera7 ){ | ||
108 | 108 | X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT, |
109 | 109 | X.Dom.DOM_W3C ? |
110 | 110 | (function(){ |
111 | - var r = Node.root, | |
111 | + var r = Node._body, | |
112 | 112 | body = r._rawNode, |
113 | 113 | copy, i, l, node, html, |
114 | 114 | elmProgress; |
@@ -195,17 +195,17 @@ X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT, | ||
195 | 195 | } |
196 | 196 | ) |
197 | 197 | .listenOnce( X.Event.SUCCESS, function( e ){ |
198 | - var xnodes = Node.root._xnodes = [], t; | |
198 | + var xnodes = Node._body._xnodes = [], t; | |
199 | 199 | xnodes.push.apply( xnodes, e.xnodes ); |
200 | 200 | elmProgress.style.width = '100%'; |
201 | 201 | |
202 | - X.Dom._asyncCreateTree( Node.root, body.childNodes, elmProgress ); | |
202 | + X.Dom._asyncCreateTree( Node._body, body.childNodes, elmProgress ); | |
203 | 203 | } ); |
204 | 204 | |
205 | 205 | }) : |
206 | 206 | X.Dom.DOM_IE4 ? |
207 | 207 | (function(){ |
208 | - var r = Node.root, | |
208 | + var r = Node._body, | |
209 | 209 | body = r._rawNode, |
210 | 210 | elmProgress = '_xdom_builder_progress', |
211 | 211 | html; |
@@ -228,11 +228,11 @@ X.Dom.DOM_IE4 ? | ||
228 | 228 | ) |
229 | 229 | .listenOnce( X.Event.SUCCESS, |
230 | 230 | function( e ){ |
231 | - var xnodes = Node.root._xnodes = [], t; | |
231 | + var xnodes = Node._body._xnodes = [], t; | |
232 | 232 | xnodes.push.apply( xnodes, e.xnodes ); |
233 | 233 | elmProgress.style.width = '100%'; |
234 | 234 | |
235 | - X.Dom._asyncCreateTree( Node.root, body.childNodes || body.children, elmProgress ); | |
235 | + X.Dom._asyncCreateTree( Node._body, body.childNodes || body.children, elmProgress ); | |
236 | 236 | } |
237 | 237 | ); |
238 | 238 | }) : |
@@ -1,19 +1,19 @@ | ||
1 | -root = PageRoot( | |
2 | - Box({ | |
1 | +root = X.UI.PageRoot( | |
2 | + X.UI.Box({ | |
3 | 3 | width : '10%', |
4 | 4 | height : '10%', |
5 | 5 | left : 5, |
6 | 6 | top : 1, |
7 | 7 | bgColor : 0x0000ff |
8 | 8 | }), |
9 | - Box({ | |
9 | + X.UI.Box({ | |
10 | 10 | width : 5, |
11 | 11 | height : 5, |
12 | 12 | left : '10%', |
13 | 13 | bottom : '70%', |
14 | 14 | bgColor : 0xff0000 |
15 | 15 | }), |
16 | - VBox( | |
16 | + X.UI.VBox( | |
17 | 17 | { |
18 | 18 | width : '50%', |
19 | 19 | left : '49%', |
@@ -26,15 +26,15 @@ root = PageRoot( | ||
26 | 26 | padding : [ 4, 1 ], |
27 | 27 | sizing : 'border' |
28 | 28 | }, |
29 | - Box({ | |
29 | + X.UI.Box({ | |
30 | 30 | width : '50%', |
31 | 31 | height : 2, |
32 | 32 | left : '25%', |
33 | 33 | bgColor : 0x999999 |
34 | 34 | }), |
35 | - Text( 'Hello, world!', { width : '100%' } ), | |
36 | - Text( '----------------------------', { width : '100%' } ), | |
37 | - text = Text( 'PettanR-team. rrrrrrrrrr', { width : '100%' } ) | |
35 | + X.UI.Text( 'Hello, world!', { width : '100%' } ), | |
36 | + X.UI.Text( '----------------------------', { width : '100%' } ), | |
37 | + text = X.UI.Text( 'PettanR-team. rrrrrrrrrr', { width : '100%' } ) | |
38 | 38 | .listen( X.UI.Event.TAP, _onClick ) |
39 | 39 | ) |
40 | 40 | ); |
@@ -173,7 +173,7 @@ X.UI.AttrClass = function( opt_supports, opt_attrs ){ | ||
173 | 173 | // setAttr に書き換え |
174 | 174 | X.UI.attrClassProto = proto; |
175 | 175 | for( p in opt_attrs ){ |
176 | - _AbstractUINode.prototype.setAttr( p, opt_supports[ p ], opt_attrs[ p ] ); | |
176 | + X.UI._AbstractUINode.prototype.setAttr( p, opt_supports[ p ], opt_attrs[ p ] ); | |
177 | 177 | }; |
178 | 178 | X.UI.attrClassProto = null; |
179 | 179 | return klass; |
@@ -1,21 +1,18 @@ | ||
1 | 1 | |
2 | - | |
3 | -X.UI.i = X.Dom.Event._LAST_EVENT; | |
4 | - | |
5 | 2 | X.UI.Event = { |
6 | 3 | |
7 | - INIT : ++X.UI.i, | |
8 | - ADDED : ++X.UI.i, | |
9 | - CREATION_COMPLETE : ++X.UI.i, | |
10 | - REMOVED : ++X.UI.i, | |
4 | + INIT : ++X.Dom.Event._LAST_EVENT, | |
5 | + ADDED : ++X.Dom.Event._LAST_EVENT, | |
6 | + CREATION_COMPLETE : ++X.Dom.Event._LAST_EVENT, | |
7 | + REMOVED : ++X.Dom.Event._LAST_EVENT, | |
11 | 8 | |
12 | 9 | // http://d.hatena.ne.jp/edvakf/20100205/1265338487 |
13 | 10 | // http://d.hatena.ne.jp/uupaa/20100401/1270097629 |
14 | - ENTER_VIEW : ++X.UI.i, // 要素が視界に入った | |
15 | - OUT_VIEW : ++X.UI.i, | |
11 | + ENTER_VIEW : ++X.Dom.Event._LAST_EVENT, // 要素が視界に入った | |
12 | + OUT_VIEW : ++X.Dom.Event._LAST_EVENT, | |
16 | 13 | |
17 | - POINTER_OUT : ++X.UI.i, | |
18 | - POINTER_IN : ++X.UI.i, | |
14 | + POINTER_OUT : ++X.Dom.Event._LAST_EVENT, | |
15 | + POINTER_IN : ++X.Dom.Event._LAST_EVENT, | |
19 | 16 | |
20 | 17 | // FOCUS |
21 | 18 | // DISABLED |
@@ -23,135 +20,135 @@ X.UI.Event = { | ||
23 | 20 | // BASE_FONT_SIZE_CHANGE |
24 | 21 | |
25 | 22 | /* -- Pointing Device Event -- */ |
26 | - _START_POINTER : X.UI.i + 0.5, | |
23 | + _START_POINTER : X.Dom.Event._LAST_EVENT + 0.5, | |
27 | 24 | |
28 | - CONTEXT_MENU : ++X.UI.i, // rightclick or longtouch or menukey or ctrl + click | |
25 | + CONTEXT_MENU : ++X.Dom.Event._LAST_EVENT, // rightclick or longtouch or menukey or ctrl + click | |
29 | 26 | |
30 | 27 | /* -- ここよりあとはノード上をバブルアップ -- */ |
31 | - _START_BUBLEUP : X.UI.i + 0.5, | |
28 | + _START_BUBLEUP : X.Dom.Event._LAST_EVENT + 0.5, | |
32 | 29 | |
33 | 30 | // raw pointing device event |
34 | - _POINTER_DOWN : ++X.UI.i, | |
35 | - _POINTER_UP : ++X.UI.i, | |
36 | - _POINTER_MOVE : ++X.UI.i, | |
37 | - _POINTER_CANCEL : ++X.UI.i, | |
38 | - _TOUCH_START : ++X.UI.i, | |
39 | - _TOUCH_END : ++X.UI.i, | |
40 | - _TOUCH_MOVE : ++X.UI.i, | |
41 | - _TOUCH_CANCEL : ++X.UI.i, | |
42 | - _MOUSE_DOWN : ++X.UI.i, | |
43 | - _MOUSE_UP : ++X.UI.i, | |
44 | - _MOUSE_MOVE : ++X.UI.i, | |
45 | - _MOUSE_CANCEL : ++X.UI.i, | |
31 | + _POINTER_DOWN : ++X.Dom.Event._LAST_EVENT, | |
32 | + _POINTER_UP : ++X.Dom.Event._LAST_EVENT, | |
33 | + _POINTER_MOVE : ++X.Dom.Event._LAST_EVENT, | |
34 | + _POINTER_CANCEL : ++X.Dom.Event._LAST_EVENT, | |
35 | + _TOUCH_START : ++X.Dom.Event._LAST_EVENT, | |
36 | + _TOUCH_END : ++X.Dom.Event._LAST_EVENT, | |
37 | + _TOUCH_MOVE : ++X.Dom.Event._LAST_EVENT, | |
38 | + _TOUCH_CANCEL : ++X.Dom.Event._LAST_EVENT, | |
39 | + _MOUSE_DOWN : ++X.Dom.Event._LAST_EVENT, | |
40 | + _MOUSE_UP : ++X.Dom.Event._LAST_EVENT, | |
41 | + _MOUSE_MOVE : ++X.Dom.Event._LAST_EVENT, | |
42 | + _MOUSE_CANCEL : ++X.Dom.Event._LAST_EVENT, | |
46 | 43 | |
47 | - FILE_DRAG : ++X.UI.i, | |
48 | - FILE_DRAG_START : ++X.UI.i, | |
49 | - FILE_DRAG_END : ++X.UI.i, | |
50 | - FILE_HOLD : ++X.UI.i, | |
51 | - FILE_HOLD_END : ++X.UI.i, | |
52 | - FILE_DROP_BEFORE : ++X.UI.i, | |
53 | - FILE_DROP : ++X.UI.i, | |
54 | - FILE_DROP_CANCEL : ++X.UI.i, | |
44 | + FILE_DRAG : ++X.Dom.Event._LAST_EVENT, | |
45 | + FILE_DRAG_START : ++X.Dom.Event._LAST_EVENT, | |
46 | + FILE_DRAG_END : ++X.Dom.Event._LAST_EVENT, | |
47 | + FILE_HOLD : ++X.Dom.Event._LAST_EVENT, | |
48 | + FILE_HOLD_END : ++X.Dom.Event._LAST_EVENT, | |
49 | + FILE_DROP_BEFORE : ++X.Dom.Event._LAST_EVENT, | |
50 | + FILE_DROP : ++X.Dom.Event._LAST_EVENT, | |
51 | + FILE_DROP_CANCEL : ++X.Dom.Event._LAST_EVENT, | |
55 | 52 | |
56 | 53 | /* -- ここより後は X.UI 用のイベント -- */ |
57 | - _START_XUI_EVENT : X.UI.i + 0.5, | |
54 | + _START_XUI_EVENT : X.Dom.Event._LAST_EVENT + 0.5, | |
58 | 55 | |
59 | 56 | /* -- Mouse & Floating touch(Xperia sola)?? -- */ |
60 | - HOVER_MOVE : ++X.UI.i, | |
61 | - HOVER_STAY : ++X.UI.i, | |
62 | - HOVER_STAY_END : ++X.UI.i, | |
63 | - WHEEL : ++X.UI.i, | |
57 | + HOVER_MOVE : ++X.Dom.Event._LAST_EVENT, | |
58 | + HOVER_STAY : ++X.Dom.Event._LAST_EVENT, | |
59 | + HOVER_STAY_END : ++X.Dom.Event._LAST_EVENT, | |
60 | + WHEEL : ++X.Dom.Event._LAST_EVENT, | |
64 | 61 | |
65 | 62 | /* -- Gesuture Event -- */ |
66 | - HOLD : ++X.UI.i, | |
67 | - HOLD_END : ++X.UI.i, | |
68 | - TAP : ++X.UI.i, | |
69 | - DOUBLE_TAP : ++X.UI.i, | |
70 | - DRAG : ++X.UI.i, | |
71 | - DRAG_START : ++X.UI.i, | |
72 | - DRAG_END : ++X.UI.i, | |
73 | - DRAG_UP : ++X.UI.i, | |
74 | - DRAG_RIGHT : ++X.UI.i, | |
75 | - DRAG_LEFT : ++X.UI.i, | |
76 | - DRAG_DOWN : ++X.UI.i, | |
77 | - SWIP : ++X.UI.i, | |
78 | - SWIP_UP : ++X.UI.i, | |
79 | - SWIP_RIGHT : ++X.UI.i, | |
80 | - SWIP_LEFT : ++X.UI.i, | |
81 | - SWIP_DOWN : ++X.UI.i, | |
82 | - TRANSFORM : ++X.UI.i, | |
83 | - TRANSFORM_START : ++X.UI.i, | |
84 | - TRANSFORM_END : ++X.UI.i, | |
85 | - PINCH : ++X.UI.i, | |
86 | - PINCH_IN : ++X.UI.i, | |
87 | - PINCH_OUT : ++X.UI.i, | |
88 | - ROTATE : ++X.UI.i, | |
63 | + HOLD : ++X.Dom.Event._LAST_EVENT, | |
64 | + HOLD_END : ++X.Dom.Event._LAST_EVENT, | |
65 | + TAP : ++X.Dom.Event._LAST_EVENT, | |
66 | + DOUBLE_TAP : ++X.Dom.Event._LAST_EVENT, | |
67 | + DRAG : ++X.Dom.Event._LAST_EVENT, | |
68 | + DRAG_START : ++X.Dom.Event._LAST_EVENT, | |
69 | + DRAG_END : ++X.Dom.Event._LAST_EVENT, | |
70 | + DRAG_UP : ++X.Dom.Event._LAST_EVENT, | |
71 | + DRAG_RIGHT : ++X.Dom.Event._LAST_EVENT, | |
72 | + DRAG_LEFT : ++X.Dom.Event._LAST_EVENT, | |
73 | + DRAG_DOWN : ++X.Dom.Event._LAST_EVENT, | |
74 | + SWIP : ++X.Dom.Event._LAST_EVENT, | |
75 | + SWIP_UP : ++X.Dom.Event._LAST_EVENT, | |
76 | + SWIP_RIGHT : ++X.Dom.Event._LAST_EVENT, | |
77 | + SWIP_LEFT : ++X.Dom.Event._LAST_EVENT, | |
78 | + SWIP_DOWN : ++X.Dom.Event._LAST_EVENT, | |
79 | + TRANSFORM : ++X.Dom.Event._LAST_EVENT, | |
80 | + TRANSFORM_START : ++X.Dom.Event._LAST_EVENT, | |
81 | + TRANSFORM_END : ++X.Dom.Event._LAST_EVENT, | |
82 | + PINCH : ++X.Dom.Event._LAST_EVENT, | |
83 | + PINCH_IN : ++X.Dom.Event._LAST_EVENT, | |
84 | + PINCH_OUT : ++X.Dom.Event._LAST_EVENT, | |
85 | + ROTATE : ++X.Dom.Event._LAST_EVENT, | |
89 | 86 | |
90 | - _END_XUI_EVENT : X.UI.i + 0.5, | |
87 | + _END_XUI_EVENT : X.Dom.Event._LAST_EVENT + 0.5, | |
91 | 88 | |
92 | - _END_POINTER : X.UI.i + 0.5, | |
89 | + _END_POINTER : X.Dom.Event._LAST_EVENT + 0.5, | |
93 | 90 | /* -- Pointing Device Event -- */ |
94 | 91 | |
95 | - KEY_DOWN : ++X.UI.i, | |
96 | - KEY_UP : ++X.UI.i, | |
97 | - KEY_HOLD : ++X.UI.i, | |
98 | - KEY_CANCEL : ++X.UI.i, | |
92 | + KEY_DOWN : ++X.Dom.Event._LAST_EVENT, | |
93 | + KEY_UP : ++X.Dom.Event._LAST_EVENT, | |
94 | + KEY_HOLD : ++X.Dom.Event._LAST_EVENT, | |
95 | + KEY_CANCEL : ++X.Dom.Event._LAST_EVENT, | |
99 | 96 | |
100 | - SCROLL_BEFORE_START : ++X.UI.i, // cancelable | |
101 | - SCROLL_START : ++X.UI.i, | |
102 | - SCROLL_BEFORE_MOVE : ++X.UI.i, | |
103 | - SCROLL_MOVE : ++X.UI.i, | |
104 | - SCROLL_END : ++X.UI.i, | |
105 | - SCROLL_REFRESH : ++X.UI.i, | |
106 | - | |
107 | - ANIME_BEFORE_START : ++X.UI.i, | |
108 | - ANIME_START : ++X.UI.i, | |
109 | - ANIME : ++X.UI.i, | |
110 | - ANIME_END : ++X.UI.i, | |
111 | - ANIME_BEFORE_STOP : ++X.UI.i, // before cancel | |
112 | - ANIME_STOP : ++X.UI.i, | |
113 | - | |
114 | - PAGE_BEFORE_SHOW : ++X.UI.i, | |
115 | - PAGE_SHOW : ++X.UI.i, | |
116 | - PAGE_AFTER_SHOW : ++X.UI.i, | |
117 | - PAGE_BEFORE_HIDE : ++X.UI.i, | |
118 | - PAGE_HIDE : ++X.UI.i, | |
119 | - PAGE_AFTER_HIDE : ++X.UI.i, | |
97 | + SCROLL_BEFORE_START : ++X.Dom.Event._LAST_EVENT, // cancelable | |
98 | + SCROLL_START : ++X.Dom.Event._LAST_EVENT, | |
99 | + SCROLL_BEFORE_MOVE : ++X.Dom.Event._LAST_EVENT, | |
100 | + SCROLL_MOVE : ++X.Dom.Event._LAST_EVENT, | |
101 | + SCROLL_END : ++X.Dom.Event._LAST_EVENT, | |
102 | + SCROLL_REFRESH : ++X.Dom.Event._LAST_EVENT, | |
103 | + | |
104 | + ANIME_BEFORE_START : ++X.Dom.Event._LAST_EVENT, | |
105 | + ANIME_START : ++X.Dom.Event._LAST_EVENT, | |
106 | + ANIME : ++X.Dom.Event._LAST_EVENT, | |
107 | + ANIME_END : ++X.Dom.Event._LAST_EVENT, | |
108 | + ANIME_BEFORE_STOP : ++X.Dom.Event._LAST_EVENT, // before cancel | |
109 | + ANIME_STOP : ++X.Dom.Event._LAST_EVENT, | |
110 | + | |
111 | + PAGE_BEFORE_SHOW : ++X.Dom.Event._LAST_EVENT, | |
112 | + PAGE_SHOW : ++X.Dom.Event._LAST_EVENT, | |
113 | + PAGE_AFTER_SHOW : ++X.Dom.Event._LAST_EVENT, | |
114 | + PAGE_BEFORE_HIDE : ++X.Dom.Event._LAST_EVENT, | |
115 | + PAGE_HIDE : ++X.Dom.Event._LAST_EVENT, | |
116 | + PAGE_AFTER_HIDE : ++X.Dom.Event._LAST_EVENT, | |
120 | 117 | |
121 | 118 | // X.UI.Form |
122 | - CHANGE : ++X.UI.i, | |
123 | - SUBMIT : ++X.UI.i, | |
124 | - SELECT : ++X.UI.i, // click or tap or enterkey | |
119 | + CHANGE : ++X.Dom.Event._LAST_EVENT, | |
120 | + SUBMIT : ++X.Dom.Event._LAST_EVENT, | |
121 | + SELECT : ++X.Dom.Event._LAST_EVENT, // click or tap or enterkey | |
125 | 122 | |
126 | 123 | IdToName : {}, |
127 | 124 | NameToID : {} |
128 | 125 | }; |
129 | 126 | |
130 | -delete X.UI.i; | |
131 | - | |
132 | 127 | // raw pointing device event |
133 | -if( navigator.msPointerEnabled || navigator.pointerEnabled ){ | |
134 | - X.UI.Event.IdToName[ X.UI.Event._POINTER_DOWN ] = navigator.msPointerEnabled ? 'MSPointerDown' : 'pointerdown'; | |
135 | - X.UI.Event.IdToName[ X.UI.Event._POINTER_UP ] = navigator.msPointerEnabled ? 'MSPointerUp' : 'pointerup'; | |
136 | - X.UI.Event.IdToName[ X.UI.Event._POINTER_MOVE ] = navigator.msPointerEnabled ? 'MSPointerMove' : 'pointermove'; | |
137 | - X.UI.Event.IdToName[ X.UI.Event._POINTER_CANCEL ] = navigator.msPointerEnabled ? 'MSPointerCancel' : 'pointercancel'; | |
138 | -};// else | |
139 | -//if( window.ontouchstart !== void 0 /* || window.DocumentTouch && document instanceof DocumentTouch */ ){ | |
140 | - X.UI.Event.IdToName[ X.UI.Event._TOUCH_START ] = 'touchstart'; | |
141 | - X.UI.Event.IdToName[ X.UI.Event._TOUCH_END ] = 'touchend'; | |
142 | - X.UI.Event.IdToName[ X.UI.Event._TOUCH_MOVE ] = 'touchmove'; | |
143 | - X.UI.Event.IdToName[ X.UI.Event._TOUCH_CANCEL ] = 'touchcancel'; | |
144 | -//} else { | |
145 | - // ToDo: cancel | |
128 | +if( X.Dom.EVENT_POINTER ){ | |
129 | + X.UI.Event.IdToName[ X.UI.Event._POINTER_DOWN ] = 'pointerdown'; | |
130 | + X.UI.Event.IdToName[ X.UI.Event._POINTER_UP ] = 'pointerup'; | |
131 | + X.UI.Event.IdToName[ X.UI.Event._POINTER_MOVE ] = 'pointermove'; | |
132 | + X.UI.Event.IdToName[ X.UI.Event._POINTER_CANCEL ] = 'pointercancel'; | |
133 | +} else { | |
134 | + | |
135 | + if( X.Dom.EVENT_TOUCH ){ | |
136 | + X.UI.Event.IdToName[ X.UI.Event._TOUCH_START ] = 'touchstart'; | |
137 | + X.UI.Event.IdToName[ X.UI.Event._TOUCH_END ] = 'touchend'; | |
138 | + X.UI.Event.IdToName[ X.UI.Event._TOUCH_MOVE ] = 'touchmove'; | |
139 | + X.UI.Event.IdToName[ X.UI.Event._TOUCH_CANCEL ] = 'touchcancel'; | |
140 | + }; | |
141 | + | |
146 | 142 | X.UI.Event.IdToName[ X.UI.Event._MOUSE_DOWN ] = 'mousedown'; |
147 | 143 | X.UI.Event.IdToName[ X.UI.Event._MOUSE_UP ] = 'mouseup'; |
148 | 144 | X.UI.Event.IdToName[ X.UI.Event._MOUSE_MOVE ] = 'mousemove'; |
149 | 145 | X.UI.Event.IdToName[ X.UI.Event._MOUSE_CANCEL ] = 'mouseleave'; // ?? |
150 | -//}; | |
146 | +}; | |
147 | + | |
151 | 148 | |
152 | -( function( IdToName, NameToID ){ | |
153 | - for( var id in IdToName ){ | |
154 | - NameToID[ IdToName[ id ] ] = id; | |
149 | +( function( IdToName, NameToID, p ){ | |
150 | + for( p in IdToName ){ | |
151 | + NameToID[ IdToName[ p ] ] = p; | |
155 | 152 | }; |
156 | 153 | })( X.UI.Event.IdToName, X.UI.Event.NameToID ); |
157 | 154 |
@@ -258,11 +258,11 @@ | ||
258 | 258 | Detection.register( Gestures[ name ] ); |
259 | 259 | }; |
260 | 260 | |
261 | - if( navigator.pointerEnabled || navigator.msPointerEnabled ){ | |
261 | + if( X.Dom.EVENT_POINTER ){ | |
262 | 262 | Hammer.EVENT_TYPES_START = [ X.UI.Event._POINTER_DOWN ]; |
263 | 263 | types = [ X.UI.Event._POINTER_MOVE, X.UI.Event._POINTER_UP, X.UI.Event._POINTER_CANCEL ]; |
264 | 264 | } else |
265 | - if( window.ontouchstart !== void 0 ){ | |
265 | + if( X.Dom.EVENT_TOUCH ){ | |
266 | 266 | Hammer.EVENT_TYPES_START = [ X.UI.Event._TOUCH_START ]; |
267 | 267 | types = [ X.UI.Event._TOUCH_MOVE, X.UI.Event._MOUSE_MOVE, X.UI.Event._TOUCH_END, X.UI.Event._TOUCH_CANCEL ]; |
268 | 268 | } else { |
@@ -1,5 +1,5 @@ | ||
1 | -var _AbstractUINode = X.EventDispatcher.inherits( | |
2 | - '_AbstractUINode', | |
1 | +X.UI._AbstractUINode = X.EventDispatcher.inherits( | |
2 | + 'X.UI._AbstractUINode', | |
3 | 3 | X.Class.ABSTRACT | X.Class.PRIVATE_DATA, |
4 | 4 | { |
5 | 5 | phase : 0, |
@@ -420,8 +420,8 @@ var _AbstractUINode = X.EventDispatcher.inherits( | ||
420 | 420 | this.xnode |
421 | 421 | .css( 'left', x ? x + 'em' : 0 ) |
422 | 422 | .css( 'top', y ? y + 'em' : 0 ) |
423 | - .css( 'width', this.contentWidth ? _AbstractUINode.ceil( this.contentWidth ) + 'em' : 0 ) | |
424 | - .css( 'height', this.contentHeight ? _AbstractUINode.ceil( this.contentHeight ) + 'em' : 0 ) | |
423 | + .css( 'width', this.contentWidth ? X.UI._AbstractUINode.ceil( this.contentWidth ) + 'em' : 0 ) | |
424 | + .css( 'height', this.contentHeight ? X.UI._AbstractUINode.ceil( this.contentHeight ) + 'em' : 0 ) | |
425 | 425 | .css( 'padding', this._createCssText( 'padding' ) ) |
426 | 426 | .css( 'borderWidth', this._createCssText( 'borderWidth' ) ); |
427 | 427 | }, |
@@ -431,7 +431,7 @@ var _AbstractUINode = X.EventDispatcher.inherits( | ||
431 | 431 | */ |
432 | 432 | preMesure : function( allowedW, allowedH ){ |
433 | 433 | var attrs = this.attrObject || this.attrClass.prototype || X.UI.AttrClass, |
434 | - calc = _AbstractUINode.calcValue, | |
434 | + calc = X.UI._AbstractUINode.calcValue, | |
435 | 435 | box = attrs[ X.UI.Attr.Support.sizing.No ], |
436 | 436 | min, max, |
437 | 437 | boxL, boxT, boxR, boxB, |
@@ -462,7 +462,7 @@ var _AbstractUINode = X.EventDispatcher.inherits( | ||
462 | 462 | if( this.constraintW ){ // 制約レイアウト |
463 | 463 | contentW = allowedW - ( boxL = calc( attrs[ X.UI.Attr.Support.left.No ], allowedW ) ) - ( boxR = calc( attrs[ X.UI.Attr.Support.right.No ], allowedW ) ); |
464 | 464 | } else { |
465 | - contentW = _AbstractUINode.finalValue( attrs[ X.UI.Attr.Support.width.No ], attrs[ X.UI.Attr.Support.minWidth.No ], attrs[ X.UI.Attr.Support.maxWidth.No ], allowedW ); | |
465 | + contentW = X.UI._AbstractUINode.finalValue( attrs[ X.UI.Attr.Support.width.No ], attrs[ X.UI.Attr.Support.minWidth.No ], attrs[ X.UI.Attr.Support.maxWidth.No ], allowedW ); | |
466 | 466 | }; |
467 | 467 | this.contentWidth = contentW + boxMinus; |
468 | 468 | this.scrollWidth = this.contentWidth + this.contentL + this.contentR; |
@@ -504,7 +504,7 @@ var _AbstractUINode = X.EventDispatcher.inherits( | ||
504 | 504 | if( this.constraintH ){ // 制約レイアウト |
505 | 505 | contentH = allowedH - ( boxT = calc( attrs[ X.UI.Attr.Support.top.No ], allowedH ) ) - ( boxB = calc( attrs[ X.UI.Attr.Support.bottom.No ], allowedH ) ); |
506 | 506 | } else { |
507 | - contentH = _AbstractUINode.finalValue( attrs[ X.UI.Attr.Support.height.No ], attrs[ X.UI.Attr.Support.minHeight.No ], attrs[ X.UI.Attr.Support.maxHeight.No ], allowedH ); | |
507 | + contentH = X.UI._AbstractUINode.finalValue( attrs[ X.UI.Attr.Support.height.No ], attrs[ X.UI.Attr.Support.minHeight.No ], attrs[ X.UI.Attr.Support.maxHeight.No ], allowedH ); | |
508 | 508 | }; |
509 | 509 | this.contentHeight = contentH + boxMinus; |
510 | 510 | this.scrollHeight = this.contentHeight + this.contentT + this.contentB; |
@@ -609,7 +609,7 @@ var _AbstractUINode = X.EventDispatcher.inherits( | ||
609 | 609 | if( w - this.boxSizingOffsetLR < this.minContentWidth ) this.contentWidth = this.minContentWidth + this.boxSizingOffsetLR; |
610 | 610 | this.lastContentWidth = this.contentWidth; |
611 | 611 | |
612 | - w !== this.contentWidth && xnode.css( 'width', _AbstractUINode.ceil( this.contentWidth ) + 'em' ); | |
612 | + w !== this.contentWidth && xnode.css( 'width', X.UI._AbstractUINode.ceil( this.contentWidth ) + 'em' ); | |
613 | 613 | |
614 | 614 | if( h === X.UI.Attr.AUTO ){ |
615 | 615 | this.contentHeight = h = xnode.css( 'height', 'auto' ).scrollHeight() / xnode._getCharSize(); // scrollHeight() ?? |
@@ -624,7 +624,7 @@ var _AbstractUINode = X.EventDispatcher.inherits( | ||
624 | 624 | } else |
625 | 625 | if( h === X.UI.Attr.AUTO ){ |
626 | 626 | if( w !== this.lastContentWidth ){ |
627 | - xnode.css( 'width', _AbstractUINode.ceil( w ) + 'em' ); | |
627 | + xnode.css( 'width', X.UI._AbstractUINode.ceil( w ) + 'em' ); | |
628 | 628 | |
629 | 629 | this.lastContentWidth = w; |
630 | 630 | this.contentHeight = h = xnode.css( 'height', 'auto' ).scrollHeight() / xnode._getCharSize(); |
@@ -667,7 +667,7 @@ var _AbstractUINode = X.EventDispatcher.inherits( | ||
667 | 667 | */ |
668 | 668 | postMesure : function(){ |
669 | 669 | var attrs = this.attrObject || this.attrClass.prototype || X.UI.AttrClass, |
670 | - calc = _AbstractUINode.calcValue, | |
670 | + calc = X.UI._AbstractUINode.calcValue, | |
671 | 671 | box = attrs[ X.UI.Attr.Support.sizing.No ], |
672 | 672 | contentW, contentH, |
673 | 673 | contentPlus, |
@@ -775,7 +775,7 @@ var _AbstractUINode = X.EventDispatcher.inherits( | ||
775 | 775 | ++counter[ type ]; |
776 | 776 | } else { |
777 | 777 | counter[ type ] = 1; |
778 | - root.xnodeInteractiveLayer.listen( X.UI.Event.IdToName[ type ], eventRellay ); | |
778 | + root.xnodeInteractiveLayer.listen( X.UI.Event.IdToName[ type ], X.UI._eventRellay ); | |
779 | 779 | }; |
780 | 780 | }; |
781 | 781 | }; |
@@ -807,7 +807,7 @@ var _AbstractUINode = X.EventDispatcher.inherits( | ||
807 | 807 | if( !counter[ type ] ) return this; |
808 | 808 | --counter[ type ]; |
809 | 809 | if( counter[ type ] === 0 ){ |
810 | - root.xnodeInteractiveLayer.unlisten( X.UI.Event.IdToName[ type ], eventRellay ); | |
810 | + root.xnodeInteractiveLayer.unlisten( X.UI.Event.IdToName[ type ], X.UI._eventRellay ); | |
811 | 811 | delete counter[ type ]; |
812 | 812 | }; |
813 | 813 | }; |
@@ -834,7 +834,7 @@ var _AbstractUINode = X.EventDispatcher.inherits( | ||
834 | 834 | } |
835 | 835 | ); |
836 | 836 | |
837 | -_AbstractUINode.calcValue = function( styleValue, srcValue ){ | |
837 | +X.UI._AbstractUINode.calcValue = function( styleValue, srcValue ){ | |
838 | 838 | /* |
839 | 839 | * String の場合は必ず % |
840 | 840 | */ |
@@ -845,21 +845,21 @@ _AbstractUINode.calcValue = function( styleValue, srcValue ){ | ||
845 | 845 | return styleValue; |
846 | 846 | }; |
847 | 847 | |
848 | -_AbstractUINode.finalValue = function( styleValue, styleMin, styleMax, srcValue ){ | |
849 | - var calc = _AbstractUINode.calcValue, | |
848 | +X.UI._AbstractUINode.finalValue = function( styleValue, styleMin, styleMax, srcValue ){ | |
849 | + var calc = X.UI._AbstractUINode.calcValue, | |
850 | 850 | v = calc( styleValue, srcValue ), |
851 | 851 | min = calc( styleMin, srcValue ), |
852 | 852 | max = calc( styleMax, srcValue ); |
853 | 853 | return v <= min ? min : max <= v ? max : v; |
854 | 854 | }; |
855 | -_AbstractUINode.ceil = function( v ){ | |
855 | +X.UI._AbstractUINode.ceil = function( v ){ | |
856 | 856 | if( 0 <= v ){ |
857 | 857 | return ( v * 10 + 0.999 | 0 ) / 10; |
858 | 858 | }; |
859 | 859 | return ( -v * 10 + 0.999 | 0 ) / -10; |
860 | 860 | }; |
861 | 861 | |
862 | -var AbstractUINode = X.Class.create( | |
862 | +X.UI.AbstractUINode = X.Class.create( | |
863 | 863 | 'AbstractUINode', |
864 | 864 | X.Class.ABSTRACT | X.Class.SUPER_ACCESS, |
865 | 865 | { |
@@ -47,8 +47,8 @@ X.UI.Layout.Canvas = X.UI.Layout.create( { | ||
47 | 47 | }); |
48 | 48 | |
49 | 49 | |
50 | -var _Box = _AbstractUINode.inherits( | |
51 | - '_Box', | |
50 | +X.UI._Box = X.UI._AbstractUINode.inherits( | |
51 | + 'X.UI._Box', | |
52 | 52 | X.Class.PRIVATE_DATA | X.Class.SUPER_ACCESS, // 現状 super 指定がないとconstructor未定擬時に親のconstructor が使われない |
53 | 53 | { |
54 | 54 | layout : null, |
@@ -68,7 +68,7 @@ var _Box = _AbstractUINode.inherits( | ||
68 | 68 | j = -1, |
69 | 69 | uinodes, arg, _data, attrs, support; |
70 | 70 | |
71 | - if( !this.User.instanceOf( Box ) ){ | |
71 | + if( !this.User.instanceOf( X.UI.Box ) ){ | |
72 | 72 | //throw new Error( 'Box を継承したインスタンスだけが _Box のオーナーになれます' ); |
73 | 73 | }; |
74 | 74 |
@@ -80,7 +80,7 @@ var _Box = _AbstractUINode.inherits( | ||
80 | 80 | |
81 | 81 | for( ; i < l; ++i ){ |
82 | 82 | arg = args[ i ]; |
83 | - if( arg.instanceOf && arg.instanceOf( AbstractUINode ) ){ | |
83 | + if( arg.instanceOf && arg.instanceOf( X.UI.AbstractUINode ) ){ | |
84 | 84 | _data = X.Class._getPrivate( arg ); |
85 | 85 | if( !uinodes ) this.uinodes = uinodes = []; |
86 | 86 | uinodes[ ++j ] = _data; |
@@ -153,7 +153,7 @@ var _Box = _AbstractUINode.inherits( | ||
153 | 153 | }; |
154 | 154 | }; |
155 | 155 | |
156 | - _AbstractUINode.prototype.creationComplete.apply( this, arguments ); | |
156 | + X.UI._AbstractUINode.prototype.creationComplete.apply( this, arguments ); | |
157 | 157 | }, |
158 | 158 | |
159 | 159 | calculate : function( isNeedsDetection, x, y, w, h ){ |
@@ -274,10 +274,10 @@ var _Box = _AbstractUINode.inherits( | ||
274 | 274 | } |
275 | 275 | ); |
276 | 276 | |
277 | -var Box = AbstractUINode.inherits( | |
277 | +X.UI.Box = X.UI.AbstractUINode.inherits( | |
278 | 278 | 'Box', |
279 | 279 | X.Class.SUPER_ACCESS, |
280 | - _Box, | |
280 | + X.UI._Box, | |
281 | 281 | { |
282 | 282 | Constructor : function(){ |
283 | 283 | X.Class._newPrivate( this, X.UI.Layout.Canvas, arguments ); |
@@ -334,7 +334,7 @@ var Box = AbstractUINode.inherits( | ||
334 | 334 | * layout が設定されている Box のサブクラスに対して、layout を指定できない. |
335 | 335 | * |
336 | 336 | */ |
337 | -Box.presets = function(){ | |
337 | +X.UI.Box.presets = function(){ | |
338 | 338 | var args = arguments, |
339 | 339 | i = 0, |
340 | 340 | l = args.length, |
@@ -386,7 +386,7 @@ Box.presets = function(){ | ||
386 | 386 | ); |
387 | 387 | }; |
388 | 388 | |
389 | - klass.presets = this.presets || Box.presets; | |
389 | + klass.presets = this.presets || X.UI.Box.presets; | |
390 | 390 | |
391 | 391 | return klass; |
392 | 392 | }; |
@@ -32,9 +32,9 @@ X.UI.Layout.Vertical = X.UI.Layout.create( { | ||
32 | 32 | autoW = contentW === X.UI.Attr.AUTO; |
33 | 33 | autoH = contentH === X.UI.Attr.AUTO; |
34 | 34 | detectionPhase = autoW || autoH; |
35 | - gapY = _AbstractUINode.calcValue( attrs[ data.supportAttrs.gapY.No ], contentH ); | |
36 | - childW = _AbstractUINode.calcValue( attrs[ data.supportAttrs.childWidth.No ], contentW ); | |
37 | - childH = _AbstractUINode.calcValue( attrs[ data.supportAttrs.childHeight.No ], contentH ); | |
35 | + gapY = X.UI._AbstractUINode.calcValue( attrs[ data.supportAttrs.gapY.No ], contentH ); | |
36 | + childW = X.UI._AbstractUINode.calcValue( attrs[ data.supportAttrs.childWidth.No ], contentW ); | |
37 | + childH = X.UI._AbstractUINode.calcValue( attrs[ data.supportAttrs.childHeight.No ], contentH ); | |
38 | 38 | _x = data.contentL; |
39 | 39 | _y = data.contentT; |
40 | 40 |
@@ -70,7 +70,7 @@ X.UI.Layout.Vertical = X.UI.Layout.create( { | ||
70 | 70 | } |
71 | 71 | }); |
72 | 72 | |
73 | -var VBox = Box.presets( | |
73 | +X.UI.VBox = X.UI.Box.presets( | |
74 | 74 | X.UI.Layout.Vertical, |
75 | 75 | 'VBox', |
76 | 76 | { |
@@ -33,9 +33,9 @@ X.UI.Layout.Horizontal = X.UI.Layout.create( { | ||
33 | 33 | detectionPhase = autoW || autoH; |
34 | 34 | _x = data.contentL; |
35 | 35 | _y = data.contentT; |
36 | - childW = _AbstractUINode.calcValue( attrs[ data.supportAttrs.childWidth.No ], contentW ); | |
37 | - childH = _AbstractUINode.calcValue( attrs[ data.supportAttrs.childHeight.No ], contentH ); | |
38 | - gapX = _AbstractUINode.calcValue( attrs[ data.supportAttrs.gapX.No ], contentW ); | |
36 | + childW = X.UI._AbstractUINode.calcValue( attrs[ data.supportAttrs.childWidth.No ], contentW ); | |
37 | + childH = X.UI._AbstractUINode.calcValue( attrs[ data.supportAttrs.childHeight.No ], contentH ); | |
38 | + gapX = X.UI._AbstractUINode.calcValue( attrs[ data.supportAttrs.gapX.No ], contentW ); | |
39 | 39 | |
40 | 40 | if( l ){ |
41 | 41 | _h = 0; |
@@ -68,7 +68,7 @@ X.UI.Layout.Horizontal = X.UI.Layout.create( { | ||
68 | 68 | } |
69 | 69 | }); |
70 | 70 | |
71 | -var HBox = Box.presets( | |
71 | +X.UI.HBox = X.UI.Box.presets( | |
72 | 72 | X.UI.Layout.Horizontal, |
73 | 73 | 'HBox', |
74 | 74 | { |
@@ -35,10 +35,10 @@ X.UI.Layout.Tile = X.UI.Layout.create( { | ||
35 | 35 | _x = data.contentL; |
36 | 36 | _y = data.contentT; |
37 | 37 | _w = data.contentWidth; |
38 | - gapX = _AbstractUINode.calcValue( attrs[ data.supportAttrs.gapX.No ], contentW ); | |
39 | - gapY = _AbstractUINode.calcValue( attrs[ data.supportAttrs.gapY.No ], contentH ); | |
40 | - childW = _AbstractUINode.calcValue( attrs[ data.supportAttrs.childWidth.No ], contentW ); | |
41 | - childH = _AbstractUINode.calcValue( attrs[ data.supportAttrs.childHeight.No ], contentH ); | |
38 | + gapX = X.UI._AbstractUINode.calcValue( attrs[ data.supportAttrs.gapX.No ], contentW ); | |
39 | + gapY = X.UI._AbstractUINode.calcValue( attrs[ data.supportAttrs.gapY.No ], contentH ); | |
40 | + childW = X.UI._AbstractUINode.calcValue( attrs[ data.supportAttrs.childWidth.No ], contentW ); | |
41 | + childH = X.UI._AbstractUINode.calcValue( attrs[ data.supportAttrs.childHeight.No ], contentH ); | |
42 | 42 | numH = X.UI.Attr.FLOOR( ( _w + gapX ) / ( childW + gapX ) ); |
43 | 43 | numV = l % numH ? X.UI.Attr.FLOOR( l / numH ) + 1 : l / numH; |
44 | 44 | _h = _y + data.contentB + ( childH + gapY ) * numH - gapY; |
@@ -73,7 +73,7 @@ X.UI.Layout.Tile = X.UI.Layout.create( { | ||
73 | 73 | } |
74 | 74 | }); |
75 | 75 | |
76 | -var TileBox = Box.presets( | |
76 | +X.UI.TileBox = X.UI.Box.presets( | |
77 | 77 | 'TileBox', |
78 | 78 | X.UI.Layout.Tile, |
79 | 79 | { |
@@ -1,4 +1,4 @@ | ||
1 | -var _ChromeBox = _Box.inherits( | |
1 | +X.UI._ChromeBox = X.UI._Box.inherits( | |
2 | 2 | '_ChromeBox', |
3 | 3 | X.Class.PRIVATE_DATA | X.Class.SUPER_ACCESS, |
4 | 4 | { |
@@ -32,10 +32,10 @@ var _ChromeBox = _Box.inherits( | ||
32 | 32 | } |
33 | 33 | ); |
34 | 34 | |
35 | -var ChromeBox = Box.inherits( | |
35 | +X.UI.ChromeBox = X.UI.Box.inherits( | |
36 | 36 | 'ChromeBox', |
37 | 37 | X.Class.SUPER_ACCESS, |
38 | - _ChromeBox, | |
38 | + X.UI._ChromeBox, | |
39 | 39 | { |
40 | 40 | Constructor : function(){ |
41 | 41 | X.Class._newPrivate( this, X.UI.Layout.Canvas, arguments ); |
@@ -1,4 +1,3 @@ | ||
1 | -var _ScrollBox; | |
2 | 1 | |
3 | 2 | (function(){ |
4 | 3 |
@@ -904,7 +903,7 @@ iScroll.prototype = { | ||
904 | 903 | |
905 | 904 | |
906 | 905 | |
907 | -_ScrollBox = _ChromeBox.inherits( | |
906 | +X.UI._ScrollBox = X.UI._ChromeBox.inherits( | |
908 | 907 | '_ScrollBox', |
909 | 908 | X.Class.PRIVATE_DATA | X.Class.SUPER_ACCESS, |
910 | 909 | { |
@@ -927,13 +926,13 @@ _ScrollBox = _ChromeBox.inherits( | ||
927 | 926 | }, |
928 | 927 | |
929 | 928 | creationComplete : function(){ |
930 | - _AbstractUINode.prototype.creationComplete.call( this, arguments ); | |
929 | + X.UI._AbstractUINode.prototype.creationComplete.call( this, arguments ); | |
931 | 930 | this.scrollManager = new iScroll( this.root, this.User, this.rawElement, this._containerNode.rawElement ); |
932 | 931 | this._check(); |
933 | 932 | }, |
934 | 933 | |
935 | 934 | calculate : function(){ |
936 | - _AbstractUINode.prototype.calculate.call( this, arguments ); | |
935 | + X.UI._AbstractUINode.prototype.calculate.call( this, arguments ); | |
937 | 936 | this._check(); |
938 | 937 | }, |
939 | 938 |
@@ -986,7 +985,7 @@ _ScrollBox = _ChromeBox.inherits( | ||
986 | 985 | }, |
987 | 986 | |
988 | 987 | _remove : function(){ |
989 | - _AbstractUINode.prototype._remove.call( this, arguments ); | |
988 | + X.UI._AbstractUINode.prototype._remove.call( this, arguments ); | |
990 | 989 | if( this.scrolling ){ |
991 | 990 | // remove scroll |
992 | 991 | }; |
@@ -997,10 +996,10 @@ _ScrollBox = _ChromeBox.inherits( | ||
997 | 996 | |
998 | 997 | })(); |
999 | 998 | |
1000 | -var ScrollBox = ChromeBox.inherits( | |
999 | +X.UI.ScrollBox = X.UI.ChromeBox.inherits( | |
1001 | 1000 | 'ScrollBox', |
1002 | 1001 | X.Class.SUPER_ACCESS, |
1003 | - _ScrollBox, | |
1002 | + X.UI._ScrollBox, | |
1004 | 1003 | { |
1005 | 1004 | Constructor : function(){ |
1006 | 1005 | var args = [], |
@@ -1,4 +1,4 @@ | ||
1 | -var _Text = _AbstractUINode.inherits( | |
1 | +X.UI._Text = X.UI._AbstractUINode.inherits( | |
2 | 2 | '_Text', |
3 | 3 | X.Class.PRIVATE_DATA, |
4 | 4 | { |
@@ -19,10 +19,10 @@ var _Text = _AbstractUINode.inherits( | ||
19 | 19 | } |
20 | 20 | ); |
21 | 21 | |
22 | -var Text = AbstractUINode.inherits( | |
22 | +X.UI.Text = X.UI.AbstractUINode.inherits( | |
23 | 23 | 'Text', |
24 | 24 | X.Class.SUPER_ACCESS, |
25 | - _Text, | |
25 | + X.UI._Text, | |
26 | 26 | { |
27 | 27 | Constructor : function( opt_content, opt_cssObj ){ |
28 | 28 | X.Class._newPrivate( this, opt_content ); |
@@ -1,5 +1,5 @@ | ||
1 | 1 | |
2 | -function eventRellay( e ){ | |
2 | +X.UI._eventRellay = function( e ){ | |
3 | 3 | var x = e.clientX / X.Dom.baseFontSize, |
4 | 4 | y = e.clientY / X.Dom.baseFontSize, |
5 | 5 | type = X.UI.Event.NameToID[ e.type ], |
@@ -9,21 +9,18 @@ function eventRellay( e ){ | ||
9 | 9 | ret = X.Callback.NONE, |
10 | 10 | list, parent, _ret; |
11 | 11 | |
12 | - if( !data ) return ret; | |
13 | - | |
14 | 12 | // mouseup で alert を出すと mouseleave が発生、ということでイベント中のイベント発火を禁止 |
15 | - // gesture にも手当てが必要 | |
16 | - if( data._eventBudy ) return X.Callback.STOP_PROPAGATION | _ret & X.Callback.PREVENT_DEFAULT; | |
17 | - data._eventBudy = true; | |
13 | + if( !data || data._eventBusy ) return ret; | |
14 | + data._eventBusy = true; | |
18 | 15 | |
19 | 16 | if( type !== '' + X.UI.Event._POINTER_MOVE && type !== '' + X.UI.Event._TOUCH_MOVE && type !== '' + X.UI.Event._MOUSE_MOVE ){ |
20 | - console.log( e.type + ' ' + type + ' x:' + x + ', y:' + y ); | |
17 | + // console.log( e.type + ' ' + type + ' x:' + x + ', y:' + y ); | |
21 | 18 | }; |
22 | 19 | |
23 | 20 | e.type = type; |
24 | 21 | |
25 | 22 | if( data && ( data = data.monopolyNodeData ) && ( ret = data.dispatch( e ) ) & X.Callback.MONOPOLY ){ |
26 | - delete X.UI.currentRootData._eventBudy; | |
23 | + delete X.UI.currentRootData._eventBusy; | |
27 | 24 | return ret; |
28 | 25 | }; |
29 | 26 |
@@ -58,7 +55,7 @@ function eventRellay( e ){ | ||
58 | 55 | data.hovering = true; |
59 | 56 | }; |
60 | 57 | }; |
61 | - delete X.UI.currentRootData._eventBudy; | |
58 | + delete X.UI.currentRootData._eventBusy; | |
62 | 59 | return ret; |
63 | 60 | }; |
64 | 61 |
@@ -67,7 +64,7 @@ function eventRellay( e ){ | ||
67 | 64 | * 背景画像を読み終える onload で活動開始 |
68 | 65 | */ |
69 | 66 | |
70 | -var _PageRoot = _Box.inherits( | |
67 | +X.UI._PageRoot = X.UI._Box.inherits( | |
71 | 68 | '_PageRoot', |
72 | 69 | X.Class.FINAL | X.Class.PRIVATE_DATA | X.Class.SUPER_ACCESS, |
73 | 70 | { |
@@ -82,7 +79,7 @@ var _PageRoot = _Box.inherits( | ||
82 | 79 | eventCounter : null, |
83 | 80 | cursorStyle : null, |
84 | 81 | |
85 | - _eventBudy : false, | |
82 | + _eventBusy : false, | |
86 | 83 | |
87 | 84 | Constructor : function( layout, args ){ |
88 | 85 | this.SuperConstructor( layout, args ); |
@@ -108,9 +105,9 @@ var _PageRoot = _Box.inherits( | ||
108 | 105 | |
109 | 106 | // this.xnodeInteractiveLayer の前に追加する! |
110 | 107 | |
111 | - this.addToParent( X.Dom.Node.root ); | |
108 | + this.addToParent( X.Dom.Node._body ); | |
112 | 109 | |
113 | - this.xnodeInteractiveLayer = X.Dom.Node.root.create( 'div', { | |
110 | + this.xnodeInteractiveLayer = X.Dom.Node._body.create( 'div', { | |
114 | 111 | 'class' : 'mouse-operation-catcher', |
115 | 112 | unselectable : 'on' |
116 | 113 | } ); |
@@ -118,15 +115,15 @@ var _PageRoot = _Box.inherits( | ||
118 | 115 | // hover や rollover rollout のための move イベントの追加 |
119 | 116 | // X.Dom.Event.activate, X.Dom.Event.deactivate ? |
120 | 117 | // mouseout, mouseover |
121 | - if( navigator.msPointerEnabled || navigator.pointerEnabled ){ | |
122 | - this.xnodeInteractiveLayer.listen( X.UI.Event.IdToName[ X.UI.Event._POINTER_MOVE ], eventRellay ); | |
118 | + if( X.Dom.EVENT_POINTER ){ | |
119 | + this.xnodeInteractiveLayer.listen( X.UI.Event.IdToName[ X.UI.Event._POINTER_MOVE ], X.UI._eventRellay ); | |
123 | 120 | if( counter[ X.UI.Event._POINTER_MOVE ] ){ |
124 | 121 | ++counter[ X.UI.Event._POINTER_MOVE ]; |
125 | 122 | } else { |
126 | 123 | counter[ X.UI.Event._POINTER_MOVE ] = 1; |
127 | 124 | }; |
128 | 125 | } else { |
129 | - this.xnodeInteractiveLayer.listen( X.UI.Event.IdToName[ X.UI.Event._MOUSE_MOVE ], eventRellay ); | |
126 | + this.xnodeInteractiveLayer.listen( X.UI.Event.IdToName[ X.UI.Event._MOUSE_MOVE ], X.UI._eventRellay ); | |
130 | 127 | if( counter[ X.UI.Event._MOUSE_MOVE ] ){ |
131 | 128 | ++counter[ X.UI.Event._MOUSE_MOVE ]; |
132 | 129 | } else { |
@@ -182,9 +179,10 @@ var _PageRoot = _Box.inherits( | ||
182 | 179 | } |
183 | 180 | ); |
184 | 181 | |
185 | -var PageRoot = Box.presets( | |
182 | +X.UI.PageRoot = X.UI.Box.presets( | |
186 | 183 | 'PageRoot', |
187 | - _PageRoot, { | |
184 | + X.UI._PageRoot, | |
185 | + { | |
188 | 186 | width : '100%', |
189 | 187 | height : '100%' |
190 | 188 | } |