Contexts definition moved from $mol_view to $mol_object.

hyoo-ru · Oct 21, 2017 · 5eff16e · 5eff16e
1 parent 212b81b
commit 5eff16e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/demo/large/large.view.ts b/demo/large/large.view.ts
@@ -4,7 +4,7 @@ namespace $.$$ {
 		@ $mol_mem
 		context_sub() {
 			const context = this.context()
-			const subContext : $mol_view_context = Object.create( context )
+			const subContext : typeof context = Object.create( context )
 
 			subContext.$mol_view_visible_height = () => this.minimal_height()
 			subContext.$mol_view_visible_width = () => this.minimal_width()

diff --git a/grid/grid.view.ts b/grid/grid.view.ts
@@ -194,7 +194,7 @@ namespace $.$$ {
 		@ $mol_mem
 		context_sub( ) {
 			const context = this.context()
-			const subContext : $mol_view_context = Object.create( context )
+			const subContext : typeof context = Object.create( context )
 			subContext.$mol_scroll_top = ()=> context.$mol_scroll_top() - this.offset()
 			return subContext
 

diff --git a/list/list.view.ts b/list/list.view.ts
@@ -51,7 +51,7 @@ namespace $.$$ {
 				const child = sub[ i ]
 				if( child == null ) continue 
 				if( child instanceof $mol_view ) {
-					child.context( this.row_context( i ) )
+					child.$ = this.row_context( i )
 				}
 				next.push( child )
 			}

diff --git a/object/object.ts b/object/object.ts
@@ -1,7 +1,14 @@
 namespace $ {
 
+	export type $mol_object_context = ( Window )&( typeof $.$$ )&( typeof $ )
+
 	export class $mol_object {
 
+		get $() {
+			const owner = this.object_owner()
+			return ( owner && owner.$ || $ ) as $mol_object_context
+		}
+
 		public static make< Instance >( this : { new() : Instance } , config : Partial< Instance > ) : Instance {
 			const instance = new this
 			for( let key in config ) instance[ key ] = config[ key ]

diff --git a/scroll/scroll.view.ts b/scroll/scroll.view.ts
@@ -84,7 +84,7 @@ namespace $.$$ {
 		@ $mol_mem
 		context_sub( ) {
 			const context = this.context()
-			const subContext : $mol_view_context = Object.create( context )
+			const subContext : typeof context = Object.create( context )
 			subContext.$mol_view_visible_height = ()=> {
 				const sizeWin = $mol_window.size()
 				const limit = context.$mol_view_visible_height()
@@ -116,7 +116,7 @@ namespace $.$$ {
 			const context = this.context_sub()
 			sub.forEach( child => {
 				if( child instanceof $mol_view ) {
-					child.context( context )
+					child.$ = context
 				}
 			} )
 

diff --git a/view/view.ts b/view/view.ts
@@ -4,7 +4,8 @@ namespace $ {
 	export namespace $$ { let $$ }
 	export namespace $mol { let $mol }
 
-	export type $mol_view_context = ( Window )&( typeof $.$$ )&( typeof $ )
+	/// Use $mol_object_context instead
+	export type $mol_view_context = $mol_object_context
 
 	export function $mol_view_visible_width() {
 		return $mol_window.size().width
@@ -60,10 +61,9 @@ namespace $ {
 		} 
 
 		@ $mol_mem
-		context( next? : $mol_view_context ) {
-			return next || $ as any
+		context( next? : $mol_object_context ) {
+			return next || $ as $mol_object_context
 		}
-
 		get $() {
 			return this.context()
 		}
@@ -101,7 +101,7 @@ namespace $ {
 			const context = this.context_sub()
 			sub.forEach( child => {
 				if( child instanceof $mol_view ) {
-					child.context( context )
+					child.$ = context
 				}
 			} )