diff --git a/ionic/components/infinite-scroll/infinite-scroll.ts b/ionic/components/infinite-scroll/infinite-scroll.ts index 46e2fed086..458322e52c 100644 --- a/ionic/components/infinite-scroll/infinite-scroll.ts +++ b/ionic/components/infinite-scroll/infinite-scroll.ts @@ -178,7 +178,6 @@ export class InfiniteScroll { let distanceFromInfinite = ((d.scrollHeight - infiniteHeight) - d.scrollTop) - reloadY; if (distanceFromInfinite < 0) { this._zone.run(() => { - console.debug('infinite scroll'); this.state = STATE_LOADING; this.infinite.emit(this); }); diff --git a/ionic/components/refresher/refresher.ts b/ionic/components/refresher/refresher.ts index 881dbfcb4f..b197006c25 100644 --- a/ionic/components/refresher/refresher.ts +++ b/ionic/components/refresher/refresher.ts @@ -251,7 +251,6 @@ export class Refresher { // this method can get called like a bazillion times per second, // so it's built to be as efficient as possible, and does its // best to do any DOM read/writes only when absolutely necessary - console.debug('Pull-to-refresh, onMove', ev.type); // if multitouch then get out immediately if (ev.touches && ev.touches.length > 1) { diff --git a/ionic/components/slides/swiper-widget.d.ts b/ionic/components/slides/swiper-widget.d.ts index af8c8bb351..97750f3fb2 100644 --- a/ionic/components/slides/swiper-widget.d.ts +++ b/ionic/components/slides/swiper-widget.d.ts @@ -4,9 +4,9 @@ export declare class Swiper { activeIndex: number; isEnd: boolean; isBeginning: boolean; - - update(); - slideNext(); - slidePrev(); - -} \ No newline at end of file + + update():any; + slideNext():any; + slidePrev():any; + +} diff --git a/ionic/components/toolbar/toolbar.ts b/ionic/components/toolbar/toolbar.ts index 6de072e823..d9515f3a7e 100644 --- a/ionic/components/toolbar/toolbar.ts +++ b/ionic/components/toolbar/toolbar.ts @@ -92,7 +92,8 @@ export class ToolbarBase extends Ion { * * ``` * - * @property {any} [position] - set position of the toolbar, top or bottom. If not set, defautls to top. + * @property {any} [position] - set position of the toolbar, `top` or `bottom`. + * Default `top`. * @demo /docs/v2/demos/toolbar/ * @see {@link ../../navbar/Navbar/ Navbar API Docs} */ diff --git a/ionic/util/dom.ts b/ionic/util/dom.ts index 93f4a2cf4c..4d0dd3540e 100644 --- a/ionic/util/dom.ts +++ b/ionic/util/dom.ts @@ -91,25 +91,25 @@ export let CSS: { export function transitionEnd(el: HTMLElement, callback: Function) { if (el) { - function unregister() { - CSS.transitionEnd.split(' ').forEach(eventName => { - el.removeEventListener(eventName, onEvent); - }); - } - - function onEvent(ev) { - if (el === ev.target) { - unregister(); - callback(ev); - } - } - CSS.transitionEnd.split(' ').forEach(eventName => { el.addEventListener(eventName, onEvent); }); return unregister; } + + function unregister() { + CSS.transitionEnd.split(' ').forEach(eventName => { + el.removeEventListener(eventName, onEvent); + }); + } + + function onEvent(ev) { + if (el === ev.target) { + unregister(); + callback(ev); + } + } } export function ready(callback?: Function) { @@ -124,17 +124,17 @@ export function ready(callback?: Function) { callback(); } else { - function completed() { - document.removeEventListener('DOMContentLoaded', completed, false); - window.removeEventListener('load', completed, false); - callback(); - } - document.addEventListener('DOMContentLoaded', completed, false); window.addEventListener('load', completed, false); } return promise; + + function completed() { + document.removeEventListener('DOMContentLoaded', completed, false); + window.removeEventListener('load', completed, false); + callback(); + } } export function windowLoad(callback?: Function) { @@ -149,15 +149,16 @@ export function windowLoad(callback?: Function) { callback(); } else { - function completed() { - window.removeEventListener('load', completed, false); - callback(); - } window.addEventListener('load', completed, false); } return promise; + + function completed() { + window.removeEventListener('load', completed, false); + callback(); + } } export function pointerCoord(ev: any): {x: number, y: number} { diff --git a/scripts/docs/deploy.sh b/scripts/docs/deploy.sh index 8c20ea7492..f3ef689d28 100755 --- a/scripts/docs/deploy.sh +++ b/scripts/docs/deploy.sh @@ -39,11 +39,11 @@ function run { # if no changes, don't commit if [[ "$CHANGES" == "" ]]; then - ls - echo "-- No changes detected in docs for $VERSION_NAME; docs not updated." + echo "-- No changes detected for the following commit, docs not updated." + echo "https://github.com/driftyco/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1" else git add -A - git commit -am "docs: update for $VERSION" + git commit -am "Automated build of ionic v$VERSION driftyco/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1" git push origin master echo "-- Updated docs for $VERSION_NAME succesfully!" diff --git a/scripts/docs/processors/jekyll.js b/scripts/docs/processors/jekyll.js index 1d3a68fd4e..7d4ca2517b 100644 --- a/scripts/docs/processors/jekyll.js +++ b/scripts/docs/processors/jekyll.js @@ -21,6 +21,10 @@ module.exports = function jekyll(renderDocsProcessor) { .replace('/index.md','') .replace('//home/ubuntu/ionic/ionic', '') .replace('//', '/'); + if (docs[i].relativePath) { + docs[i].relativePath = doc.relativePath + .replace('/home/ubuntu/ionic', ''); + } }); docs.push({ diff --git a/scripts/docs/templates/common.template.html b/scripts/docs/templates/common.template.html index c20a4f29d1..6b9d4b269b 100644 --- a/scripts/docs/templates/common.template.html +++ b/scripts/docs/templates/common.template.html @@ -147,7 +147,7 @@ Delegate: <$ doc.delegate $> - + Improve this doc diff --git a/scripts/git/clone.sh b/scripts/git/clone.sh index 07a064575b..2eb173ebe7 100755 --- a/scripts/git/clone.sh +++ b/scripts/git/clone.sh @@ -16,6 +16,8 @@ function run { ARGS="--branch=${BRANCH:-master}" if [[ "$DEPTH" != "" ]]; then ARGS="$ARGS --depth=$DEPTH" + else + ARGS="$ARGS --depth=2" fi git clone https://driftyco:$GH_TOKEN@github.com/$REPOSITORY $DIRECTORY $ARGS cd $DIRECTORY