merge conflicts

ionic/components/action-sheet/action-sheet.ts

@@ -106,6 +106,8 @@ class ActionSheetCmp {
  *
  * }
  * ```
+ *
+ * @see {@link /docs/v2/components#action-sheets ActionSheet Component Docs}
  */
 @Injectable()
 export class ActionSheet {

ionic/components/app/test/storage/index.ts

@@ -0,0 +1,42 @@
+import {Component, Control, ControlGroup} from 'angular2/angular2';
+
+import {App, Storage, LocalStorage, SqlStorage} from 'ionic/ionic';
+
+@App({
+  templateUrl: 'main.html'
+})
+class IonicApp {
+  constructor() {
+    this.local = new Storage(LocalStorage);
+    this.sql = new Storage(SqlStorage);
+  }
+  getLocal() {
+    this.local.get('name').then(value => {
+      alert('Your name is: ' + value);
+    });
+  }
+  setLocal() {
+    let name = prompt('Your name?');
+
+    this.local.set('name', name);
+  }
+  removeLocal() {
+    this.local.remove('name');
+  }
+
+  getSql() {
+    this.sql.get('name').then(value => {
+      alert('Your name is: ' + value);
+    }, (errResult) => {
+      console.error('Unable to get item from SQL db:', errResult);
+    });
+  }
+  setSql() {
+    let name = prompt('Your name?');
+
+    this.sql.set('name', name);
+  }
+  removeSql() {
+    this.sql.remove('name');
+  }
+}

ionic/components/app/test/storage/main.html

@@ -0,0 +1,11 @@
+<ion-content padding>
+  <h2>Local Storage</h2>
+  <button primary (click)="getLocal()">Get</button>
+  <button primary (click)="setLocal()">Set</button>
+  <button primary (click)="removeLocal()">Remove</button>
+
+  <h2>SQL Storage</h2>
+  <button primary (click)="getSql()">Get</button>
+  <button primary (click)="setSql()">Set</button>
+  <button primary (click)="removeSql()">Remove</button>
+</ion-content>

ionic/components/button/button.ts

@@ -26,6 +26,8 @@ import {Config} from '../../config/config';
   * @property [fab-bottom] - position a fab button towards the bottom
   * @description
   * Buttons are simple components in Ionic, can consist of text, an icon, or both, and can be enhanced with a wide range of attributes.
+  * @see {@link /docs/v2/components#buttons Button Component Docs}
+
  */
 @Directive({
   selector: 'button,[button]'

ionic/components/checkbox/checkbox.ts

@@ -17,6 +17,7 @@ import {Form} from '../../util/form';
  *   HTML5
  * </ion-checkbox>
  * ```
