chore: merge master into frame-and-router

rigor789 · rigor789 · commit ad68b50d70f3 · 2018-07-09T12:05:11.000+02:00
diff --git a/index.d.ts b/index.d.ts
@@ -11,7 +11,12 @@ declare module 'nativescript-vue' {
          * @param resolver  function to register the element
          * @param meta meta associated with the element
          */
-        static registerElement(elementName: string, resolver: Function, meta?: any);
+        static registerElement(elementName: string, resolver: Function, meta?: any): void;
+        
+        /**
+         * starts the nativescript application
+         */
+        $run(): void
     }
 
     export = NativeScriptVue;
diff --git a/platform/nativescript/util/index.js b/platform/nativescript/util/index.js
@@ -31,7 +31,7 @@ export function isUnknownElement(el) {
 }
 
 export function isPage(el) {
-  return el && el.tagName === 'page'
+  return el && el.tagName === 'nativepage'
 }
 
 /** @deprecated */
diff --git a/samples/app/app-with-pages.js b/samples/app/app-with-pages.js
@@ -5,13 +5,16 @@ Vue.config.silent = false
 
 const App = {
   template: `
-    <Frame ref="frame">
-      <Page>
-        <StackLayout>
-          <Button text="Open page" @tap="openPage" />
-        </StackLayout>
-      </Page>
-    </Frame> 
+  <Frame>
+    <Page>
+      <ActionBar class="action-bar" title="Home Page">
+        <ActionItem text="Action"></ActionItem>
+      </ActionBar>
+      <StackLayout>
+        <Button text="Open page" @tap="openPage" />
+      </StackLayout>
+    </Page>
+  </Frame>
   `,
 
   methods: {
@@ -23,13 +26,16 @@ const App = {
 
 const DetailsPage = {
   template: `
-    <Page>
-      <StackLayout>
-        <Label :text="'Details ' + Math.random()" />
-        <Button text="another" @tap="openDetails" />
-        <Button text="back" @tap="goBack" />
-      </StackLayout>
-    </Page>
+  <Page>
+    <ActionBar class="action-bar" title="Details Page">
+      <ActionItem text="Action"></ActionItem>
+    </ActionBar>
+    <StackLayout>
+      <Label :text="'Details ' + Math.random()" />
+      <Button text="another" @tap="openDetails" />
+      <Button text="back" @tap="goBack" />
+    </StackLayout>
+  </Page>
   `,
 
   methods: {

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