Merge branch 'master' into page-indicators

# Conflicts:
#	nativescript-slides.ts

Author: JoshDSommer

README.md

@@ -77,6 +77,8 @@ the `<Slides:SlideContainer>` element also has a property called `pageIndicators
 
 the `<Slides:SlideContainer>` element also has a property called `interval` which is a integer value and the value is in milliseconds. The suggested use case would be for a Image Carousel or something of that nature which can change the image for every fixed intervals. In unloaded function call `page.getViewById("your_id").stopSlideshow()` to unregister it (your_id is the id given to `<Slides:SlideContainer>`), it can be restarted with `startSlidShow`.
 
+the `<Slides:SlideContainer>` element also has a property called `disablePan` which is used to disable panning when set to true. So that you can call nextSlide() function to change the slide. If slides is used to get details about users like email, phone number ,username etc in this case you don't want users to move from one slide to another slide without filling details. So, you can disablePan option.
+
 #### Angular 2 compatibility
 To use the slides with Angular2 and the `registerElement` from `nativescript-angular` you will want to set the `SlideContainer`'s property of `angular` to `true`. Then in your angular component in the `ngAfterViewInit`. you will want to have an instance of your slide container to call the function `constructView()`.
 

nativescript-slides.d.ts

@@ -22,13 +22,15 @@ export declare class SlideContainer extends AbsoluteLayout {
     private _androidTranslucentNavBar;
     private timer_reference;
     private _angular;
+    private _disablePan;
     private _footer;
     private _pageIndicators;
     pageIndicators: boolean;
     hasNext: boolean;
     hasPrevious: boolean;
     interval: number;
     loop: boolean;
+    disablePan: boolean;
     androidTranslucentStatusBar: boolean;
     androidTranslucentNavBar: boolean;
     velocityScrolling: boolean;

nativescript-slides.ts

@@ -47,6 +47,7 @@ export class SlideContainer extends AbsoluteLayout {
 	private _androidTranslucentNavBar: boolean;
 	private timer_reference: number;
 	private _angular: boolean;
+	private _disablePan: boolean;
 	private _footer: StackLayout;
 	private _pageIndicators: boolean;
 
@@ -81,6 +82,14 @@ export class SlideContainer extends AbsoluteLayout {
 		this._loop = value;
 	}
 
+	get disablePan() {
+		return this._disablePan;
+	}
+
+	set disablePan(value: boolean) {
+		this._disablePan = value;
+	}
+
 	get androidTranslucentStatusBar() {
 		return this._androidTranslucentStatusBar;
 	}
@@ -149,6 +158,10 @@ export class SlideContainer extends AbsoluteLayout {
 			this.interval = 0;
 		}
 
+		if (this._disablePan == null) {
+			this.disablePan = false;
+		}
+
 		if (this._velocityScrolling == null) {
 			this._velocityScrolling = false;
 		}
@@ -172,6 +185,7 @@ export class SlideContainer extends AbsoluteLayout {
 				}
 				// Android Translucent bars API >= 19 only
 				if (app.android && this.androidTranslucentStatusBar === true || this._androidTranslucentNavBar === true && Platform.device.sdkVersion >= '19') {
+
 					let window = app.android.startActivity.getWindow();
 
 					// check for status bar
@@ -205,7 +219,9 @@ export class SlideContainer extends AbsoluteLayout {
 
 				this.currentPanel = this.buildSlideMap(slides);
 				this.currentPanel.panel.translateX = -this.pageWidth;
-				this.applySwipe(this.pageWidth);
+				if(this.disablePan === false) {
+					this.applySwipe(this.pageWidth);
+				}
 
 				//handles application orientation change
 				app.on(app.orientationChangedEvent, (args: app.OrientationChangedEventData) => {
@@ -216,7 +232,9 @@ export class SlideContainer extends AbsoluteLayout {
 							view.width = this.pageWidth;
 						}
 					});
-					this.applySwipe(this.pageWidth);
+					if(this.disablePan === false) {
+						this.applySwipe(this.pageWidth);
+					}
 					let topOffset = Platform.screen.mainScreen.heightDIPs - 105;
 					AbsoluteLayout.setTop(this._footer, topOffset);
 					this.currentPanel.panel.translateX = -this.pageWidth;
@@ -291,8 +309,10 @@ export class SlideContainer extends AbsoluteLayout {
 		this.transitioning = false;
 		this.currentPanel.panel.off('pan');
 		this.currentPanel = panel;
+		if(this.disablePan == false) {
+			this.applySwipe(this.pageWidth);
+		}
 		this.setActivePageIndicator(this.currentPanel.index);
-		this.applySwipe(this.pageWidth);
 		this.rebindSlideShow();
 	}
 
@@ -479,7 +499,7 @@ export class SlideContainer extends AbsoluteLayout {
 		activeIndicator.className = 'slide-indicator-active';
 		activeIndicator.opacity = 0.9;
 
-		footerInnerWrap.marginTop = <any>"88%";
+		footerInnerWrap.marginTop = <any>'88%';
 
 		return footerInnerWrap;
 	}
@@ -544,4 +564,4 @@ export class SlideContainer extends AbsoluteLayout {
 		activeIndicator.opacity = 0.9;
 
 	}
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nativescript-slides",
-	"version": "1.4.5",
+	"version": "1.5.0",
 	"description": "NativeScript Slides plugin.",
 	"main": "nativescript-slides.js",
 	"nativescript": {