X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/ee0633b788ca7650b0cab7f57ef6b846333c26f7..1a28edcbf9b0c46fbab9bcc9fff0b065349f8f24:/skins/photo_film_viewer.js?ds=sidebyside

diff --git a/skins/photo_film_viewer.js b/skins/photo_film_viewer.js
index a1ec07d..566984a 100644
--- a/skins/photo_film_viewer.js
+++ b/skins/photo_film_viewer.js
@@ -1,9 +1,7 @@
 /*
-* © 2008-2014 Benoît Pin – Centre de recherche en informatique – MINES ParisTech
-* http://plinn.org
-* Licence Creative Commons http://creativecommons.org/licenses/by-nc/2.0/
-* 
-* 
+copyright 2008-2014 Benoit Pin - Centre de recherche en informatique - MINES ParisTech
+http://plinn.org
+Licence Creative Commons http://creativecommons.org/licenses/by-nc/2.0/
 */
 
 var FilmSlider;
@@ -19,6 +17,7 @@ var DEFAULT_IMAGE_SIZES = [500, 600, 800];
 FilmSlider = function(filmBar, slider, ctxInfos, image, toolbar, breadcrumbs) {
 	var thisSlider = this;
 	this.filmBar = filmBar;
+	this.filmBarWidth = getObjectWidth(this.filmBar);
 	var film = filmBar.firstChild;
 	if (film.nodeType === 3) { film = film.nextSibling; }
 	this.film = film;
@@ -74,42 +73,82 @@ FilmSlider = function(filmBar, slider, ctxInfos, image, toolbar, breadcrumbs) {
 					   'out' :	function(evt){thisSlider.mouseOutHandler(evt);}
 					  };
 
-	this.resizeSlider();
+	if (browser.isMobile) {
+		this.rail.className = 'hidden';
+	}
+	else { 
+		this.resizeSlider();
+	}
 	this.addEventListeners();
 };
 
