From 7bb9e3e07bd5ef030d8c6acbf6d17e5f2a846f34 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 8 Dec 2015 16:12:55 -0600 Subject: [PATCH 1/3] fix(hammer): attach Hammer to window object Closes #696 --- ionic/gestures/hammer.ts | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/ionic/gestures/hammer.ts b/ionic/gestures/hammer.ts index 5c781532a1..827f765b58 100644 --- a/ionic/gestures/hammer.ts +++ b/ionic/gestures/hammer.ts @@ -2,9 +2,7 @@ * http://hammerjs.github.io/ * * Copyright (c) 2014 Jorik Tangelder; - * Licensed under the MIT license */ -//(function(window, document, exportName, undefined) { -//'use strict'; + * Licensed under the MIT license */ var VENDOR_PREFIXES = ['', 'webkit', 'moz', 'MS', 'ms', 'o']; var TEST_ELEMENT = document.createElement('div'); @@ -2452,19 +2450,8 @@ extend(Hammer, { bindFn: bindFn, prefixed: prefixed }); + +// attach to window for angular2 gesture listeners +window.Hammer = Hammer; -/* -if (typeof define == TYPE_FUNCTION && define.amd) { - define(function() { - return Hammer; - }); -} else if (typeof module != 'undefined' && module.exports) { - module.exports = Hammer; -} else { - window[exportName] = Hammer; -} -*/ - -export {Hammer}; - -//})(window, document, 'Hammer'); +export {Hammer}; From 360ddd33380d5481b8ec7461eecb1d6a800dee05 Mon Sep 17 00:00:00 2001 From: Drew Rygh Date: Tue, 8 Dec 2015 16:24:29 -0600 Subject: [PATCH 2/3] docs(navPush/navPop): add demo links --- ionic/components/nav/nav-push.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ionic/components/nav/nav-push.ts b/ionic/components/nav/nav-push.ts index 4f5038d29b..0a1cbaeef9 100644 --- a/ionic/components/nav/nav-push.ts +++ b/ionic/components/nav/nav-push.ts @@ -36,7 +36,9 @@ import {NavRegistry} from './nav-registry'; * ```html * * ``` + * @demo /docs/v2/demos/nav-push-pop/ * @see {@link /docs/v2/components#navigation Navigation Component Docs} + * @see {@link ../NavPop NavPop API Docs} */ @Directive({ selector: '[nav-push]', @@ -87,6 +89,9 @@ export class NavPush { /** * TODO + * @demo /docs/v2/demos/nav-push-pop/ + * @see {@link /docs/v2/components#navigation Navigation Component Docs} + * @see {@link ../NavPush NavPush API Docs} */ @Directive({ selector: '[nav-pop]', From 15f02998166ee51fd7277f6ab6c17c5824385fea Mon Sep 17 00:00:00 2001 From: Drew Rygh Date: Tue, 8 Dec 2015 16:31:13 -0600 Subject: [PATCH 3/3] docs(localStorage): add demo link --- ionic/platform/storage/local-storage.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ionic/platform/storage/local-storage.ts b/ionic/platform/storage/local-storage.ts index 8051032914..8d4309f521 100644 --- a/ionic/platform/storage/local-storage.ts +++ b/ionic/platform/storage/local-storage.ts @@ -10,6 +10,8 @@ import {StorageEngine} from './storage'; * by the operating system (iOS). * * For guaranteed, long-term storage, use the SqlStorage engine which stores data in a file. + * @demo /docs/v2/demos/local-storage/ + * @see {@link /docs/v2/platform/storage/ Storage Platform Docs} */ export class LocalStorage extends StorageEngine { constructor() {