Commitad68b50

committed

chore: merge master into frame-and-router

2 parents07f976b +db6df39 commitad68b50Copy full SHA for ad68b50

File tree

+27

-16

lines changed

+27

-16

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,12 @@ declare module 'nativescript-vue' {`
`11`	`11`	`*@param resolver function to register the element`
`12`	`12`	`*@param meta meta associated with the element`
`13`	`13`	`*/`
`14`		`-staticregisterElement(elementName:string,resolver:Function,meta?:any);`
	`14`	`+staticregisterElement(elementName:string,resolver:Function,meta?:any):void;`
	`15`	`+`
	`16`	`+/**`
	`17`	`+ * starts the nativescript application`
	`18`	`+ */`
	`19`	`+$run():void`
`15`	`20`	`}`
`16`	`21`
`17`	`22`	`export=NativeScriptVue;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ export function isUnknownElement(el) {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`exportfunctionisPage(el){`
`34`		`-returnel&&el.tagName==='page'`
	`34`	`+returnel&&el.tagName==='nativepage'`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/*@deprecated /`

Lines changed: 20 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,16 @@ Vue.config.silent = false`
`5`	`5`
`6`	`6`	`constApp={`
`7`	`7`	template:`
`8`		`- <Frame ref="frame">`
`9`		`- <Page>`
`10`		`- <StackLayout>`
`11`		`- <Button text="Open page" @tap="openPage" />`
`12`		`- </StackLayout>`
`13`		`- </Page>`
`14`		`- </Frame>`
	`8`	`+ <Frame>`
	`9`	`+ <Page>`
	`10`	`+ <ActionBar class="action-bar" title="Home Page">`
	`11`	`+ <ActionItem text="Action"></ActionItem>`
	`12`	`+ </ActionBar>`
	`13`	`+ <StackLayout>`
	`14`	`+ <Button text="Open page" @tap="openPage" />`
	`15`	`+ </StackLayout>`
	`16`	`+ </Page>`
	`17`	`+ </Frame>`
`15`	`18`	`,
`16`	`19`
`17`	`20`	`methods:{`
`@@ -23,13 +26,16 @@ const App = {`
`23`	`26`
`24`	`27`	`constDetailsPage={`
`25`	`28`	template:`
`26`		`- <Page>`
`27`		`- <StackLayout>`
`28`		`- <Label :text="'Details ' + Math.random()" />`
`29`		`- <Button text="another" @tap="openDetails" />`
`30`		`- <Button text="back" @tap="goBack" />`
`31`		`- </StackLayout>`
`32`		`- </Page>`
	`29`	`+ <Page>`
	`30`	`+ <ActionBar class="action-bar" title="Details Page">`
	`31`	`+ <ActionItem text="Action"></ActionItem>`
	`32`	`+ </ActionBar>`
	`33`	`+ <StackLayout>`
	`34`	`+ <Label :text="'Details ' + Math.random()" />`
	`35`	`+ <Button text="another" @tap="openDetails" />`
	`36`	`+ <Button text="back" @tap="goBack" />`
	`37`	`+ </StackLayout>`
	`38`	`+ </Page>`
`33`	`39`	`,
`34`	`40`
`35`	`41`	`methods:{`

Comments

(0)