• R/O
  • HTTP
  • SSH
  • HTTPS

clientJs: コミット

クライアント側 js 開発用


コミットメタ情報

リビジョン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.

変更サマリ

差分

--- a/0.6.x/js/core/04_XClass.js
+++ b/0.6.x/js/core/04_XClass.js
@@ -17,7 +17,7 @@ X.Class = ( function(){
1717 CONSTRUCTOR = 'Constructor',
1818 killPrivateFlag = false,
1919 traits = null,
20- _slice = Array.prototype.slice;
20+ use__proto__ = !!X.emptyFunction.prototype.__proto__;
2121
2222 /* サブクラスを作るメソッド
2323 * var subClass = superClass.inherits( ... )
@@ -63,9 +63,13 @@ X.Class = ( function(){
6363 params.push( args[ 0 ] ); /* props サブクラスでは未定義でも可 */
6464
6565 // 継承クラスの作成
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+ };
6973 klass = X.Class.create.apply( X.Class, params );
7074 traits = null;
7175
@@ -243,9 +247,16 @@ X.Class = ( function(){
243247 klass.superClassOf = X.Class._superClassOf;
244248 klass.subClassOf = X.Class._subClassOf;
245249
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;
249260 } else {
250261 klass.prototype = X.Class._override( X.Class._override( traits || klass.prototype, props, true ), CommonProps, false );
251262 klass.prototype.constructor = klass;
--- a/0.6.x/js/dom/10_XDom.js
+++ b/0.6.x/js/dom/10_XDom.js
@@ -78,7 +78,7 @@ X.Dom = X.Class._override(
7878 new Node( document.all.tags( 'html' )[ 0 ] ) :
7979 null;
8080
81- r = Node.root = new Node( document.body );
81+ r = Node._body = new Node( document.body );
8282 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 =
8383 r.appendTo = r.appendToRoot = r.before = r.after = r.clone = r.remove = r.destroy = r.prevNode = r.nextNode = new Function( 'return this' );
8484
@@ -94,7 +94,7 @@ X.Dom = X.Class._override(
9494 X.Dom.listenOnce( X.Dom.Event.DOM_BUILDER_COMPLETE, function(){
9595 X.Dom.readyState = X.Dom.Event.DOM_INIT;
9696 //X.UA.Opera7 && alert( 'bc' );
97- Node.root.appendAt( 0,
97+ Node._body.appendAt( 0,
9898 Node._systemNode = Node.create( 'div', { 'class' : 'hidden-system-node' } ),
9999 Node._fontSizeNode = Node.create( 'div', { 'class' : 'hidden-system-node' } ).cssText( 'line-height:1;height:1em;' ).text( 'X' )
100100 )._startUpdate();
@@ -219,7 +219,7 @@ X.Dom = X.Class._override(
219219 //http://onozaty.hatenablog.com/entry/20060803/p1
220220 // Safari2.0.4では標準・互換どちらも document.body
221221
222- Node.root._updateTimerID && Node.root._startUpdate();
222+ Node._body._updateTimerID && Node._body._startUpdate();
223223 /*X.UA.Opera ?
224224 ( document.documentElement && document.documentElement.clientWidth ?
225225 new Function( 'return[document.documentElement.clientWidth,document.documentElement.clientHeight]' ) :
@@ -234,16 +234,16 @@ X.Dom = X.Class._override(
234234 getScrollPosition :
235235 window.pageXOffset !== undefined ?
236236 ( function(){
237- Node.root._updateTimerID && Node.root._startUpdate();
237+ Node._body._updateTimerID && Node._body._startUpdate();
238238 return[ window.pageXOffset, window.pageYOffset ];
239239 } ) :
240240 window.scrollLeft !== undefined ?
241241 ( function(){
242- Node.root._updateTimerID && Node.root._startUpdate();
242+ Node._body._updateTimerID && Node._body._startUpdate();
243243 return[ window.scrollLeft, window.scrollTop ];
244244 } ) :
245245 ( function(){
246- Node.root._updateTimerID && Node.root._startUpdate();
246+ Node._body._updateTimerID && Node._body._startUpdate();
247247 // body は Safari2-
248248 return[ X.Dom._root.scrollLeft || document.body.scrollLeft, X.Dom._root.scrollTop || document.body.scrollTop ];
249249 } ),
@@ -297,6 +297,9 @@ if( document.layers ){
297297
298298 };
299299
300+X.Dom.EVENT_POINTER = navigator.msPointerEnabled || navigator.pointerEnabled;
301+X.Dom.EVENT_TOUCH = !X.Dom.EVENT_POINTER && window.ontouchstart !== undefined;
302+
300303 X.Dom.moveToHead = {
301304 STYLE : true,
302305 LINK : true,
--- a/0.6.x/js/dom/11_XDomNode.js
+++ b/0.6.x/js/dom/11_XDomNode.js
@@ -239,7 +239,7 @@ Node.createText = function( text ){
239239
240240 Node.getRoot = function( xnode ){
241241 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;
243243 };
244244 // XMLかどうかを判別する
245245 Node.isXmlDocument =
@@ -255,7 +255,7 @@ Node.none = Node._chashe[ 0 ] = new Node();
255255 Node._window = new Node( window ); // Node._chashe[ 1 ]
256256 Node._document = new Node( document ); // Node._chashe[ 2 ]
257257 Node._html = null; // Node._chashe[ 3 ]
258-Node.root = null;// = Node._chashe[ 4 ] body
258+Node._body = null;// = Node._chashe[ 4 ] body
259259 Node._systemNode = null;// = Node._chashe[ ? ]
260260
261261 Node._reserveRemoval = [];
@@ -469,7 +469,7 @@ Node.prototype.appendTo = function( parent, opt_index ){
469469 };
470470
471471 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 );
473473 return this;
474474 };
475475
@@ -821,7 +821,7 @@ Node.prototype.each = function( func ){
821821 */
822822
823823 Node.prototype._reserveUpdate = function(){
824- var root = Node.root;
824+ var root = Node._body;
825825 if( root && !root._updateTimerID ) root._updateTimerID = X.Timer.requestFrame( root, root._startUpdate );
826826 };
827827
--- a/0.6.x/js/dom/12_XDomEvent.js
+++ b/0.6.x/js/dom/12_XDomEvent.js
@@ -177,19 +177,72 @@ X.Dom.Event.RenameTo = {};
177177 // https://github.com/georgeadamson/jQuery.prefixfree-events/blob/master/jQuery.prefixfree-events.js
178178
179179 if( window.onwebkitanimationend !== undefined && window.onanimationend === undefined ){
180- X.Dom.Event.Rename[ 'animationend' ] = 'webkitAnimationEnd';
180+ X.Dom.Event.Rename[ 'animationend' ] = 'webkitAnimationEnd';
181181 X.Dom.Event.RenameTo[ 'webkitAnimationEnd' ] = 'animationend';
182- X.Dom.Event.Rename[ 'animationstart' ] = 'webkitAnimationStart';
182+ X.Dom.Event.Rename[ 'animationstart' ] = 'webkitAnimationStart';
183183 X.Dom.Event.RenameTo[ 'webkitAnimationStart' ] = 'animationstart';
184- X.Dom.Event.Rename[ 'animationiteration' ] = 'webkitAnimationIteration';
184+ X.Dom.Event.Rename[ 'animationiteration' ] = 'webkitAnimationIteration';
185185 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';
186211 };
187-
212+// https://developer.mozilla.org/en-US/docs/Web/Events/transitionend
213+// chrome1+, firefox4+, IE10+, Opera10.5+, Safari3.2+, Android2.1+
188214 if( window.onwebkittransitionend !== undefined && window.ontransitionend === undefined ){
189- X.Dom.Event.Rename[ 'transitionend' ] = 'webkitTransitionEnd';
215+ X.Dom.Event.Rename[ 'transitionend' ] = 'webkitTransitionEnd';
190216 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';
191230 };
192231
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+
193246 X.Dom.Node.prototype.listen = function( type, arg1, arg2, arg3 /* [ listener || ( context + function ) || function ][ arguments ] */ ){
194247 var elm;
195248
--- a/0.6.x/js/dom/13_XDomBoxModel.js
+++ b/0.6.x/js/dom/13_XDomBoxModel.js
@@ -82,7 +82,7 @@ Node.prototype.width = function(){
8282 console.log( 'xnode.width() : no parent' );
8383 return 0;
8484 };
85- Node.root._updateTimerID && Node.root._startUpdate();
85+ Node._body._updateTimerID && Node._body._startUpdate();
8686 if( !this._root ){
8787 console.log( 'xnode.width() : not belong tree.' );
8888 return 0;
@@ -104,7 +104,7 @@ Node.prototype.height = function(){
104104 console.log( 'xnode.height() : no parent' );
105105 return 0;
106106 };
107- Node.root._updateTimerID && Node.root._startUpdate();
107+ Node._body._updateTimerID && Node._body._startUpdate();
108108 if( !this._root ){
109109 console.log( 'xnode.height() : not belong tree.' );
110110 return 0;
@@ -126,7 +126,7 @@ Node.prototype.scrollWidth = function(){
126126 console.log( 'xnode.width() : no parent' );
127127 return 0;
128128 };
129- Node.root._updateTimerID && Node.root._startUpdate();
129+ Node._body._updateTimerID && Node._body._startUpdate();
130130 if( !this._root ){
131131 console.log( 'xnode.width() : not belong tree.' );
132132 return 0;
@@ -148,7 +148,7 @@ Node.prototype.scrollHeight = function(){
148148 console.log( 'xnode.height() : no parent' );
149149 return 0;
150150 };
151- Node.root._updateTimerID && Node.root._startUpdate();
151+ Node._body._updateTimerID && Node._body._startUpdate();
152152 if( !this._root ){
153153 console.log( 'xnode.height() : not belong tree.' );
154154 return 0;
@@ -170,7 +170,7 @@ Node.prototype.scrollLeft = function(){
170170 console.log( 'xnode.scrollLeft() : no parent' );
171171 return 0;
172172 };
173- Node.root._updateTimerID && Node.root._startUpdate();
173+ Node._body._updateTimerID && Node._body._startUpdate();
174174 if( !this._root ){
175175 console.log( 'xnode.scrollLeft() : not belong tree.' );
176176 return 0;
@@ -192,7 +192,7 @@ Node.prototype.scrollTop = function(){
192192 console.log( 'xnode.scrollTop() : no parent' );
193193 return 0;
194194 };
195- Node.root._updateTimerID && Node.root._startUpdate();
195+ Node._body._updateTimerID && Node._body._startUpdate();
196196 if( !this._root ){
197197 console.log( 'xnode.scrollTop() : not belong tree.' );
198198 return 0;
@@ -222,7 +222,7 @@ Node.prototype.x = function(){
222222 console.log( 'xnode.x() : no parent' );
223223 return 0;
224224 };
225- Node.root._updateTimerID && Node.root._startUpdate();
225+ Node._body._updateTimerID && Node._body._startUpdate();
226226 if( !this._root ){
227227 console.log( 'xnode.x() : not belong tree.' );
228228 return 0;
@@ -245,7 +245,7 @@ Node.prototype.y = function(){
245245 console.log( 'xnode.y() : no parent' );
246246 return 0;
247247 };
248- Node.root._updateTimerID && Node.root._startUpdate();
248+ Node._body._updateTimerID && Node._body._startUpdate();
249249 if( !this._root ){
250250 console.log( 'xnode.y() : not belong tree.' );
251251 return 0;
--- a/0.6.x/js/dom/15_XDomStyle.js
+++ b/0.6.x/js/dom/15_XDomStyle.js
@@ -1075,23 +1075,23 @@ X.Dom.Node.prototype.cssText = function( v ){
10751075 X.Dom.Node.prototype._getCharSize =
10761076 window.getComputedStyle ?
10771077 (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;
10801080 if( this._fontSize ) return this._fontSize;
10811081 return this._fontSize = parseFloat( getComputedStyle( this._rawNode, null ).fontSize );
10821082 }) :
10831083 document.defaultView && document.defaultView.getComputedStyle ?
10841084 (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;
10871087 if( this._fontSize ) return this._fontSize;
10881088 return this._fontSize = parseFloat( document.defaultView.getComputedStyle( this._rawNode, null ).fontSize );
10891089 }) :
10901090 X.UA.IE && 5.5 <= X.UA.IE ?
10911091 (function(){
10921092 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;
10951095 if( this._fontSize ) return this._fontSize;
10961096
10971097 font = this._rawNode.currentStyle.fontSize;
@@ -1121,8 +1121,8 @@ X.Dom.Node.prototype._getCharSize =
11211121 X.Dom.DOM_W3C ?
11221122 (function(){
11231123 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;
11261126 if( this._fontSize ) return this._fontSize;
11271127
11281128 this._rawNode.appendChild( elm = document.createElement( 'span' ) );
@@ -1135,8 +1135,8 @@ X.Dom.Node.prototype._getCharSize =
11351135 X.Dom.DOM_IE4 ?
11361136 (function(){
11371137 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;
11401140 if( this._fontSize ) return this._fontSize;
11411141
11421142 if( this._css && ( font = this._css.fontSize ) ){
@@ -1169,8 +1169,8 @@ X.Dom.Node.prototype._getCharSize =
11691169 }) :
11701170 (function(){
11711171 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();
11741174 if( this._fontSize ) return this._fontSize;
11751175
11761176 elm = this._rawNode || this._ie4getRawNode();
--- a/0.6.x/js/dom/18_XDomQuery.js
+++ b/0.6.x/js/dom/18_XDomQuery.js
@@ -207,7 +207,7 @@ X.Dom.Query._parse = function( query, last ){
207207 // セレクター
208208 X.Dom.find = X._shortcut = Node.prototype.find = X.Dom.NodeList.prototype.find = function( queryString ){
209209 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 ],
211211 parents = scope, // 探索元の親要素 XNodeList の場合あり
212212 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( ' ' ),
213213 ARY_PUSH = Array.prototype.push,
--- a/0.6.x/js/dom/20_XDomImage.js
+++ b/0.6.x/js/dom/20_XDomImage.js
@@ -22,7 +22,7 @@ X.Dom.Image = {
2222 position : 'absolute'
2323 }
2424 );
25- Node.root._startUpdate();
25+ Node._body._startUpdate();
2626 img = xnode._ie4getRawNode ? xnode._ie4getRawNode() : xnode._rawNode;
2727 remove = true;
2828 } else {
--- a/0.6.x/js/dom/22_XDomBuilder.js
+++ b/0.6.x/js/dom/22_XDomBuilder.js
@@ -108,7 +108,7 @@ if( X.UA.Opera7 ){
108108 X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT,
109109 X.Dom.DOM_W3C ?
110110 (function(){
111- var r = Node.root,
111+ var r = Node._body,
112112 body = r._rawNode,
113113 copy, i, l, node, html,
114114 elmProgress;
@@ -195,17 +195,17 @@ X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT,
195195 }
196196 )
197197 .listenOnce( X.Event.SUCCESS, function( e ){
198- var xnodes = Node.root._xnodes = [], t;
198+ var xnodes = Node._body._xnodes = [], t;
199199 xnodes.push.apply( xnodes, e.xnodes );
200200 elmProgress.style.width = '100%';
201201
202- X.Dom._asyncCreateTree( Node.root, body.childNodes, elmProgress );
202+ X.Dom._asyncCreateTree( Node._body, body.childNodes, elmProgress );
203203 } );
204204
205205 }) :
206206 X.Dom.DOM_IE4 ?
207207 (function(){
208- var r = Node.root,
208+ var r = Node._body,
209209 body = r._rawNode,
210210 elmProgress = '_xdom_builder_progress',
211211 html;
@@ -228,11 +228,11 @@ X.Dom.DOM_IE4 ?
228228 )
229229 .listenOnce( X.Event.SUCCESS,
230230 function( e ){
231- var xnodes = Node.root._xnodes = [], t;
231+ var xnodes = Node._body._xnodes = [], t;
232232 xnodes.push.apply( xnodes, e.xnodes );
233233 elmProgress.style.width = '100%';
234234
235- X.Dom._asyncCreateTree( Node.root, body.childNodes || body.children, elmProgress );
235+ X.Dom._asyncCreateTree( Node._body, body.childNodes || body.children, elmProgress );
236236 }
237237 );
238238 }) :
--- a/0.6.x/js/main.js
+++ b/0.6.x/js/main.js
@@ -1,19 +1,19 @@
1-root = PageRoot(
2- Box({
1+root = X.UI.PageRoot(
2+ X.UI.Box({
33 width : '10%',
44 height : '10%',
55 left : 5,
66 top : 1,
77 bgColor : 0x0000ff
88 }),
9- Box({
9+ X.UI.Box({
1010 width : 5,
1111 height : 5,
1212 left : '10%',
1313 bottom : '70%',
1414 bgColor : 0xff0000
1515 }),
16- VBox(
16+ X.UI.VBox(
1717 {
1818 width : '50%',
1919 left : '49%',
@@ -26,15 +26,15 @@ root = PageRoot(
2626 padding : [ 4, 1 ],
2727 sizing : 'border'
2828 },
29- Box({
29+ X.UI.Box({
3030 width : '50%',
3131 height : 2,
3232 left : '25%',
3333 bgColor : 0x999999
3434 }),
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%' } )
3838 .listen( X.UI.Event.TAP, _onClick )
3939 )
4040 );
--- a/0.6.x/js/ui/02_XUI_Attr.js
+++ b/0.6.x/js/ui/02_XUI_Attr.js
@@ -173,7 +173,7 @@ X.UI.AttrClass = function( opt_supports, opt_attrs ){
173173 // setAttr に書き換え
174174 X.UI.attrClassProto = proto;
175175 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 ] );
177177 };
178178 X.UI.attrClassProto = null;
179179 return klass;
--- a/0.6.x/js/ui/04_XUI_Event.js
+++ b/0.6.x/js/ui/04_XUI_Event.js
@@ -1,21 +1,18 @@
11
2-
3-X.UI.i = X.Dom.Event._LAST_EVENT;
4-
52 X.UI.Event = {
63
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,
118
129 // http://d.hatena.ne.jp/edvakf/20100205/1265338487
1310 // 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,
1613
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,
1916
2017 // FOCUS
2118 // DISABLED
@@ -23,135 +20,135 @@ X.UI.Event = {
2320 // BASE_FONT_SIZE_CHANGE
2421
2522 /* -- Pointing Device Event -- */
26- _START_POINTER : X.UI.i + 0.5,
23+ _START_POINTER : X.Dom.Event._LAST_EVENT + 0.5,
2724
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
2926
3027 /* -- ここよりあとはノード上をバブルアップ -- */
31- _START_BUBLEUP : X.UI.i + 0.5,
28+ _START_BUBLEUP : X.Dom.Event._LAST_EVENT + 0.5,
3229
3330 // 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,
4643
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,
5552
5653 /* -- ここより後は X.UI 用のイベント -- */
57- _START_XUI_EVENT : X.UI.i + 0.5,
54+ _START_XUI_EVENT : X.Dom.Event._LAST_EVENT + 0.5,
5855
5956 /* -- 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,
6461
6562 /* -- 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,
8986
90- _END_XUI_EVENT : X.UI.i + 0.5,
87+ _END_XUI_EVENT : X.Dom.Event._LAST_EVENT + 0.5,
9188
92- _END_POINTER : X.UI.i + 0.5,
89+ _END_POINTER : X.Dom.Event._LAST_EVENT + 0.5,
9390 /* -- Pointing Device Event -- */
9491
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,
9996
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,
120117
121118 // 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
125122
126123 IdToName : {},
127124 NameToID : {}
128125 };
129126
130-delete X.UI.i;
131-
132127 // 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+
146142 X.UI.Event.IdToName[ X.UI.Event._MOUSE_DOWN ] = 'mousedown';
147143 X.UI.Event.IdToName[ X.UI.Event._MOUSE_UP ] = 'mouseup';
148144 X.UI.Event.IdToName[ X.UI.Event._MOUSE_MOVE ] = 'mousemove';
149145 X.UI.Event.IdToName[ X.UI.Event._MOUSE_CANCEL ] = 'mouseleave'; // ??
150-//};
146+};
147+
151148
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;
155152 };
156153 })( X.UI.Event.IdToName, X.UI.Event.NameToID );
157154
--- a/0.6.x/js/ui/05_XUI_Gesture.js
+++ b/0.6.x/js/ui/05_XUI_Gesture.js
@@ -258,11 +258,11 @@
258258 Detection.register( Gestures[ name ] );
259259 };
260260
261- if( navigator.pointerEnabled || navigator.msPointerEnabled ){
261+ if( X.Dom.EVENT_POINTER ){
262262 Hammer.EVENT_TYPES_START = [ X.UI.Event._POINTER_DOWN ];
263263 types = [ X.UI.Event._POINTER_MOVE, X.UI.Event._POINTER_UP, X.UI.Event._POINTER_CANCEL ];
264264 } else
265- if( window.ontouchstart !== void 0 ){
265+ if( X.Dom.EVENT_TOUCH ){
266266 Hammer.EVENT_TYPES_START = [ X.UI.Event._TOUCH_START ];
267267 types = [ X.UI.Event._TOUCH_MOVE, X.UI.Event._MOUSE_MOVE, X.UI.Event._TOUCH_END, X.UI.Event._TOUCH_CANCEL ];
268268 } else {
--- a/0.6.x/js/ui/06_AbstractUINode.js
+++ b/0.6.x/js/ui/06_AbstractUINode.js
@@ -1,5 +1,5 @@
1-var _AbstractUINode = X.EventDispatcher.inherits(
2- '_AbstractUINode',
1+X.UI._AbstractUINode = X.EventDispatcher.inherits(
2+ 'X.UI._AbstractUINode',
33 X.Class.ABSTRACT | X.Class.PRIVATE_DATA,
44 {
55 phase : 0,
@@ -420,8 +420,8 @@ var _AbstractUINode = X.EventDispatcher.inherits(
420420 this.xnode
421421 .css( 'left', x ? x + 'em' : 0 )
422422 .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 )
425425 .css( 'padding', this._createCssText( 'padding' ) )
426426 .css( 'borderWidth', this._createCssText( 'borderWidth' ) );
427427 },
@@ -431,7 +431,7 @@ var _AbstractUINode = X.EventDispatcher.inherits(
431431 */
432432 preMesure : function( allowedW, allowedH ){
433433 var attrs = this.attrObject || this.attrClass.prototype || X.UI.AttrClass,
434- calc = _AbstractUINode.calcValue,
434+ calc = X.UI._AbstractUINode.calcValue,
435435 box = attrs[ X.UI.Attr.Support.sizing.No ],
436436 min, max,
437437 boxL, boxT, boxR, boxB,
@@ -462,7 +462,7 @@ var _AbstractUINode = X.EventDispatcher.inherits(
462462 if( this.constraintW ){ // 制約レイアウト
463463 contentW = allowedW - ( boxL = calc( attrs[ X.UI.Attr.Support.left.No ], allowedW ) ) - ( boxR = calc( attrs[ X.UI.Attr.Support.right.No ], allowedW ) );
464464 } 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 );
466466 };
467467 this.contentWidth = contentW + boxMinus;
468468 this.scrollWidth = this.contentWidth + this.contentL + this.contentR;
@@ -504,7 +504,7 @@ var _AbstractUINode = X.EventDispatcher.inherits(
504504 if( this.constraintH ){ // 制約レイアウト
505505 contentH = allowedH - ( boxT = calc( attrs[ X.UI.Attr.Support.top.No ], allowedH ) ) - ( boxB = calc( attrs[ X.UI.Attr.Support.bottom.No ], allowedH ) );
506506 } 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 );
508508 };
509509 this.contentHeight = contentH + boxMinus;
510510 this.scrollHeight = this.contentHeight + this.contentT + this.contentB;
@@ -609,7 +609,7 @@ var _AbstractUINode = X.EventDispatcher.inherits(
609609 if( w - this.boxSizingOffsetLR < this.minContentWidth ) this.contentWidth = this.minContentWidth + this.boxSizingOffsetLR;
610610 this.lastContentWidth = this.contentWidth;
611611
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' );
613613
614614 if( h === X.UI.Attr.AUTO ){
615615 this.contentHeight = h = xnode.css( 'height', 'auto' ).scrollHeight() / xnode._getCharSize(); // scrollHeight() ??
@@ -624,7 +624,7 @@ var _AbstractUINode = X.EventDispatcher.inherits(
624624 } else
625625 if( h === X.UI.Attr.AUTO ){
626626 if( w !== this.lastContentWidth ){
627- xnode.css( 'width', _AbstractUINode.ceil( w ) + 'em' );
627+ xnode.css( 'width', X.UI._AbstractUINode.ceil( w ) + 'em' );
628628
629629 this.lastContentWidth = w;
630630 this.contentHeight = h = xnode.css( 'height', 'auto' ).scrollHeight() / xnode._getCharSize();
@@ -667,7 +667,7 @@ var _AbstractUINode = X.EventDispatcher.inherits(
667667 */
668668 postMesure : function(){
669669 var attrs = this.attrObject || this.attrClass.prototype || X.UI.AttrClass,
670- calc = _AbstractUINode.calcValue,
670+ calc = X.UI._AbstractUINode.calcValue,
671671 box = attrs[ X.UI.Attr.Support.sizing.No ],
672672 contentW, contentH,
673673 contentPlus,
@@ -775,7 +775,7 @@ var _AbstractUINode = X.EventDispatcher.inherits(
775775 ++counter[ type ];
776776 } else {
777777 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 );
779779 };
780780 };
781781 };
@@ -807,7 +807,7 @@ var _AbstractUINode = X.EventDispatcher.inherits(
807807 if( !counter[ type ] ) return this;
808808 --counter[ type ];
809809 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 );
811811 delete counter[ type ];
812812 };
813813 };
@@ -834,7 +834,7 @@ var _AbstractUINode = X.EventDispatcher.inherits(
834834 }
835835 );
836836
837-_AbstractUINode.calcValue = function( styleValue, srcValue ){
837+X.UI._AbstractUINode.calcValue = function( styleValue, srcValue ){
838838 /*
839839 * String の場合は必ず %
840840 */
@@ -845,21 +845,21 @@ _AbstractUINode.calcValue = function( styleValue, srcValue ){
845845 return styleValue;
846846 };
847847
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,
850850 v = calc( styleValue, srcValue ),
851851 min = calc( styleMin, srcValue ),
852852 max = calc( styleMax, srcValue );
853853 return v <= min ? min : max <= v ? max : v;
854854 };
855-_AbstractUINode.ceil = function( v ){
855+X.UI._AbstractUINode.ceil = function( v ){
856856 if( 0 <= v ){
857857 return ( v * 10 + 0.999 | 0 ) / 10;
858858 };
859859 return ( -v * 10 + 0.999 | 0 ) / -10;
860860 };
861861
862-var AbstractUINode = X.Class.create(
862+X.UI.AbstractUINode = X.Class.create(
863863 'AbstractUINode',
864864 X.Class.ABSTRACT | X.Class.SUPER_ACCESS,
865865 {
--- a/0.6.x/js/ui/08_Box.js
+++ b/0.6.x/js/ui/08_Box.js
@@ -47,8 +47,8 @@ X.UI.Layout.Canvas = X.UI.Layout.create( {
4747 });
4848
4949
50-var _Box = _AbstractUINode.inherits(
51- '_Box',
50+X.UI._Box = X.UI._AbstractUINode.inherits(
51+ 'X.UI._Box',
5252 X.Class.PRIVATE_DATA | X.Class.SUPER_ACCESS, // 現状 super 指定がないとconstructor未定擬時に親のconstructor が使われない
5353 {
5454 layout : null,
@@ -68,7 +68,7 @@ var _Box = _AbstractUINode.inherits(
6868 j = -1,
6969 uinodes, arg, _data, attrs, support;
7070
71- if( !this.User.instanceOf( Box ) ){
71+ if( !this.User.instanceOf( X.UI.Box ) ){
7272 //throw new Error( 'Box を継承したインスタンスだけが _Box のオーナーになれます' );
7373 };
7474
@@ -80,7 +80,7 @@ var _Box = _AbstractUINode.inherits(
8080
8181 for( ; i < l; ++i ){
8282 arg = args[ i ];
83- if( arg.instanceOf && arg.instanceOf( AbstractUINode ) ){
83+ if( arg.instanceOf && arg.instanceOf( X.UI.AbstractUINode ) ){
8484 _data = X.Class._getPrivate( arg );
8585 if( !uinodes ) this.uinodes = uinodes = [];
8686 uinodes[ ++j ] = _data;
@@ -153,7 +153,7 @@ var _Box = _AbstractUINode.inherits(
153153 };
154154 };
155155
156- _AbstractUINode.prototype.creationComplete.apply( this, arguments );
156+ X.UI._AbstractUINode.prototype.creationComplete.apply( this, arguments );
157157 },
158158
159159 calculate : function( isNeedsDetection, x, y, w, h ){
@@ -274,10 +274,10 @@ var _Box = _AbstractUINode.inherits(
274274 }
275275 );
276276
277-var Box = AbstractUINode.inherits(
277+X.UI.Box = X.UI.AbstractUINode.inherits(
278278 'Box',
279279 X.Class.SUPER_ACCESS,
280- _Box,
280+ X.UI._Box,
281281 {
282282 Constructor : function(){
283283 X.Class._newPrivate( this, X.UI.Layout.Canvas, arguments );
@@ -334,7 +334,7 @@ var Box = AbstractUINode.inherits(
334334 * layout が設定されている Box のサブクラスに対して、layout を指定できない.
335335 *
336336 */
337-Box.presets = function(){
337+X.UI.Box.presets = function(){
338338 var args = arguments,
339339 i = 0,
340340 l = args.length,
@@ -386,7 +386,7 @@ Box.presets = function(){
386386 );
387387 };
388388
389- klass.presets = this.presets || Box.presets;
389+ klass.presets = this.presets || X.UI.Box.presets;
390390
391391 return klass;
392392 };
--- a/0.6.x/js/ui/11_VBox.js
+++ b/0.6.x/js/ui/11_VBox.js
@@ -32,9 +32,9 @@ X.UI.Layout.Vertical = X.UI.Layout.create( {
3232 autoW = contentW === X.UI.Attr.AUTO;
3333 autoH = contentH === X.UI.Attr.AUTO;
3434 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 );
3838 _x = data.contentL;
3939 _y = data.contentT;
4040
@@ -70,7 +70,7 @@ X.UI.Layout.Vertical = X.UI.Layout.create( {
7070 }
7171 });
7272
73-var VBox = Box.presets(
73+X.UI.VBox = X.UI.Box.presets(
7474 X.UI.Layout.Vertical,
7575 'VBox',
7676 {
--- a/0.6.x/js/ui/12_HBox.js
+++ b/0.6.x/js/ui/12_HBox.js
@@ -33,9 +33,9 @@ X.UI.Layout.Horizontal = X.UI.Layout.create( {
3333 detectionPhase = autoW || autoH;
3434 _x = data.contentL;
3535 _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 );
3939
4040 if( l ){
4141 _h = 0;
@@ -68,7 +68,7 @@ X.UI.Layout.Horizontal = X.UI.Layout.create( {
6868 }
6969 });
7070
71-var HBox = Box.presets(
71+X.UI.HBox = X.UI.Box.presets(
7272 X.UI.Layout.Horizontal,
7373 'HBox',
7474 {
--- a/0.6.x/js/ui/13_TileBox.js
+++ b/0.6.x/js/ui/13_TileBox.js
@@ -35,10 +35,10 @@ X.UI.Layout.Tile = X.UI.Layout.create( {
3535 _x = data.contentL;
3636 _y = data.contentT;
3737 _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 );
4242 numH = X.UI.Attr.FLOOR( ( _w + gapX ) / ( childW + gapX ) );
4343 numV = l % numH ? X.UI.Attr.FLOOR( l / numH ) + 1 : l / numH;
4444 _h = _y + data.contentB + ( childH + gapY ) * numH - gapY;
@@ -73,7 +73,7 @@ X.UI.Layout.Tile = X.UI.Layout.create( {
7373 }
7474 });
7575
76-var TileBox = Box.presets(
76+X.UI.TileBox = X.UI.Box.presets(
7777 'TileBox',
7878 X.UI.Layout.Tile,
7979 {
--- a/0.6.x/js/ui/14_ChromeBox.js
+++ b/0.6.x/js/ui/14_ChromeBox.js
@@ -1,4 +1,4 @@
1-var _ChromeBox = _Box.inherits(
1+X.UI._ChromeBox = X.UI._Box.inherits(
22 '_ChromeBox',
33 X.Class.PRIVATE_DATA | X.Class.SUPER_ACCESS,
44 {
@@ -32,10 +32,10 @@ var _ChromeBox = _Box.inherits(
3232 }
3333 );
3434
35-var ChromeBox = Box.inherits(
35+X.UI.ChromeBox = X.UI.Box.inherits(
3636 'ChromeBox',
3737 X.Class.SUPER_ACCESS,
38- _ChromeBox,
38+ X.UI._ChromeBox,
3939 {
4040 Constructor : function(){
4141 X.Class._newPrivate( this, X.UI.Layout.Canvas, arguments );
--- a/0.6.x/js/ui/15_ScrollBox.js
+++ b/0.6.x/js/ui/15_ScrollBox.js
@@ -1,4 +1,3 @@
1-var _ScrollBox;
21
32 (function(){
43
@@ -904,7 +903,7 @@ iScroll.prototype = {
904903
905904
906905
907-_ScrollBox = _ChromeBox.inherits(
906+X.UI._ScrollBox = X.UI._ChromeBox.inherits(
908907 '_ScrollBox',
909908 X.Class.PRIVATE_DATA | X.Class.SUPER_ACCESS,
910909 {
@@ -927,13 +926,13 @@ _ScrollBox = _ChromeBox.inherits(
927926 },
928927
929928 creationComplete : function(){
930- _AbstractUINode.prototype.creationComplete.call( this, arguments );
929+ X.UI._AbstractUINode.prototype.creationComplete.call( this, arguments );
931930 this.scrollManager = new iScroll( this.root, this.User, this.rawElement, this._containerNode.rawElement );
932931 this._check();
933932 },
934933
935934 calculate : function(){
936- _AbstractUINode.prototype.calculate.call( this, arguments );
935+ X.UI._AbstractUINode.prototype.calculate.call( this, arguments );
937936 this._check();
938937 },
939938
@@ -986,7 +985,7 @@ _ScrollBox = _ChromeBox.inherits(
986985 },
987986
988987 _remove : function(){
989- _AbstractUINode.prototype._remove.call( this, arguments );
988+ X.UI._AbstractUINode.prototype._remove.call( this, arguments );
990989 if( this.scrolling ){
991990 // remove scroll
992991 };
@@ -997,10 +996,10 @@ _ScrollBox = _ChromeBox.inherits(
997996
998997 })();
999998
1000-var ScrollBox = ChromeBox.inherits(
999+X.UI.ScrollBox = X.UI.ChromeBox.inherits(
10011000 'ScrollBox',
10021001 X.Class.SUPER_ACCESS,
1003- _ScrollBox,
1002+ X.UI._ScrollBox,
10041003 {
10051004 Constructor : function(){
10061005 var args = [],
--- a/0.6.x/js/ui/17_Text.js
+++ b/0.6.x/js/ui/17_Text.js
@@ -1,4 +1,4 @@
1-var _Text = _AbstractUINode.inherits(
1+X.UI._Text = X.UI._AbstractUINode.inherits(
22 '_Text',
33 X.Class.PRIVATE_DATA,
44 {
@@ -19,10 +19,10 @@ var _Text = _AbstractUINode.inherits(
1919 }
2020 );
2121
22-var Text = AbstractUINode.inherits(
22+X.UI.Text = X.UI.AbstractUINode.inherits(
2323 'Text',
2424 X.Class.SUPER_ACCESS,
25- _Text,
25+ X.UI._Text,
2626 {
2727 Constructor : function( opt_content, opt_cssObj ){
2828 X.Class._newPrivate( this, opt_content );
--- a/0.6.x/js/ui/20_PageRoot.js
+++ b/0.6.x/js/ui/20_PageRoot.js
@@ -1,5 +1,5 @@
11
2-function eventRellay( e ){
2+X.UI._eventRellay = function( e ){
33 var x = e.clientX / X.Dom.baseFontSize,
44 y = e.clientY / X.Dom.baseFontSize,
55 type = X.UI.Event.NameToID[ e.type ],
@@ -9,21 +9,18 @@ function eventRellay( e ){
99 ret = X.Callback.NONE,
1010 list, parent, _ret;
1111
12- if( !data ) return ret;
13-
1412 // 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;
1815
1916 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 );
2118 };
2219
2320 e.type = type;
2421
2522 if( data && ( data = data.monopolyNodeData ) && ( ret = data.dispatch( e ) ) & X.Callback.MONOPOLY ){
26- delete X.UI.currentRootData._eventBudy;
23+ delete X.UI.currentRootData._eventBusy;
2724 return ret;
2825 };
2926
@@ -58,7 +55,7 @@ function eventRellay( e ){
5855 data.hovering = true;
5956 };
6057 };
61- delete X.UI.currentRootData._eventBudy;
58+ delete X.UI.currentRootData._eventBusy;
6259 return ret;
6360 };
6461
@@ -67,7 +64,7 @@ function eventRellay( e ){
6764 * 背景画像を読み終える onload で活動開始
6865 */
6966
70-var _PageRoot = _Box.inherits(
67+X.UI._PageRoot = X.UI._Box.inherits(
7168 '_PageRoot',
7269 X.Class.FINAL | X.Class.PRIVATE_DATA | X.Class.SUPER_ACCESS,
7370 {
@@ -82,7 +79,7 @@ var _PageRoot = _Box.inherits(
8279 eventCounter : null,
8380 cursorStyle : null,
8481
85- _eventBudy : false,
82+ _eventBusy : false,
8683
8784 Constructor : function( layout, args ){
8885 this.SuperConstructor( layout, args );
@@ -108,9 +105,9 @@ var _PageRoot = _Box.inherits(
108105
109106 // this.xnodeInteractiveLayer の前に追加する!
110107
111- this.addToParent( X.Dom.Node.root );
108+ this.addToParent( X.Dom.Node._body );
112109
113- this.xnodeInteractiveLayer = X.Dom.Node.root.create( 'div', {
110+ this.xnodeInteractiveLayer = X.Dom.Node._body.create( 'div', {
114111 'class' : 'mouse-operation-catcher',
115112 unselectable : 'on'
116113 } );
@@ -118,15 +115,15 @@ var _PageRoot = _Box.inherits(
118115 // hover や rollover rollout のための move イベントの追加
119116 // X.Dom.Event.activate, X.Dom.Event.deactivate ?
120117 // 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 );
123120 if( counter[ X.UI.Event._POINTER_MOVE ] ){
124121 ++counter[ X.UI.Event._POINTER_MOVE ];
125122 } else {
126123 counter[ X.UI.Event._POINTER_MOVE ] = 1;
127124 };
128125 } 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 );
130127 if( counter[ X.UI.Event._MOUSE_MOVE ] ){
131128 ++counter[ X.UI.Event._MOUSE_MOVE ];
132129 } else {
@@ -182,9 +179,10 @@ var _PageRoot = _Box.inherits(
182179 }
183180 );
184181
185-var PageRoot = Box.presets(
182+X.UI.PageRoot = X.UI.Box.presets(
186183 'PageRoot',
187- _PageRoot, {
184+ X.UI._PageRoot,
185+ {
188186 width : '100%',
189187 height : '100%'
190188 }
旧リポジトリブラウザで表示