-
-FilmSlider.prototype.resizeSlider = function(evt) {
-	var filmBarWidth = getObjectWidth(this.filmBar);
-	if (!filmBarWidth) {
-		var thisSlider = this;
-		addListener(window, 'load', function(evt){thisSlider.resizeSlider(evt);});
-		return;
-	}
+if (!browser.isMobile) {
+	FilmSlider.prototype.resizeSlider = function(evt) {
+		var filmBarWidth = this.filmBarWidth;
+		if (!filmBarWidth) { return; }
+		var filmWidth = this.slideSize * this.filmLength;
+		var sliderRatio = this.sliderRatio =  filmBarWidth / filmWidth;
+		var sliderWidth = filmBarWidth * sliderRatio;
+		this.rail.style.width = filmBarWidth + 'px';
+		this.rail.style.display = 'block';
+		this.rail.style.visibility = 'visible';
+		if (sliderRatio < 1) {
+			this.slider.style.width = Math.round(sliderWidth) + 'px';
+			this.slider.style.visibility = 'visible';
+		}
+		else {
+			this.slider.style.visibility = 'hidden';
+		}
 	
-	var filmWidth = this.slideSize * this.filmLength;
-	var sliderRatio = this.sliderRatio =  filmBarWidth / filmWidth;
-	var sliderWidth = filmBarWidth * sliderRatio;
-	this.rail.style.width = filmBarWidth + 'px';
-	this.rail.style.display = 'block';
-	this.rail.style.visibility = 'visible';
-	if (sliderRatio < 1) {
-		this.slider.style.width = Math.round(sliderWidth) + 'px';
-		this.slider.style.visibility = 'visible';
-	}
-	else {
-		this.slider.style.visibility = 'hidden';
+		this.winSize = {'width'	 : getWindowWidth(),
+						'height' : getWindowHeight()};
+		this.maxRightPosition = filmBarWidth - sliderWidth;
+		this.sliderSpeedRatio = - (filmBarWidth - sliderWidth) / (filmWidth - filmBarWidth);
+		if (!this.initialized) {
+			this.centerSlide(this.center);
+			this.selectedSlide = this.filmBar.getElementsByTagName('img')[this.center].parentNode;
+			this.initialized = true;
+		}
+	};
+}
+
+else {
+	// pas de barre de scroll horizontal pour les tablettes
+	FilmSlider.prototype.resizeSlider = function(evt) {};
+}
+
+FilmSlider.prototype._checkSizeAfterLoad = function(evt) {
+	this._barSizes = [];
+	this.filmBarWidth = this._barSizes[this._barSizes.length] = getObjectWidth(this.filmBar);
+	this.resizeSlider();
+	var self = this;
+	this._checkSizeIntervalId = setInterval(function(evt){self._checkSize(evt);}, 25);
+	setTimeout(function(evt){self._checkSizeStability();}, 250);
+};
+
+FilmSlider.prototype._checkSize = function(evt) {
+	this._barSizes[this._barSizes.length] = getObjectWidth(this.filmBar);
+	if (this._barSizes.length >= 2 &&
+		this._barSizes[this._barSizes.length-2] !== this._barSizes[this._barSizes.length-1]) {
+		this.filmBarWidth = this._barSizes[this._barSizes.length-1];
+		this.initialized = false;
+		this.resizeSlider();
 	}
-	
-	this.winSize = {'width'	 : getWindowWidth(),
-					'height' : getWindowHeight()};
-	this.maxRightPosition = filmBarWidth - sliderWidth;
-	this.sliderSpeedRatio = - (filmBarWidth - sliderWidth) / (filmWidth - filmBarWidth);
-	if (!this.initialized) {
-		this.centerSlide(this.center);
-		this.selectedSlide = this.filmBar.getElementsByTagName('img')[this.center].parentNode;
-		this.initialized = true;
+};
+
+FilmSlider.prototype._checkSizeStability = function(evt) {
+	var self = this;
+	var i;
+	for (i=0 ; i<this._barSizes.length - 1 ; i++) {
+		if (this._barSizes[i] !== this._barSizes[i+1]) {
+			this._barSizes = [];
+			setTimeout(function(evt){self._checkSizeStability();}, 250);
+			return;
+		}
 	}
+	clearInterval(this._checkSizeIntervalId);
+	delete this._barSizes;
+	delete this._checkSizeIntervalId;
 };
 
 FilmSlider.prototype.fitToScreen = function(evt) {
@@ -120,7 +159,12 @@ FilmSlider.prototype.fitToScreen = function(evt) {
 
 FilmSlider.prototype._fitToScreen = function(evt) {
 	var wh = getWindowHeight();
-	var rb = getObjectTop(this.rail) + getObjectHeight(this.rail); // rail bottom
+	if (!browser.isMobile) {
+		var rb = getObjectTop(this.rail) + getObjectHeight(this.rail); // rail bottom
+	}
+	else {
+		var rb = getObjectTop(this.filmBar) + getObjectHeight(this.filmBar); // film bottom
+	}
 	var delta = wh - rb;
 	var sh = getObjectHeight(this.stretchable);
 	var newSize = sh + delta;
@@ -218,6 +262,7 @@ FilmSlider.prototype.addEventListeners = function() {
 	addListener(this.filmBar, 'click', function(evt){thisSlider.thumbnailClickHandler(evt);});
 	addListener(this.toolbar, 'click', function(evt){thisSlider.toolbarClickHandler(evt);});
 	addListener(window, 'load', function(evt){thisSlider.fitToScreen(evt);});
+	addListener(window, 'load', function(evt){thisSlider._checkSizeAfterLoad(evt);});
 	
 	// dd listeners
 	addListener(this.slider, 'mousedown', this.ddHandlers.down);
@@ -232,6 +277,11 @@ FilmSlider.prototype.addEventListeners = function() {
 	else if (browser.isIE6up) {
 		addListener(this.filmBar, 'mousewheel', function(evt){thisSlider.mouseWheelHandler(evt);});
 	}
+	if (browser.isMobile) {
+		this.filmBar.addEventListener('touchstart', function(evt){thisSlider.touchStartHandler(evt);}, false);
+		this.filmBar.addEventListener('touchmove', function(evt){thisSlider.touchMoveHandler(evt);}, false);
+		this.filmBar.addEventListener('touchend', function(evt){thisSlider.touchEndHandler(evt);}, false);
+	}
 	
 	addListener(document, 'keydown', function(evt){thisSlider.keyDownHandler(evt);});
 	addListener(document, 'keypress', function(evt){thisSlider.keyPressHandler(evt);});
@@ -333,10 +383,10 @@ FilmSlider.prototype.thumbnailClickHandler = function(evt) {
 		this.cartSlide.style.visibility='hidden';
 		
 		
-		var metadataButton = this.buttons.edit_metadata
+		var metadataButton = this.buttons.edit_metadata;
 		if (metadataButton) {
 			var metadataEditLink = metadataButton.parentNode;
-			metadataEditLink.href = canonicalImgUrl + '/photo_edit_form'
+			metadataEditLink.href = canonicalImgUrl + '/photo_edit_form';
 		}
 		
 
@@ -359,12 +409,9 @@ FilmSlider.prototype.thumbnailClickHandler = function(evt) {
 					break;
 				case 4 :
 					hideProgressImage();
-					if (req.status === '200') { thisFS.populateViewer(req); }
-					// else
-					//	//window.location.href = target.href;
-					//	console.error(ajaxUrl);
-
-			};
+					if (req.status === 200) { thisFS.populateViewer(req); }
+					break;
+			}
 		};
 
 		req.open("GET", ajaxUrl, true);
@@ -376,13 +423,14 @@ FilmSlider.prototype.thumbnailClickHandler = function(evt) {
 		var newClasses = [];
 		var name, i;
 
-		for (i in classes) {
+		for (i=0 ; i<classes.length ;  i++) {
 			name = classes[i];
-			if (name === 'displayed') { continue; }
-			else { newClasses.push(name); }
+			if (name !== 'displayed') {
+				newClasses.push(name);
+			}
 		}
 		
-		this.selectedSlide.className = newClasses.join(' ')
+		this.selectedSlide.className = newClasses.join(' ');
 		
 		// hightlight new displayed slide
 		this.selectedSlide = target;
@@ -395,21 +443,22 @@ FilmSlider.prototype.thumbnailClickHandler = function(evt) {
 
 FilmSlider.prototype.toolbarClickHandler = function(evt) {
 	var target = getTargetedObject(evt);
+	var button, link, url;
 	if(target.tagName === 'IMG' && target.getAttribute('name')) {
 		switch(target.getAttribute('name')) {
 			case 'previous' :
 				disableDefault(evt);
 				disablePropagation(evt);
-				var button = target;
-				var link = button.parentNode;
+				button = target;
+				link = button.parentNode;
 				link.blur();
 				this.loadSibling(true);
 				break;
 			case 'next' : 
 				disableDefault(evt);
 				disablePropagation(evt);
-				var button = target;
-				var link = button.parentNode;
+				button = target;
+				link = button.parentNode;
 				link.blur();
 				this.loadSibling(false);
 				break;
@@ -424,7 +473,7 @@ FilmSlider.prototype.toolbarClickHandler = function(evt) {
 					return;
 				}
 				var main = document.getElementById('photo_viewer');
-				var url = target.parentNode.href;
+				url = target.parentNode.href;
 				url = url.substring(0, url.length - '/zoom_view'.length);
 				var margins = {'top':0, 'right':-1, 'bottom':0, 'left':0};
 				this.mosaique = new Mosaique(main, url, margins);
@@ -434,12 +483,12 @@ FilmSlider.prototype.toolbarClickHandler = function(evt) {
 			case 'toggle_selection':
 				disableDefault(evt);
 				disablePropagation(evt);
-				var button = target;
-				var link = button.parentNode;
+				button = target;
+				link = button.parentNode;
 				link.blur();
 				
 				var req = new XMLHttpRequest();
-				var url = link.href;
+				url = link.href;
 				req.open("POST", url, true);
 				req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
 				req.send("ajax=1");
@@ -469,8 +518,8 @@ FilmSlider.prototype.toolbarClickHandler = function(evt) {
 			case 'show_buyable':
 				disableDefault(evt);
 				disablePropagation(evt);
-				var button = target;
-				var link = button.parentNode;
+				button = target;
+				link = button.parentNode;
 				link.blur();
 				var slide = this.cartSlide;
 				slide.innerHTML = '';
@@ -536,8 +585,24 @@ else if (browser.isIE6up) {
 	};
 }
 
+FilmSlider.prototype.touchStartHandler = function(evt) {
+	this.filmStartX = parseInt(this.film.style.left, 10);
+	this.touchStartX = evt.pageX;
+};
+
+FilmSlider.prototype.touchMoveHandler = function(evt) {
+	var delta = this.touchStartX - evt.pageX;
+	var posX = Math.min(0, this.filmStartX - delta);
+	this.film.style.left = String(posX) + 'px';
+};
+
+FilmSlider.prototype.touchEndHandler = function(evt) {
+	this.touchStartX = undefined;
+};
+
+
 FilmSlider.prototype.keyDownHandler = function(evt) {
-	var evt = getEventObject(evt);
+	evt = getEventObject(evt);
 	switch (evt.keyCode) {
 		case keyLeft :
 			this.loadSibling(true);
@@ -554,7 +619,7 @@ FilmSlider.prototype.keyDownHandler = function(evt) {
 FilmSlider.prototype.keyPressHandler = function(evt) {
 	var target = getTargetedObject(evt);
 	if (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA') { return; }
-	var evt = getEventObject(evt);
+	evt = getEventObject(evt);
 	var charPress = String.fromCharCode((evt.keyCode) ? evt.keyCode : evt.which);
 	switch(charPress) {
 		case 'f':
@@ -566,7 +631,8 @@ FilmSlider.prototype.keyPressHandler = function(evt) {
 
 FilmSlider.prototype.populateViewer = function(req) {
 	var elements = req.responseXML.documentElement.childNodes;
-	for(var i=0 ; i < elements.length ; i++ ) {
+	var i;
+	for(i=0 ; i < elements.length ; i++ ) {
 		element = elements[i];
 		switch (element.nodeName) {
 			case 'fragment' :
@@ -575,13 +641,13 @@ FilmSlider.prototype.populateViewer = function(req) {
 				break;
 			case 'imageattributes' :
 				var link = this.buttons.back_to_portfolio.parentNode;
-				link.href = element.getAttribute('backToContextUrl');
+				link.href = element.getAttribute('back_to_context_url');
 				link = this.buttons.show_buyable.parentNode;
 				var buyable = element.getAttribute('buyable');
 				if(buyable === 'True') { link.className = null; }
 				else if(buyable === 'False') { link.className = 'hidden'; }
 				this.image.alt = element.getAttribute('alt');
-				this.updateBreadcrumbs(element.getAttribute('lastBcUrl'),
+				this.updateBreadcrumbs(element.getAttribute('last_bc_url'),
 									   element.getAttribute('img_id'));
 				break;
 		}
@@ -622,8 +688,7 @@ FilmSlider.prototype.slideShowNext = function() {
 	else {
 		var row = this.slideShowSlide.parentNode.parentNode;
 		var first = row.firstChild;
-		if (first.nodeType===3)
-			first = first.nextSibling;
+		if (first.nodeType===3) { first = first.nextSibling; }
 		this.pendingSlideShowSlide = first.getElementsByTagName('a')[0];
 		return this.pendingSlideShowSlide.href;
 	}
@@ -653,7 +718,7 @@ FilmSlider.prototype.slideShowImageLoaded = function() {
 
 FilmSlider.prototype.stopSlideShow = function() {
 	raiseMouseEvent(this.slideShowSlide, 'click');
-	var index = parseInt(this.selectedSlide.getAttribute('portfolio:position'));
+	var index = parseInt(this.selectedSlide.getAttribute('portfolio:position'), 10);
 	this.centerSlide(index);
 };
 
@@ -665,7 +730,7 @@ function Point(x, y) {
 }
 Point.prototype.diff = function(point) { return new Point(this.x - point.x, this.y - point.y); };
 Point.prototype.add = function(point) { return new Point(this.x + point.x, this.y + point.y); };
-Point.prototype.mul = function(k) { return new Point(this.x * k, this.y *k)};
+Point.prototype.mul = function(k) { return new Point(this.x * k, this.y *k); };
 Point.prototype.toString = function() { return "(" + String(this.x) + ", " + String(this.y) + ")"; };
 
-})();
+}());