From f24f3611a2525a2a4751a02aead9d3f69bb115d0 Mon Sep 17 00:00:00 2001 From: itozyun Date: Fri, 2 Oct 2015 22:35:15 +0900 Subject: [PATCH] Version 0.6.174, rename vars for closure compiler ADVANCED_OPTIMAIZATIONS. --- 0.6.x/js/01_core/12_XClosure.js | 36 +++++++++++++------------- 0.6.x/js/01_core/13_XClass.js | 4 +-- 0.6.x/js/01_core/15_XEventDispatcher.js | 8 +++--- 0.6.x/js/01_core/16_XTimer.js | 46 ++++++++++++++++----------------- 0.6.x/js/01_core/21_XViewPort.js | 16 ++++++------ 0.6.x/js/02_dom/00_XDoc.js | 16 ++++++------ 0.6.x/js/02_dom/06_XNodeCSS.js | 2 +- 0.6.x/js/02_dom/09_XHTMLParser.js | 28 ++++++++++---------- 0.6.x/js/03_plugin/00_XPlugin.js | 2 +- 0.6.x/js/20_ui/06_AbstractUINode.js | 18 ++++++------- 10 files changed, 88 insertions(+), 88 deletions(-) diff --git a/0.6.x/js/01_core/12_XClosure.js b/0.6.x/js/01_core/12_XClosure.js index 82ff4a9..a25dee0 100644 --- a/0.6.x/js/01_core/12_XClosure.js +++ b/0.6.x/js/01_core/12_XClosure.js @@ -37,7 +37,7 @@ var __CallbackHash__ = * コールバックの種類を表す数値。 this + function, this.handleEvent, function only がある。 * @type {number} */ - kind : X_CLOSURE_THIS_FUNC, + cbKind : X_CLOSURE_THIS_FUNC, /** * コールバック。 * @type {funciton|undefined} @@ -47,7 +47,7 @@ var __CallbackHash__ = * コールバック名。コールバック作成時に関数が無い、関数が入れ替わっていても動作する。 * @type {string|undefined} */ - name : undefined, + funcName : undefined, /** * コールバックの this コンテキスト。 * @type {object|undefined} @@ -73,14 +73,14 @@ function X_Closure_create( thisObject, opt_callback, opt_args /* [ listener || ( var obj = X_Closure_classifyCallbackArgs( thisObject, opt_callback, opt_args ), l, ret, _obj; - if( !obj.kind ) return obj; + if( !obj.cbKind ) return obj; if( l = X_CLOSURE_POOL_LIST.length ){ ret = X_CLOSURE_POOL_LIST[ l - 1 ]; --X_CLOSURE_POOL_LIST.length; // ret = X_CLOSURE_POOL_LIST.pop(); _obj = ret( X_Closure_COMMAND_BACK ); - _obj.kind = obj.kind; - _obj.name = obj.name; + _obj.cbKind = obj.cbKind; + _obj.funcName = obj.funcName; _obj.func = obj.func; _obj.context = obj.context; _obj.supplement = obj.supplement; @@ -98,38 +98,38 @@ function X_Closure_classifyCallbackArgs( arg1, arg2, arg3, alt_context ){ var obj; if( X_Type_isObject( arg1 ) && X_Type_isFunction( arg2 ) ){ - obj = { context : arg1, func : arg2, kind : X_CLOSURE_THIS_FUNC }; + obj = { context : arg1, func : arg2, cbKind : X_CLOSURE_THIS_FUNC }; } else if( X_Type_isObject( arg1 ) ){ if( arg2 && X_Type_isString( arg2 ) ){ - obj = { context : arg1, name : arg2, kind : X_CLOSURE_THIS_FUNCNAME }; + obj = { context : arg1, funcName : arg2, cbKind : X_CLOSURE_THIS_FUNCNAME }; } else { - obj = { context : arg1, kind : X_CLOSURE_HANDLEEVENT }; + obj = { context : arg1, cbKind : X_CLOSURE_HANDLEEVENT }; arg3 = arg2; }; } else if( X_Type_isFunction( arg1 ) ){ arg3 = arg2; if( alt_context ){ - obj = { context : alt_context, func : arg1, kind : X_CLOSURE_THIS_FUNC }; + obj = { context : alt_context, func : arg1, cbKind : X_CLOSURE_THIS_FUNC }; } else { - obj = { func : arg1, kind : X_CLOSURE_FUNC_ONLY }; + obj = { func : arg1, cbKind : X_CLOSURE_FUNC_ONLY }; }; } else if( X_Type_isFunction( arg2 ) ){ //console.log( 'X_Closure_classifyCallbackArgs : arg1 が ' + arg1 + 'です' ); ie4 で error if( alt_context ){ - obj = { context : alt_context, func : arg2, kind : X_CLOSURE_THIS_FUNC }; + obj = { context : alt_context, func : arg2, cbKind : X_CLOSURE_THIS_FUNC }; } else { - obj = { func : arg2, kind : X_CLOSURE_FUNC_ONLY }; + obj = { func : arg2, cbKind : X_CLOSURE_FUNC_ONLY }; }; } else if( alt_context && X_Type_isString( arg1 ) ){ arg3 = arg2; - obj = { context : alt_context, name : arg1, kind : X_CLOSURE_THIS_FUNCNAME }; + obj = { context : alt_context, funcName : arg1, cbKind : X_CLOSURE_THIS_FUNCNAME }; } else if( alt_context ){ - obj = { context : alt_context, kind : X_CLOSURE_HANDLEEVENT }; + obj = { context : alt_context, cbKind : X_CLOSURE_HANDLEEVENT }; arg3 = arg1; } else { console.log( '不正 ' + arg1 ); @@ -171,13 +171,13 @@ function X_Closure_proxyCallback( xfunc, _args ){ args = temp; }; - switch( xfunc.kind ){ + switch( xfunc.cbKind ){ case X_CLOSURE_THIS_FUNC : return args.length === 0 ? func.call( thisObj ) : func.apply( thisObj, args ); case X_CLOSURE_THIS_FUNCNAME : - funcName = xfunc.name; + funcName = xfunc.funcName; case X_CLOSURE_HANDLEEVENT : funcName = funcName || 'handleEvent'; temp = thisObj[ funcName ]; @@ -213,8 +213,8 @@ function X_Closure_correct( f ){ X_CLOSURE_POOL_LIST[ X_CLOSURE_POOL_LIST.length ] = f; obj = f( X_Closure_COMMAND_BACK ); /* - delete obj.kind; - if( obj.name ) delete obj.name; + delete obj.cbKind; + if( obj.funcName ) delete obj.funcName; if( obj.func ) delete obj.func; if( obj.context ) delete obj.context; if( obj.supplement ) delete obj.supplement; diff --git a/0.6.x/js/01_core/13_XClass.js b/0.6.x/js/01_core/13_XClass.js index b475f11..4438378 100644 --- a/0.6.x/js/01_core/13_XClass.js +++ b/0.6.x/js/01_core/13_XClass.js @@ -408,7 +408,7 @@ X[ 'Class' ] = /** @lends X.Class */ { klass[ 'name' ] = displayName; if( opt_abstract ){ - classDef.Abstract = true; + classDef.isAbstract = true; } else if( opt_pool ){ classDef.pool = []; @@ -571,7 +571,7 @@ function X_Class_actualConstructor( f, args ){ def = f.classDef, instance, obj; - if( def.Abstract ){ + if( def.isAbstract ){ X.Logger.critical( 'AbstractClass!' ); return; }; diff --git a/0.6.x/js/01_core/15_XEventDispatcher.js b/0.6.x/js/01_core/15_XEventDispatcher.js index 91e10b8..699c34b 100644 --- a/0.6.x/js/01_core/15_XEventDispatcher.js +++ b/0.6.x/js/01_core/15_XEventDispatcher.js @@ -101,7 +101,7 @@ var X_EventDispatcher = X[ 'EventDispatcher' ] = /** * イベントリスナをイベント名文字列や数値(5以上、フレームワーク内で定義)をキーとするArrayで記憶します。
- * Arrayには、{kind:種類,context:コンテキスト(thisObject),func:コールバック関数,supplement:サプリメントする引数の配列} というハッシュ、または関数が蓄えられています。 + * Arrayには、{cbKind:種類,context:コンテキスト(thisObject),func:コールバック関数,supplement:サプリメントする引数の配列} というハッシュ、または関数が蓄えられています。 * * @private * @type {__Listeners__} @@ -177,7 +177,7 @@ var X_EventDispatcher = X[ 'EventDispatcher' ] = if( opt_arg1 === undefined ) return X_EventDispatcher_needsIndex ? 0 : true; // TODO callbackHash か?判定が不十分! skipConvertion - if( opt_arg1.kind ){ + if( opt_arg1.cbKind ){ cbHash = opt_arg1; } else { cbHash = X_Closure_classifyCallbackArgs( opt_arg1, opt_arg2, opt_arg3, this ); @@ -186,13 +186,13 @@ var X_EventDispatcher = X[ 'EventDispatcher' ] = if( ( unlistens = listeners[ X_LISTENERS_UNLISTENS ] ) && ( unlistens = unlistens[ opt_type ] ) ){ for( i = unlistens.length; i; ){ f = unlistens[ --i ]; - if( f === cbHash || ( f.context === cbHash.context && f.func === cbHash.func && f.name === cbHash.name && f.supplement === cbHash.supplement && f.lock === lock ) ) return false; + if( f === cbHash || ( f.context === cbHash.context && f.func === cbHash.func && f.funcName === cbHash.funcName && f.supplement === cbHash.supplement && f.lock === lock ) ) return false; }; }; for( i = list.length; i; ){ f = list[ --i ]; - if( f === cbHash || ( f.context === cbHash.context && f.func === cbHash.func && f.name === cbHash.name && f.supplement === cbHash.supplement && f.lock === lock ) ){ + if( f === cbHash || ( f.context === cbHash.context && f.func === cbHash.func && f.funcName === cbHash.funcName && f.supplement === cbHash.supplement && f.lock === lock ) ){ // index を要求された場合、lock されていない、または unlock なら index を返す return X_EventDispatcher_needsIndex ? i : true; }; diff --git a/0.6.x/js/01_core/16_XTimer.js b/0.6.x/js/01_core/16_XTimer.js index 744a33b..6069036 100644 --- a/0.6.x/js/01_core/16_XTimer.js +++ b/0.6.x/js/01_core/16_XTimer.js @@ -96,18 +96,18 @@ var f; i === 0 && ( X_Timer_requestID = X_Timer_REQ_ANIME_FRAME( X_Timer_onEnterFrame ) ); f = X_Closure_classifyCallbackArgs( args1, args2, args3 ); - if( !f.kind ) f = { func : f }; + if( !f.cbKind ) f = { func : f }; X_Timer_REQ_FRAME_LIST[ i ] = f; - return f.uid = ++X_Timer_uid; + return f._uid = ++X_Timer_uid; }) : (function( args1, args2, args3 ){ var i = X_Timer_REQ_FRAME_LIST.length, f; i === 0 && ( X_Timer_requestID = X_Timer_add( 0, 1, X_Timer_onEnterFrame ) ); f = X_Closure_classifyCallbackArgs( args1, args2, args3 ); - if( !f.kind ) f = { func : f }; + if( !f.cbKind ) f = { func : f }; X_Timer_REQ_FRAME_LIST[ i ] = f; - return f.uid = ++X_Timer_uid; + return f._uid = ++X_Timer_uid; }), /** @@ -131,8 +131,8 @@ var X_Timer_removal[ uid ] = true; } else { for( ; i; ){ - if( ( f = list[ --i ] ).uid < uid ) break; - if( f.uid == uid ){ + if( ( f = list[ --i ] )._uid < uid ) break; + if( f._uid == uid ){ list.splice( i, 1 ); // gecko では cancelRequestAnimationFrame が無い場合がある l === 1 && X_Timer_CANCEL_ANIME_FRAME && X_Timer_CANCEL_ANIME_FRAME( X_Timer_requestID ); @@ -154,8 +154,8 @@ var X_Timer_removal[ uid ] = true; } else { for( ; i; ){ - if( ( f = list[ --i ] ).uid < uid ) break; - if( f.uid == uid ){ + if( ( f = list[ --i ] )._uid < uid ) break; + if( f._uid == uid ){ list.splice( i, 1 ); l === 1 && X_Timer_remove( X_Timer_requestID ); break; @@ -227,11 +227,11 @@ X[ 'Timer' ] = { hash = X_Closure_classifyCallbackArgs( args1, args2, args3 ); if( !hash ) return -1; // dev only - if( !hash.kind ) hash = { func : hash }; - hash.time = time; - hash.last = time; - hash.count = opt_count; - hash.uid = ++X_Timer_uid; + if( !hash.cbKind ) hash = { func : hash }; + hash._time = time; + hash.last = time; + hash._count = opt_count; + hash._uid = ++X_Timer_uid; list[ list.length ] = hash; !X_Timer_busyTimeout && X_Timer_update(); @@ -270,7 +270,7 @@ X[ 'Timer' ] = { X_Timer_removal[ uid ] = true; } else { for( ; i; ){ - if( ( q = list[ --i ] ).uid == uid ){ // 数字の場合と文字の場合がある + if( ( q = list[ --i ] )._uid == uid ){ // 数字の場合と文字の場合がある list.splice( i, 1 ); /* @@ -314,17 +314,17 @@ function X_Timer_onTimeout(){ for( ; i < l; ++i ){ q = list[ i ]; if( - ( X_Timer_removal && X_Timer_removal[ q.uid ] ) || // timerId は remove 登録されている + ( X_Timer_removal && X_Timer_removal[ q._uid ] ) || // timerId は remove 登録されている 0 < ( q.last -= minus ) || // 時間が経過していない heavy && ( q.last = 1 ) // 時間は経過したが、ヘビーフラグが立っている ){ continue; }; - c = q.count; + c = q._count; - X_Timer_currentUID = q.uid; + X_Timer_currentUID = q._uid; - if( q.kind ){ + if( q.cbKind ){ r = X_Closure_proxyCallback( q, [] ); } else { r = q.func(); @@ -344,8 +344,8 @@ function X_Timer_onTimeout(){ --l; continue; } else - if( 1 < c ) --q.count; - q.last = q.time; + if( 1 < c ) --q._count; + q.last = q._time; }; X_Timer_timerId = X_Timer_currentUID = 0; X_Timer_busyTimeout = false; @@ -392,7 +392,7 @@ function X_Timer_update(){ // http://jsfiddle.net/warby_/X8YUZ/ Chrome で return が 0 の場合の挙動が他のブラウザと異なる function X_Timer_compareQueue( a, b ){ if( a.last === b.last ){ // Chrome のみ - return a.uid - b.uid; + return a._uid - b._uid; }; return a.last - b.last; // return a.last <= b.last ? -1 : 1; //a.last === b.last ? 0 : 1; @@ -429,9 +429,9 @@ function X_Timer_onEnterFrame( time ){ for( ; i < l; ++i ){ q = list[ i ]; - if( X_Timer_removal && X_Timer_removal[ q.uid ] ) continue; + if( X_Timer_removal && X_Timer_removal[ q._uid ] ) continue; - if( q.kind ){ + if( q.cbKind ){ X_Closure_proxyCallback( q, args || ( args = [ time ] ) ); } else { q.func( time ); diff --git a/0.6.x/js/01_core/21_XViewPort.js b/0.6.x/js/01_core/21_XViewPort.js index 8d3bca1..c1a1760 100644 --- a/0.6.x/js/01_core/21_XViewPort.js +++ b/0.6.x/js/01_core/21_XViewPort.js @@ -149,10 +149,10 @@ X[ 'ViewPort' ] = { }; f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ); - if( !f.kind ){ + if( !f.cbKind ){ X_ViewPort[ 'listen' ]( type, this, arg1 ); } else - if( f.kind === X_CLOSURE_FUNC_ONLY ){ + if( f.cbKind === X_CLOSURE_FUNC_ONLY ){ X_ViewPort[ 'listen' ]( type, this, f.func, f.supplement ); } else { X_ViewPort[ 'listen' ]( type, arg1, arg2, arg3 ); @@ -175,10 +175,10 @@ X[ 'ViewPort' ] = { }; f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ); - if( !f.kind ){ + if( !f.cbKind ){ X_ViewPort[ 'listenOnce' ]( type, this, arg1 ); } else - if( f.kind === X_CLOSURE_FUNC_ONLY ){ + if( f.cbKind === X_CLOSURE_FUNC_ONLY ){ X_ViewPort[ 'listenOnce' ]( type, this, f.func, f.supplement ); } else { X_ViewPort[ 'listenOnce' ]( type, arg1, arg2, arg3 ); @@ -193,10 +193,10 @@ X[ 'ViewPort' ] = { 'unlisten' : function( type, arg1, arg2, arg3 ){ var f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ); - if( !f.kind ){ + if( !f.cbKind ){ X_ViewPort[ 'unlisten' ]( type, this, arg1 ); } else - if( f.kind === X_CLOSURE_FUNC_ONLY ){ + if( f.cbKind === X_CLOSURE_FUNC_ONLY ){ X_ViewPort[ 'unlisten' ]( type, this, f.func, f.supplement ); } else { X_ViewPort[ 'unlisten' ]( type, arg1, arg2, arg3 ); @@ -211,10 +211,10 @@ X[ 'ViewPort' ] = { 'listening' : function( type, arg1, arg2, arg3 ){ var f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ); - if( !f.kind ){ + if( !f.cbKind ){ return X_ViewPort[ 'listening' ]( type, this, arg1 ); } else - if( f.kind === X_CLOSURE_FUNC_ONLY ){ + if( f.cbKind === X_CLOSURE_FUNC_ONLY ){ return X_ViewPort[ 'listening' ]( type, this, f.func, f.supplement ); }; return X_ViewPort[ 'listening' ]( type, arg1, arg2, arg3 ); diff --git a/0.6.x/js/02_dom/00_XDoc.js b/0.6.x/js/02_dom/00_XDoc.js index f4c88bb..8d71bc0 100644 --- a/0.6.x/js/02_dom/00_XDoc.js +++ b/0.6.x/js/02_dom/00_XDoc.js @@ -19,10 +19,10 @@ X[ 'Doc' ] = { }; f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ); - if( !f.kind ){ + if( !f.cbKind ){ X_ViewPort_document[ 'listen' ]( type, this, arg1 ); } else - if( f.kind === X_CLOSURE_FUNC_ONLY ){ + if( f.cbKind === X_CLOSURE_FUNC_ONLY ){ X_ViewPort_document[ 'listen' ]( type, this, f.func, f.supplement ); } else { X_ViewPort_document[ 'listen' ]( type, arg1, arg2, arg3 ); @@ -45,10 +45,10 @@ X[ 'Doc' ] = { }; f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ); - if( !f.kind ){ + if( !f.cbKind ){ X_ViewPort_document[ 'listenOnce' ]( type, this, arg1 ); } else - if( f.kind === X_CLOSURE_FUNC_ONLY ){ + if( f.cbKind === X_CLOSURE_FUNC_ONLY ){ X_ViewPort_document[ 'listenOnce' ]( type, this, f.func, f.supplement ); }; X_ViewPort_document[ 'listenOnce' ]( type, arg1, arg2, arg3 ); @@ -62,10 +62,10 @@ X[ 'Doc' ] = { 'unlisten' : function( type, arg1, arg2, arg3 ){ var f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ); - if( !f.kind ){ + if( !f.cbKind ){ X_ViewPort_document[ 'unlisten' ]( type, this, arg1 ); } else - if( f.kind === X_CLOSURE_FUNC_ONLY ){ + if( f.cbKind === X_CLOSURE_FUNC_ONLY ){ X_ViewPort_document[ 'unlisten' ]( type, this, f.func, f.supplement ); } else { X_ViewPort_document[ 'unlisten' ]( type, arg1, arg2, arg3 ); @@ -80,10 +80,10 @@ X[ 'Doc' ] = { 'listening' : function( type, arg1, arg2, arg3 ){ var f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ); - if( !f.kind ){ + if( !f.cbKind ){ return X_ViewPort_document[ 'listening' ]( type, this, arg1 ); } else - if( f.kind === X_CLOSURE_FUNC_ONLY ){ + if( f.cbKind === X_CLOSURE_FUNC_ONLY ){ return X_ViewPort_document[ 'listening' ]( type, this, f.func, f.supplement ); }; return X_ViewPort_document[ 'listening' ]( type, arg1, arg2, arg3 ); diff --git a/0.6.x/js/02_dom/06_XNodeCSS.js b/0.6.x/js/02_dom/06_XNodeCSS.js index 9711a5e..a74eb98 100644 --- a/0.6.x/js/02_dom/06_XNodeCSS.js +++ b/0.6.x/js/02_dom/06_XNodeCSS.js @@ -241,7 +241,7 @@ function X_Node_CSS_parseColor( x ){ } else { return undefined; }; - return isFinite( r + b + g ) ? ( r << 16 ) + ( g << 8 ) + b : undefined; + return X_Type_isFinite( r + b + g ) ? ( r << 16 ) + ( g << 8 ) + b : undefined; }; function X_Node_CSS_objToCssText( that, skipFilter ){ diff --git a/0.6.x/js/02_dom/09_XHTMLParser.js b/0.6.x/js/02_dom/09_XHTMLParser.js index c23bfe3..11a3aa7 100644 --- a/0.6.x/js/02_dom/09_XHTMLParser.js +++ b/0.6.x/js/02_dom/09_XHTMLParser.js @@ -132,7 +132,7 @@ var X_HTMLParser_CHARS = { // Clean up any remaining tags X_HTMLParser_parseEndTag( stack, handler ); - async && handler.complete(); + async && handler.asyncComplete(); }; function X_HTMLParser__parseStartTag( stack, last, handler, html ){ @@ -223,7 +223,7 @@ var X_HTMLParser_CHARS = { empty = empty || X_Dom_DTD_EMPTY[ tagUpper ]; !empty && ( stack[ stack.length ] = handler.isXML ? tagName : tagUpper ); - if( handler.start( handler.isXML ? tagName : tagUpper, attrs, empty, i ) === false ) return false; + if( handler.tagStart( handler.isXML ? tagName : tagUpper, attrs, empty, i ) === false ) return false; return i; }; @@ -270,9 +270,9 @@ var X_HTMLParser_CHARS = { name = name.toLowerCase(); value = X_Node_Attr_noValue[ name ] === 1 ? name : value; attrs[ attrs.length ] = { - name : name, - value : value, - escaped : + attName : name, + // attrValue : value, + escaped : value.indexOf( '"' ) !== -1 ? value.split( '"' ).join( '\\"' ).split( '\\\\"' ).join( '\\"' ) : value @@ -292,7 +292,7 @@ var X_HTMLParser_CHARS = { if ( 0 <= pos ) { // Close all the open elements, up the stack for ( ; pos < i; ) - handler.end( stack[ --i ] ); + handler.tagEnd( stack[ --i ] ); // Remove the open elements from the stack stack.length = pos; @@ -307,7 +307,7 @@ var X_HTMLParser_htmlStringToXNode = { X_HTMLParser_htmlStringToXNode.flat.length = 0; !X_HTMLParser_htmlStringToXNode.ignoreError && X.Logger.warn( 'X_Dom_Parser() error ' + html ); }, - start : function( tagName, attrs, noChild, length ){ + tagStart : function( tagName, attrs, noChild, length ){ var xnode, nest = X_HTMLParser_htmlStringToXNode.nest, flat = X_HTMLParser_htmlStringToXNode.flat, @@ -327,7 +327,7 @@ var X_HTMLParser_htmlStringToXNode = { name = attr; _attrs[ name ] = true; } else { - name = attr.name; + name = attr.attName; _attrs[ name ] = attr.escaped; }; }; @@ -335,7 +335,7 @@ var X_HTMLParser_htmlStringToXNode = { xnode[ 'attr' ]( _attrs ); }; }, - end : function(){ + tagEnd : function(){ 0 < X_HTMLParser_htmlStringToXNode.nest.length && ( --X_HTMLParser_htmlStringToXNode.nest.length ); }, chars : function( text ){ @@ -365,15 +365,15 @@ var X_HTMLParser_asyncHtmlStringToXNode = { X_HTMLParser_htmlStringToXNode.err( html ); this[ 'asyncDispatch' ]( X_EVENT_ERROR ); }, - start : X_HTMLParser_htmlStringToXNode.start, - end : X_HTMLParser_htmlStringToXNode.end, - chars : X_HTMLParser_htmlStringToXNode.chars, - comment : X_emptyFunction, + tagStart : X_HTMLParser_htmlStringToXNode.tagStart, + tagEnd : X_HTMLParser_htmlStringToXNode.tagEnd, + chars : X_HTMLParser_htmlStringToXNode.chars, + comment : X_emptyFunction, progress : function( pct ){ this[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, percent : pct } ); }, - complete : function(){ + asyncComplete : function(){ var ret = X_HTMLParser_htmlStringToXNode.flat; delete X_HTMLParser_htmlStringToXNode.flat; this[ 'asyncDispatch' ]( { type : X_EVENT_SUCCESS, xnodes : ret } ); diff --git a/0.6.x/js/03_plugin/00_XPlugin.js b/0.6.x/js/03_plugin/00_XPlugin.js index ed4619e..961f638 100644 --- a/0.6.x/js/03_plugin/00_XPlugin.js +++ b/0.6.x/js/03_plugin/00_XPlugin.js @@ -104,7 +104,7 @@ X[ 'Pulgin' ] = { 'UnityEnabled' : X_Pulgin_UNITY_ENABLED, - 'QuickTime' : X_Pulgin_QUICKTIME_VERSION, + //'QuickTime' : X_Pulgin_QUICKTIME_VERSION, 'GearsEnabled' : !!X_Pulgin_GEARS_ENABLED diff --git a/0.6.x/js/20_ui/06_AbstractUINode.js b/0.6.x/js/20_ui/06_AbstractUINode.js index 5e0dce7..a432110 100644 --- a/0.6.x/js/20_ui/06_AbstractUINode.js +++ b/0.6.x/js/20_ui/06_AbstractUINode.js @@ -156,10 +156,10 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ]( console.log( v + ' ' + _v ); v = _v; } else - if( ( percent || minusPct ) && v.lastIndexOf( '%' ) !== -1 && isFinite( _v = parseFloat( v ) ) && v === _v + '%' ){ + if( ( percent || minusPct ) && v.lastIndexOf( '%' ) !== -1 && X_Type_isFinite( _v = parseFloat( v ) ) && v === _v + '%' ){ // good } else - if( ( length || minusLen ) && v.lastIndexOf( 'em' ) !== -1 && isFinite( _v = parseFloat( v ) ) && v === _v + 'em' ){ + if( ( length || minusLen ) && v.lastIndexOf( 'em' ) !== -1 && X_Type_isFinite( _v = parseFloat( v ) ) && v === _v + 'em' ){ v = _v; } else if( v.indexOf( ' ' ) !== -1 ){ @@ -740,11 +740,11 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ]( }; }; - arg1 && arg1.kind ? ( f = arg1 ) : ( f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ) ); - if( !f.kind ){ + arg1 && arg1.cbKind ? ( f = arg1 ) : ( f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ) ); + if( !f.cbKind ){ return X_EventDispatcher_listen.call( this, type, this.User, f ); } else - if( f.kind === X_CLOSURE_FUNC_ONLY ){ + if( f.cbKind === X_CLOSURE_FUNC_ONLY ){ return X_EventDispatcher_listen.call( this, type, this.User, f.func, f.supplement ); }; return X_EventDispatcher_listen.apply( this, arguments ); @@ -777,11 +777,11 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ]( }; }; }; - arg1 && arg1.kind ? ( f = arg1 ) : ( f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ) ); - if( !f.kind ){ + arg1 && arg1.cbKind ? ( f = arg1 ) : ( f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ) ); + if( !f.cbKind ){ return X_EventDispatcher_unlisten.apply( this, [ type, this.User, f ] ); } else - if( f.kind === X_CLOSURE_FUNC_ONLY ){ + if( f.cbKind === X_CLOSURE_FUNC_ONLY ){ return X_EventDispatcher_unlisten.apply( this, [ type, this.User, f.func, f.supplement ] ); }; return X_EventDispatcher_unlisten.apply( this, arguments ); @@ -1072,7 +1072,7 @@ X.UI.AbstractUINode = X_Class_create( list = listeners[ type ]; for( i = 0, l = list.length; i < l; ++i ){ f = list[ i ]; - switch( f.kind ){ + switch( f.cbKind ){ case X_CLOSURE_THIS_FUNC : if( f.lock ){ X_EventDispatcher_systemListen( newNode, type, f.context === this ? newNode : f.context, f.func, f.supplement ); -- 2.11.0