+ * @see {@link /docs/v2/components#checkbox Checkbox Component Docs}
  */
 @Component({
   selector: 'ion-checkbox',

ionic/components/icon/icon.ts

@@ -13,6 +13,7 @@ import {Config} from '../../config/config';
  * If there is not an outlined version for the particular icon, it will use the default (full) version.
  * @property {string} [ios] - Explicitly set the icon to use on iOS.
  * @property {string} [md] - Explicitly set the icon to use on Android.
+ * @see {@link /docs/v2/components#icons Icon Component Docs}
  *
  */
 @Directive({

ionic/components/item/item.ts

@@ -37,6 +37,8 @@ import {Component} from 'angular2/angular2';
  * </ion-list>
  *
  *  ```
+ * @see {@link /docs/v2/components#lists List Component Docs}
+ * @see {@link ../../list/List List API Docs}
  */
 @Component({
   selector: 'ion-item,[ion-item]',

ionic/components/list/list.ts

@@ -16,6 +16,7 @@ import * as util from 'ionic/util';
  * Using the List and Item components make it easy to support various
  * interaction modes such as swipe to edit, drag to reorder, and removing items.
  * @demo /docs/v2/demos/list/
+ * @see {@link /docs/v2/components#lists List Component Docs}
  *
  *
  */

ionic/components/menu/menu-close.ts

@@ -6,6 +6,8 @@ import {IonicApp} from '../app/app';
 
 /**
 * TODO
+* @see {@link /docs/v2/components#menus Menu Component Docs}
+* @see {@link ../../menu/Menu Menu API Docs}
 */
 @Directive({
   selector: '[menu-close]',

ionic/components/menu/menu-toggle.ts

@@ -8,6 +8,8 @@ import {Navbar} from '../navbar/navbar';
 
 /**
 * TODO
+* @see {@link /docs/v2/components#menus Menu Component Docs}
+* @see {@link ../../menu/Menu Menu API Docs}
 */
 @Directive({
   selector: '[menu-toggle]',

ionic/components/menu/menu-types.ts

@@ -7,6 +7,7 @@ import {Animation} from 'ionic/animations/animation';
  * Base class which is extended by the various types. Each
  * type will provide their own animations for open and close
  * and registers itself with Menu.
+ * @private
  */
 export class MenuType {
 

ionic/components/menu/menu.ts

@@ -42,6 +42,10 @@ import * as gestures from  './menu-gestures';
  * ```html
  * <ion-menu [content]="contentRef" type="overlay"></ion-menu>
  * ```
+ * @see {@link /docs/v2/components#menus Menu Component Docs}
+ * @see {@link /docs/v2/components#navigation Navigation Component Docs}
+ * @see {@link ../../nav/Nav Nav API Docs}
+ *
  */
 @Component({
   selector: 'ion-menu',

ionic/components/modal/modal.ts

@@ -33,6 +33,7 @@ import {extend} from 'ionic/util';
  *
  * }
  * ```
+ * @see {@link /docs/v2/components#modals Modal Component Docs}
  */
 @Injectable()
 export class Modal {

ionic/components/nav/nav-controller.ts

@@ -97,6 +97,7 @@ import {raf, rafFrames} from '../../util/dom';
  * - `onPageWillUnload` - Runs when the page is about to be destroyed and have its elements removed.
  * - `onPageDidUnload` - Runs after the page has been destroyed and its elements have been removed.
  *
+ * @see {@link /docs/v2/components#navigation Navigation Component Docs}
  */
 export class NavController extends Ion {
 

ionic/components/nav/nav-push.ts

@@ -36,6 +36,7 @@ import {NavRegistry} from './nav-registry';
  * ```html
  * <button [nav-push]="[pushPage, params]"></button>
  * ```
+ * @see {@link /docs/v2/components#navigation Navigation Component Docs}
  */
 @Directive({
   selector: '[nav-push]',

ionic/components/nav/nav.ts

@@ -96,6 +96,7 @@ import {ViewController} from './view-controller';
  *   </pre>
  * </div>
  *
+ * @see {@link /docs/v2/components#navigation Navigation Component Docs}
  */
 @ConfigComponent({
   selector: 'ion-nav',

ionic/components/popup/popup.ts

@@ -61,6 +61,7 @@ import {extend} from '../../util/util';
  *   }
  * }
  * ```
+ * @see {@link /docs/v2/components#popups Popup Component Docs}
  */
 @Injectable()
 export class Popup {

ionic/components/radio/radio.ts

@@ -40,6 +40,7 @@ import {ListHeader} from '../list/list';
  *
  * </ion-list>
  * ```
+ * @see {@link /docs/v2/components#radio Radio Component Docs}
 */
 @Directive({
   selector: '[radio-group]',
@@ -161,7 +162,8 @@ export class RadioGroup extends Ion {
  *   Radio Label
  * </ion-radio>
  * ```
- *
+ * 
+ * @see {@link /docs/v2/components#radio Radio Component Docs}
  */
 @Component({
   selector: 'ion-radio',

ionic/components/searchbar/searchbar.ts

@@ -20,6 +20,7 @@ import {Icon} from '../icon/icon';
  * @property [show-cancel] - shows the cancel button based on boolean value passed in
  * @property [cancel-text] - sets the cancel button text to the value passed in
  * @property [cancel-action] - the function that gets called by clicking the cancel button
+ * @see {@link /docs/v2/components#search Search Component Docs}
  */
 @ConfigComponent({
   selector: 'ion-searchbar',

ionic/components/segment/modes/md.scss

@@ -44,6 +44,7 @@ ion-segment {
     ion-segment-button[button][outline].activated,
     ion-segment-button[button][outline].segment-activated {
       background-color: transparent;
+      opacity: 1;
     }
   }
 

ionic/components/segment/segment.ts

@@ -36,6 +36,8 @@ import {Config} from '../../config/config';
  *   </ion-segment>
  * </form>
  * ```
+ *
+ * @see {@link /docs/v2/components#segment Segment Component Docs}
  */
 @Directive({
   selector: 'ion-segment'

ionic/components/slides/slides.ts

@@ -64,6 +64,7 @@ import {Scroll} from '../scroll/scroll';
  * @property {Any} [bounce] - whether the slides should bounce
  * @property [pager] - add this property to enable the slide pager
  * @property {Any} [slideChanged] - expression to evaluate when a slide has been changed
+ * @see {@link /docs/v2/components#slides Slides Component Docs}
  */
 @Component({
   selector: 'ion-slides',

ionic/components/switch/switch.ts

@@ -65,6 +65,7 @@ class MediaSwitch {
  *  </ion-list>
  * ```
  *
+ * @see {@link /docs/v2/components#switch Switch Component Docs}
  */
 @Component({
   selector: 'ion-switch',

ionic/components/tabs/tabs.ts

@@ -31,8 +31,8 @@ import {rafFrames} from '../../util/dom';
  * individual Tab components. On iOS, the TabBar is placed on the bottom of
  * the screen, while on Android it is at the top.
  *
- * See the [Tab API reference](../Tab/) for more details on individual Tab components.
- *
+ * @see {@link /docs/v2/components#tabs Tabs Component Docs}
+ * @see {@link ../Tab Tab API Docs}
  */
 @ConfigComponent({
   selector: 'ion-tabs',

ionic/platform/storage/sql.ts

@@ -22,7 +22,7 @@ const DB_NAME = '__ionicstorage';
  * });
  *
  * // Sql storage also exposes the full engine underneath
- * storage.query('insert into projects(name, data) values('Cool Project', 'blah');'
+ * storage.query('insert into projects(name, data) values('Cool Project', 'blah')');
  * storage.query('select * from projects').then((resp) => {})
  * ```
  *
@@ -39,7 +39,7 @@ export class SqlStorage extends StorageEngine {
   static BACKUP_LIBRARY = 1
   static BACKUP_DOCUMENTS = 0
 
-  constructor(options) {
+  constructor(options={}) {
     super();
 
     let dbOptions = util.defaults(options, {
@@ -98,19 +98,25 @@ export class SqlStorage extends StorageEngine {
    */
   query(query, ...params) {
     return new Promise((resolve, reject) => {
-      this._db.transaction((tx) => {
-        tx.executeSql(query, params, (tx, res) => {
-          resolve({
-            tx: tx,
-            res: res
-          });
-        }, (tx, err) => {
-          reject({
-            tx: tx,
-            err: err
-          });
-        })
-      });
+      try {
+        this._db.transaction((tx) => {
+          tx.executeSql(query, params, (tx, res) => {
+            resolve({
+              tx: tx,
+              res: res
+            });
+          }, (tx, err) => {
+            reject({
+              tx: tx,
+              err: err
+            });
+          })
+        }, err => {
+          reject(err);
+        });
+      } catch(e) {
+        reject(e);
+      }
     })
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ionic-framework",
-  "version": "2.0.0-alpha.39",
+  "version": "2.0.0-alpha.40",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

scripts/docs/templates/common.template.html

@@ -9,6 +9,8 @@ title: "<@ if doc.docType == "directive" @><$ doc.name | dashCase $><@ else @><$
 header_sub_title: "<$ doc.docType | capital $> in module <$ doc.module $>"
 doc: "<$ doc.name $>"
 docType: "<$ doc.docType $>"
+<@- if doc.demo and false -@>show_preview_device: true
+preview_device_url= "<$ doc.demo $>"<@- endif -@>
 ---
 
 
@@ -84,24 +86,6 @@ docType: "<$ doc.docType $>"
     Improve this doc
   </a>
 
-  <!-- TODO(drewrygh, perrygovier): render this block in the correct location, markup identical to component docs -->
-  <@- if doc.demo and false -@>
-  <aside id="platform-preview" class="platform-preview">
-    <div class="platform-toggle">
-      <a ng-class="{active: iosActive}"
-         ng-click="setPlatform('ios')">iOS</a>
-      <a ng-class="{active: androidActive}"
-         ng-click="setPlatform('android')">Android</a>
-    </div>
-    <div id="demo-device-ios" ng-class="previewPlatform">
-      <iframe id="demo-ios" src="<$ doc.demo $>" frameborder="0"></iframe>
-    </div>
-    <div id="demo-device-android" ng-class="previewPlatform">
-      <iframe id="demo-ios" src="<$ doc.demo $>" frameborder="0"></iframe>
-    </div>
-  </aside>
-  <@ endif @>
-
 </div>
 
 <@ block content @>
@@ -238,8 +222,7 @@ Delegate: <$ doc.delegate $>
 
 <@- if doc.see @>
 
-  <h2>Related</h2>
-
+<h2>Related</h2>
 <@ for s in doc.see @>
 <$ s | safe $>
 <@- endfor -@>
@@ -252,4 +235,3 @@ Delegate: <$ doc.delegate $>
 
 <!-- end body block -->
 <@ endblock @>
-