X-Git-Url: https://scm.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/7ac0ca74ce1435919f21b6a0e5b28ba40cf00780..6e817759eb01c8419a8aaf4194afd73bcc60bc93:/skins/photo_film_viewer.js

diff --git a/skins/photo_film_viewer.js b/skins/photo_film_viewer.js
index edf2069..226e6dd 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;
@@ -80,13 +79,8 @@ FilmSlider = function(filmBar, slider, ctxInfos, image, toolbar, breadcrumbs) {
 
 
 FilmSlider.prototype.resizeSlider = function(evt) {
-	var filmBarWidth = getObjectWidth(this.filmBar);
-	if (!filmBarWidth) {
-		var thisSlider = this;
-		addListener(window, 'load', function(evt){thisSlider.resizeSlider(evt);});
-		return;
-	}
-	
+	var filmBarWidth = this.filmBarWidth;
+	if (!filmBarWidth) { return; }
 	var filmWidth = this.slideSize * this.filmLength;
 	var sliderRatio = this.sliderRatio =  filmBarWidth / filmWidth;
 	var sliderWidth = filmBarWidth * sliderRatio;
@@ -112,6 +106,40 @@ 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();
+	}
+};
+
+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) {
 	this._fitToScreen();
 	var thisSlider = this;
@@ -144,16 +172,14 @@ FilmSlider.prototype.getBestFitSize = function(ratio) {
 		for (i=DEFAULT_IMAGE_SIZES.length -1 ; i>0 ; i--) {
 			irw = DEFAULT_IMAGE_SIZES[i];
 			irh = irw * ratio;
-			if (irw <= fw && irh <= fh)
-				break;
+			if (irw <= fw && irh <= fh) { break; }
 		}
 	}
 	else {
 		for (i=DEFAULT_IMAGE_SIZES.length -1 ; i>0 ; i--) {
 			irh = DEFAULT_IMAGE_SIZES[i];
 			irw = irh / ratio;
-			if (irw <= fw && irh <= fh)
-				break;
+			if (irw <= fw && irh <= fh) { break; }
 		}
 	}
 	return DEFAULT_IMAGE_SIZES[i];
@@ -162,10 +188,10 @@ FilmSlider.prototype.getBestFitSize = function(ratio) {
 FilmSlider.prototype.centerSlide = function(slideIndex) {
 	if (this.sliderRatio > 1) { return; }
 	var filmBarWidth = getObjectWidth(this.filmBar);
-	var x = slideIndex * this.slideSize
+	var x = slideIndex * this.slideSize;
 	x = x - (filmBarWidth - this.slideSize) / 2.0;
 	x = x * this.sliderSpeedRatio;
-	var p = new Point( -x, 0 )
+	var p = new Point( -x, 0 );
 	this.setSliderPosition(p);
 };
 
@@ -181,15 +207,15 @@ FilmSlider.prototype.setFilmPosition = function(point) {
 };
 
 FilmSlider.prototype.getSliderPosition = function() {
-	var x = parseInt(this.slider.style.left);
-	var y = parseInt(this.slider.style.top);
+	var x = parseInt(this.slider.style.left, 10);
+	var y = parseInt(this.slider.style.top, 10);
 	var p = new Point(x, y);
 	return p;
 };
 
 FilmSlider.prototype.getFilmPosition = function() {
-	var x = parseInt(this.film.style.left);
-	var y = parseInt(this.film.style.top);
+	var x = parseInt(this.film.style.left, 10);
+	var y = parseInt(this.film.style.top, 10);
 	var p = new Point(x, y);
 	return p;
 };
@@ -209,7 +235,7 @@ FilmSlider.prototype.loadSibling = function(previous) {
 	else {
 		var target = slide.getElementsByTagName('a')[0];
 		raiseMouseEvent(target, 'click');
-		var index = parseInt(target.getAttribute('portfolio:position'));
+		var index = parseInt(target.getAttribute('portfolio:position'), 10);
 		this.centerSlide(index);
 	}
 };
@@ -220,9 +246,10 @@ 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']);
+	addListener(this.slider, 'mousedown', this.ddHandlers.down);
 	if(browser.isDOM2Event){
 		if (browser.isAppleWebKit) {
 			this.filmBar.addEventListener('mousewheel', function(evt){thisSlider.mouseWheelHandler(evt);}, false);
@@ -244,10 +271,9 @@ FilmSlider.prototype.mouseDownHandler = function(evt) {
 	this.initialClickPoint = new Point(evt.clientX, evt.clientY);
 	this.initialPosition = this.getSliderPosition();
 	this.dragInProgress = true;
-	addListener(document, 'mousemove', this.ddHandlers['move']);
-	addListener(document, 'mouseup', this.ddHandlers['up']);
-	addListener(document.body, 'mouseout', this.ddHandlers['out'])
-	
+	addListener(document, 'mousemove', this.ddHandlers.move);
+	addListener(document, 'mouseup', this.ddHandlers.up);
+	addListener(document.body, 'mouseout', this.ddHandlers.out);
 };
 
 
@@ -273,9 +299,9 @@ FilmSlider.prototype.mouseOutHandler = function(evt) {
 	var x = evt.clientX;
 	var y = evt.clientY;
 	if (x < 0 ||
-		x > this.winSize['width'] ||
+		x > this.winSize.width ||
 		y < 0 ||
-		y > this.winSize['height']
+		y > this.winSize.height
 		) {
 		this.mouseUpHandler(evt);
 	}
@@ -283,8 +309,7 @@ FilmSlider.prototype.mouseOutHandler = function(evt) {
 
 FilmSlider.prototype.thumbnailClickHandler = function(evt) {
 	var target = getTargetedObject(evt);
-	while (target.tagName !== 'A' && target !== this.filmBar)
-		target = target.parentNode;
+	while (target.tagName !== 'A' && target !== this.filmBar) { target = target.parentNode; }
 	if (target.tagName !== 'A') { return; }
 	else {
 		if (this.viewMode === 'full') {
@@ -314,10 +339,10 @@ FilmSlider.prototype.thumbnailClickHandler = function(evt) {
 		this.pendingImage.src = canonicalImgUrl + '/getResizedImage?size=' + bestFitSize;
 		
 		// update buttons
-		var fullScreenLink = this.buttons['full_screen'].parentNode;
+		var fullScreenLink = this.buttons.full_screen.parentNode;
 		fullScreenLink.href = canonicalImgUrl + '/zoom_view';
 
-		var toggleSelectionBtn = this.buttons['toggle_selection'];
+		var toggleSelectionBtn = this.buttons.toggle_selection;
 		var toggleSelectionLink = toggleSelectionBtn.parentNode;
 		this.selectedSlideInSelection = (target.className==='selected');
 		if (this.selectedSlideInSelection) {
@@ -331,16 +356,16 @@ FilmSlider.prototype.thumbnailClickHandler = function(evt) {
 			toggleSelectionLink.href = canonicalImgUrl + '/add_to_selection';
 		}
 
-		var showBuyableButtonLink = this.buttons['show_buyable'].parentNode;
+		var showBuyableButtonLink = this.buttons.show_buyable.parentNode;
 		showBuyableButtonLink.href = canonicalImgUrl + '/get_slide_buyable_items';
 		this.cartSlide.innerHTML = '';
 		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';
 		}
 		
 
@@ -363,12 +388,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);
@@ -380,13 +402,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;
@@ -399,21 +422,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;
@@ -428,7 +452,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);
@@ -438,12 +462,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");
@@ -473,8 +497,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 = '';
@@ -541,7 +565,7 @@ else if (browser.isIE6up) {
 }
 
 FilmSlider.prototype.keyDownHandler = function(evt) {
-	var evt = getEventObject(evt);
+	evt = getEventObject(evt);
 	switch (evt.keyCode) {
 		case keyLeft :
 			this.loadSibling(true);
@@ -558,19 +582,20 @@ 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':
 		case 'F':
-			raiseMouseEvent(this.buttons['full_screen'], 'click');
+			raiseMouseEvent(this.buttons.full_screen, 'click');
 			break;
 	}
 };
 
 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' :
@@ -578,14 +603,14 @@ FilmSlider.prototype.populateViewer = function(req) {
 				if (dest) { dest.innerHTML = element.firstChild.nodeValue; }
 				break;
 			case 'imageattributes' :
-				var link = this.buttons['back_to_portfolio'].parentNode;
-				link.href = element.getAttribute('backToContextUrl');
-				link = this.buttons['show_buyable'].parentNode;
+				var link = this.buttons.back_to_portfolio.parentNode;
+				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;
 		}
@@ -626,8 +651,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;
 	}
@@ -657,7 +681,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);
 };
 
@@ -669,7 +693,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) + ")"; };
 
-})();
+}());