OSDN Git Service

Fix the bug of X.NodeAnime.
[pettanr/clientJs.git] / 0.6.x / js / 20_ui / 06_AbstractUINode.js
index 4ca1595..5919e21 100644 (file)
@@ -3,12 +3,13 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ](
        'X.UI._AbstractUINode',\r
        X_Class.ABSTRACT,\r
        {\r
+               itemData          : null,\r
+               \r
                phase             : 0,\r
                dirty             : XUI_Dirty.CLEAN,\r
                \r
                root              : null,\r
                rootData          : null,\r
-               hoverList         : null,\r
                parent            : null,\r
                parentData        : null,\r
                xnode             : null,\r
@@ -20,11 +21,18 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ](
                \r
                role              : 1,\r
                pointerDisabled   : false,\r
-               hoverClassName    : null,\r
                hovering          : false,\r
                \r
                reserveEvents     : null,\r
-               gesture           : null,\r
+               gestureOptions       : null,\r
+               gestureActivated     : null,\r
+               gestureTypes         : null,\r
+               gestureTriggered     : null,\r
+               gestureCanceled      : null,\r
+               gestureCurrentName   : '',\r
+               gestureStartEvent    : null,\r
+               gestureLastEvent     : null,\r
+               gestureLastMoveEvent : null,\r
 \r
                absoluteX         : 0,\r
                absoluteY         : 0,\r
@@ -77,8 +85,21 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ](
                },\r
                \r
                addToParent : function( xnodeParent ){\r
+                       var attr = this.attrObject || this.attrClass.prototype,\r
+                               usableAttrs = this.usableAttrs,\r
+                               i = 0, l = usableAttrs.length, def, k;\r
+                       \r
                        xnodeParent && xnodeParent[ 'append' ]( this.xnode );\r
                        \r
+                       if( attr ){\r
+                               for( k in usableAttrs ){\r
+                                       def = usableAttrs[ k ];\r
+                                       if( def[ 2 ] === XUI_Attr_USER.XNODE && X_Object_inObject( def.No, attr ) && attr[ def.No ] !== def[ 0 ] ){\r
+                                               this.xnode[ 'css' ]( XUI_Attr_Rename[ k ] || k, XUI_AbstractUINode_createCssText( this, k ) );\r
+                                       };\r
+                               };\r
+                       };\r
+                       \r
                        this.phase = 2;\r
                        this[ 'dispatch' ]( XUI_Event.ADDED );\r
                },\r
@@ -91,6 +112,7 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ](
                        this.User[ 'dispatch' ]( XUI_Event.CREATION_COMPLETE );\r
                        \r
                        // html 要素が親に追加されるまで控えていたイベントの登録\r
+                       // TODO listenOnce\r
                        if( events && ( l = events.length ) ){\r
                                for( i = 0; i < l; ++i ){\r
                                        this.listen.apply( this, events[ i ] );\r
@@ -140,17 +162,17 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ](
                                        console.log( v + ' ' + _v );\r
                                        v = _v;\r
                                } else\r
-                               if( ( percent || minusPct ) && v.lastIndexOf( '%' ) !== -1 && isFinite( _v = parseFloat( v ) ) && v === _v + '%' ){\r
+                               if( ( percent || minusPct ) && v.lastIndexOf( '%' ) !== -1 && X_Type_isFinite( _v = parseFloat( v ) ) && v === _v + '%' ){\r
                                        // good\r
                                } else\r
-                               if( ( length || minusLen ) && v.lastIndexOf( 'em' ) !== -1 && isFinite( _v = parseFloat( v ) ) && v === _v + 'em' ){\r
+                               if( ( length || minusLen ) && v.lastIndexOf( 'em' ) !== -1 && X_Type_isFinite( _v = parseFloat( v ) ) && v === _v + 'em' ){\r
                                        v = _v;\r
                                } else                          \r
                                if( v.indexOf( ' ' ) !== -1 ){\r
                                        v = v.split( ' ' );\r
                                } else\r
-                               if( color && X_Type_isNumber( _v = X_Node_CSS_objToIEFilterText( v ) ) ){\r
-                                       v = _v;\r
+                               if( color && X_Type_isNumber( _v = X_Node_CSS_parseColor( v ) ) ){\r
+                                       v = _v; \r
                                } else {\r
                                        // bad\r
                                        return;\r
@@ -169,7 +191,7 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ](
                                        ( minusPct  && -1 <= v && v < 0 ) ||\r
                                    ( numerical && 0 <= v ) ||\r
                                    ( auto      && v === XUI_Attr_AUTO ) ||\r
-                                   ( color     && 0 <= v && v <= 0xFFFFFF ) ||\r
+                                   ( color     && ( 0 <= v && v <= 0xFFFFFF ) || ( v !== v ) ) || // isNaN\r
                                    ( list      && list[ v ] )\r
                                ){\r
                                        // good\r
@@ -229,6 +251,7 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ](
 \r
                        if( !v && v !== 0 ) v = defaultVal;\r
                        \r
+                       // UIAttrClass の初期設定の場合、ここで終わる\r
                        if( XUI_attrClassProto ){\r
                                attrs[ propID ] = v;\r
                                return;                 \r
@@ -319,13 +342,12 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ](
                                case 2:\r
                                        \r
                                case 1:\r
-                                       this.xnode[ 'kill' ]();\r
+                                       this.xnode[ 'remove' ]();\r
                                \r
                                        delete this.root;\r
                                        delete this.rootData;\r
                                        delete this.parent;\r
                                        delete this.parentData;\r
-                                       delete this.xnode;\r
                                        \r
                                        delete this.phase;\r
                        };\r
@@ -686,108 +708,26 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ](
                        y -= this.boxY;\r
 \r
                        if( 0 <= x && x < this.boxWidth && 0 <= y && y < this.boxHeight ){\r
-                               !this.hovering && ( this.rootData.hoverList[ this.rootData.hoverList.length ] = this );\r
-                               this.rootData.targetNodeData = this;\r
+                               !this.hovering && ( XUI_UINODES_HOVER[ XUI_UINODES_HOVER.length ] = this );\r
+                               XUI_uinodeTarget = this;\r
+                               //console.log( 'hit ' + this.xnode.className() )\r
                                return true;\r
                        };\r
                },\r
                \r
-               /*\r
-                * context を明示しない場合、User が context になる!\r
-                */\r
-               listen : function( type, arg1, arg2, arg3 ){\r
-                       var root, events, counter, f;\r
-                       \r
-                       if( XUI_Event._START_POINTER <= type && type <= XUI_Event._END_POINTER ){\r
-                               if( this.phase < 3 ){\r
-                                       if( !( events = this.reserveEvents ) ) this.reserveEvents = events = [];\r
-                                       events[ events.length ] = [ type, arg1, arg2, arg3 ];\r
-                                       return this;\r
-                               };\r
-                               if( XUI_Event._START_XUI_EVENT < type && type < XUI_Event._END_XUI_EVENT ){\r
-                                       if( !this.gesture ){\r
-                                               this.gesture = new Hammer( this.rootData, this, type );\r
-                                       } else {\r
-                                               this.gesture[ 'listen' ]( type );\r
-                                       };\r
-                               } else {\r
-                                       //console.log( type );\r
-                                       root    = this.rootData;\r
-                                       counter = root.eventCounter;\r
-                                       if( counter[ type ] ){\r
-                                               ++counter[ type ];\r
-                                       } else {\r
-                                               counter[ type ] = 1;                            \r
-                                               root.xnodeInteractiveLayer[ 'listen' ]( XUI_Event.IdToName[ type ], X_UI_eventRellay );\r
-                                       };\r
-                               };\r
-                       };\r
-                       \r
-                       arg1 && arg1.kind ? ( f = arg1 ) : ( f = X_Callback_classifyCallbackArgs( arg1, arg2, arg3 ) );\r
-                       if( !f.kind ){\r
-                               return X_EventDispatcher_listen.call( this, type, this.User, f );\r
-                       } else\r
-                       if( f.kind === X_Callback_FUNC_ONLY ){\r
-                               return X_EventDispatcher_listen.call( this, type, this.User, f.func, f.supplement );\r
-                       };\r
-                       return X_EventDispatcher_listen.apply( this, arguments );\r
-               },\r
-               unlisten : function( type, arg1, arg2, arg3 ){\r
-                       var root, events, i, ev, counter, f;\r
-                       if( XUI_Event._START_POINTER <= type && type <= XUI_Event._END_POINTER ){\r
-                               if( this.phase < 3 ){\r
-                                       if( !( events = this.reserveEvents ) ) return this;\r
-                                       for( i = events.length; i; ){\r
-                                               ev = events[ --i ];\r
-                                               if( ev[ 0 ] === type && ev[ 1 ] === arg1 && ev[ 2 ] === arg2 ){\r
-                                                       events.split( i, 1 );\r
-                                                       return this;\r
-                                               };\r
-                                       }; \r
-                                       return this;\r
-                               };\r
-\r
-                               if( XUI_Event._START_XUI_EVENT < type && type < XUI_Event._END_XUI_EVENT ){\r
-                                       this.gesture && this.gesture[ 'unlisten' ]( type );\r
-                               } else {\r
-                                       root    = this.rootData;\r
-                                       counter = root.eventCounter;\r
-                                       if( !counter[ type ] ) return this;\r
-                                       --counter[ type ];\r
-                                       if( counter[ type ] === 0 ){\r
-                                               root.xnodeInteractiveLayer[ 'unlisten' ]( XUI_Event.IdToName[ type ], X_UI_eventRellay );\r
-                                               delete counter[ type ];\r
-                                       };\r
-                               };\r
-                       };\r
-                       arg1 && arg1.kind ? ( f = arg1 ) : ( f = X_Callback_classifyCallbackArgs( arg1, arg2, arg3 ) );\r
-                       if( !f.kind ){\r
-                               return X_EventDispatcher_unlisten.apply( this, [ type, this.User, f ] );\r
-                       } else\r
-                       if( f.kind === X_Callback_FUNC_ONLY ){\r
-                               return X_EventDispatcher_unlisten.apply( this, [ type, this.User, f.func, f.supplement ] );\r
-                       };\r
-                       return X_EventDispatcher_unlisten.apply( this, arguments );\r
-               },\r
+               listen : XUI_$UINodeBase_listen,\r
                \r
-               dispatch : function( e ){\r
-                       //console.log( e.type + ' ' + ( this[ '_listeners' ] && this[ '_listeners' ][ e.type ] ) );\r
-                       var xve  = XUI_Event,\r
-                               ret  = X_EventDispatcher_dispatch.call( this, e ),\r
-                               type = e.type || e;\r
-                       \r
-                       // TODO captureEvent PointerEvent\r
-                       if( ret & X_Callback_CAPTURE_POINTER && !this.hitChildData && XUI_Event._POINTER_MOVE === type ){\r
-                               this.rootData.monopolyNodeData = this;\r
-                               return ret;\r
-                       };\r
-                       this.rootData.monopolyNodeData = null;\r
-                       if( xve._START_BUBLEUP < type && this.parentData && !( ret & X_Callback_STOP_PROPAGATION ) && !( ret & X_Callback_STOP_NOW ) ) return this.parentData[ 'dispatch' ]( e );\r
-                       return ret;\r
-               },\r
+               unlisten : XUI_$UINodeBase_unlisten,\r
                \r
-               setItemData : function(){\r
-                       // this[ 'dispatch' ]( UI_Event.ITEMDATA_CHANGED );\r
+               setItemData : function( itemData ){\r
+                       if( this.itemData === itemData ) return;\r
+\r
+                       this.itemData = itemData;\r
+\r
+                       this[ 'dispatch' ]( { type : XUI_Event.ITEMDATA_CHANGED, itemData : itemData } );\r
+                       // itemData && itemData.listen( X_Event_CHANGED )\r
+                       // dataFeild dataFormatter dataValidator\r
+                       \r
                        // itemData.listen( X_Event_CHANGED ) -> this[ 'dispatch' ]( UI_Event.ITEMDATA_UPDATED );\r
                }\r
                \r
@@ -854,13 +794,16 @@ function XUI_AbstractUINode_createCssValue( v, type, list ){
        \r
        if( X_Type_isNumber( v ) ){\r
                if( auto && v === XUI_Attr_AUTO ) return 'auto';\r
-               if( length || minusLen ) return v + 'em';\r
+               if( length || minusLen ) return v ? v + 'em' : 0;\r
                if( numerical ) return v;\r
                if( list && list[ v ] ) return list[ v ];\r
                if( color ){\r
                        if( v < 0x100000 ){\r
                                v = '00000' + v.toString( 16 );\r
                                return '#' + v.substr( v.length - 6 );\r
+                       } else\r
+                       if( v !== v ){ // iSNaN\r
+                               return 'none';\r
                        };\r
                        return '#' + v.toString( 16 );\r
                };\r
@@ -926,11 +869,11 @@ X.UI.AbstractUINode = X_Class_create(
                                        };\r
                                };\r
                        } else\r
-                       if( X_Type_isString( nameOrObject ) ){\r
+                       if( X_Type_isString( nameOrObject ) && ( def = p.usableAttrs[ nameOrObject ] ) ){\r
                                if( valueOrUnit !== undefined ){\r
                                        if( 'em,%'.indexOf( valueOrUnit ) === -1 ){\r
                                                // setter\r
-                                               p.setAttr( nameOrObject, valueOrUnit );\r
+                                               p.setAttr( nameOrObject, def, valueOrUnit );\r
                                        } else {\r
                                                // getter with unit\r
                                                return p.getAttrWithUnit( nameOrObject, valueOrUnit );\r
@@ -947,7 +890,15 @@ X.UI.AbstractUINode = X_Class_create(
                },\r
                \r
                listen : function( type, arg1, arg2, arg3 ){\r
-                       X_Pair_get( this )[ 'listen' ]( type, arg1, arg2, arg3 );\r
+                       var pair = X_Pair_get( this );\r
+                       \r
+                       ( !arg1 || !arg1.cbKind ) && ( arg1 = X_Closure_classifyCallbackArgs( arg1, arg2, arg3, this ) );\r
+                       \r
+                       if( arg1.cbKind === X_CLOSURE_FUNC_ONLY ){\r
+                               pair[ 'listen' ].apply( pair, [ type, this, arg1.func, arg1.supplement ] );\r
+                       } else {\r
+                               pair[ 'listen' ]( type, arg1.context, arg1.func, arg1.supplement );\r
+                       };\r
                        return this;\r
                },\r
                listenOnce : function( type, arg1, arg2, arg3 ){\r
@@ -958,7 +909,15 @@ X.UI.AbstractUINode = X_Class_create(
                        return X_Pair_get( this )[ 'listening' ]( type, arg1, arg2, arg3 );\r
                },\r
                unlisten : function( type, arg1, arg2, arg3 ){\r
-                       X_Pair_get( this )[ 'unlisten' ]( type, arg1, arg2, arg3 );\r
+                       var pair = X_Pair_get( this );\r
+                       \r
+                       ( !arg1 || !arg1.cbKind ) && ( arg1 = X_Closure_classifyCallbackArgs( arg1, arg2, arg3, this ) );\r
+                       \r
+                       if( arg1.cbKind === X_CLOSURE_FUNC_ONLY ){\r
+                               pair[ 'unlisten' ].apply( pair, [ type, this, arg1.func, arg1.supplement ] );\r
+                       } else {\r
+                               pair[ 'unlisten' ]( type, arg1.context, arg1.func, arg1.supplement );\r
+                       };\r
                        return this;\r
                },\r
                dispatch : function( e ){\r
@@ -1011,10 +970,20 @@ X.UI.AbstractUINode = X_Class_create(
                 * Repeater に於いて、繰り返されるアイテムの元(itemRenderer)からの複製に使用\r
                 */\r
                clone : function( opt_cloneListener ){\r
-                       var newNode = this.constructor(),\r
-                               newPair = X_Pair_get( newNode ),\r
+                       var newNode,\r
+                               //newPair = X_Pair_get( newNode ),\r
                                pair    = X_Pair_get( this ),\r
-                               attr, listeners, type, list, i, l;\r
+                               attr, listeners, type, list, i, l, k, def, f;\r
+\r
+                       // attr もコピー\r
+                       if( pair.attrObject ){\r
+                               attr = {};\r
+                               for( k in pair.usableAttrs ){\r
+                                       def = pair.usableAttrs[ k ];\r
+                                       attr[ k ] = pair.attrObject[ def.No ];\r
+                               };\r
+                               newNode = this.constructor( attr );\r
+                       };\r
 \r
                        // handleEvent 等の拡張されたオブジェクトもコピーする!\r
                        for( k in this ){\r
@@ -1023,17 +992,14 @@ X.UI.AbstractUINode = X_Class_create(
                        \r
                        // User.UINODE な値は pair にコピーされているのでこれをコピー\r
                        for( k in pair ){\r
-                               if( pair[ k ] !== newPair[ k ] && !newPair[ k ] ) newPair[ k ] = pair[ k ];\r
+                               //pair[ k ] !== newPair[ k ] && !newPair[ k ] && console.log( k );\r
+                               //if( pair[ k ] !== newPair[ k ] && !newPair[ k ] && k !== 'attrObject' && k !== '_listeners' ){\r
+                                       //newPair[ k ] = pair[ k ];\r
+                                       //console.log( k );\r
+                               //};\r
                        };\r
                        \r
-                       // attr もコピー\r
-                       if( pair.attrObject ){\r
-                               attr = pair.attrClass();\r
-                               for( k in pair.attrObject ){\r
-                                       if( pair.attrObject[ k ] !== attr[ k ] ) attr[ k ] = pair.attrObject[ k ];\r
-                               };\r
-                               newPair.attrObject = attr;\r
-                       };\r
+\r
                        \r
                        // listener もコピーする!\r
                        if( opt_cloneListener && ( listeners = pair[ '_listeners' ] ) ){\r
@@ -1041,25 +1007,17 @@ X.UI.AbstractUINode = X_Class_create(
                                        list = listeners[ type ];\r
                                        for( i = 0, l = list.length; i < l; ++i ){\r
                                                f = list[ i ];\r
-                                               switch( f.kind ){\r
-                                                       case X_Callback_THIS_FUNC :\r
-                                                               if( f.lock ){\r
-                                                                       X_EventDispatcher_systemListen( newNode, type, f.context === this ? newNode : f.context, f.func, f.supplement );\r
-                                                               } else {\r
-                                                                       newNode[ f.once ? 'listenOnce' : 'listen' ]( type, f.context === this ? newNode : f.context, f.func, f.supplement );\r
-                                                               };\r
+                                               switch( f.cbKind ){\r
+                                                       case X_CLOSURE_THIS_FUNC :\r
+                                                               newNode[ f.once ? 'listenOnce' : 'listen' ]( type, f.context === this ? newNode : f.context, f.func, f.supplement );\r
                                                                break;\r
-                                                       case X_Callback_HANDLEEVENT :\r
-                                                               if( f.lock ){\r
-                                                                       X_EventDispatcher_systemListen( newNode, type, f.context === this ? newNode : f.context, f.supplement );\r
-                                                               } else {\r
-                                                                       newNode[ f.once ? 'listenOnce' : 'listen' ]( type, f.context === this ? newNode : f.context, f.supplement );\r
-                                                               };\r
+                                                       case X_CLOSURE_HANDLEEVENT :\r
+                                                               newNode[ f.once ? 'listenOnce' : 'listen' ]( type, f.context === this ? newNode : f.context, f.supplement );\r
                                                                break;\r
                                                        /*\r
-                                                       case X_Callback_FUNC_ONLY :\r
+                                                       case X_CLOSURE_FUNC_ONLY :\r
                                                                if( f.lock ){\r
-                                                                       X_EventDispatcher_systemListen( newNode, type, f.func, f.supplement );\r
+                                                                       newNode[ 'listen' ]( type, f.func, f.supplement );\r
                                                                } else {\r
                                                                        newNode[ f.once ? 'listenOnce' : 'listen' ]( type, f.func, f.supplement );\r
                                                                };\r
@@ -1070,6 +1028,12 @@ X.UI.AbstractUINode = X_Class_create(
                                                };\r
                                        };                              \r
                                };\r
+                       } else\r
+                       if( opt_cloneListener && ( list = this.reserveEvents ) ){\r
+                               for( i = 0, l = list.length; i < l; ++i ){\r
+                                       f = list[ i ];\r
+                                       newNode[ f.once ? 'listenOnce' : 'listen' ]( f[ 0 ], newNode, f[ 1 ], f[ 2 ] );\r
+                               };      \r
                        };\r
                        \r
                        return newNode;\r