Merge pull request #49 from schadocalex/master

Version 4.1.2

CHANGELOG.md

@@ -1,3 +1,7 @@
+#### 4.1.2 (24/02/2015)
+Correction de bugs :
+* Mots mal détruits
+
 #### 4.1.1 (24/02/2015)
 Fonctionnalités :
 * Ajout du son ambiant à nouveau (+ version mp3)

README.md

@@ -1,4 +1,4 @@
-Application - La Séparation v4.1.1
+Application - La Séparation v4.1.2
 =======
 
 Application web et tablette sur la poésie à deux mi-mots

src/lib_separation/event/event.js

@@ -1,111 +1,108 @@
 /*
 	Namespace Event
 */
-var Event = Event || {};
-(function () {
-	"use strict";
-
-	var old_touch_move = {x:-1, y:-1};
-	Event.events = {
-		tap : (appOnDevice_real() ? 'click' : 'click'),
-		touchmove : (appOnDevice_real() ? 'touchmove' : 'mousemove'),
-		touchend : (appOnDevice_real() ? 'touchend' : 'mouseleave'),
-		dbltap : (appOnDevice_real() ? 'dblclick' : 'dblclick'),
-	};
-
-	Event.getMousePos = function(event) {
-		// event de createJS 'click'
-		return { x: event.stageX, y: event.stageY };
-	};
-
-	Event.getMousePosMove = function(event) {
-		// event classique HTML
-		if(!appOnDevice_real()) {
-			return { x: event.clientX, y: event.clientY };
-		}
-		else {
-			return { 
-				x: event.touches[0].clientX,
-				y: event.touches[0].clientY
-			};
-		}
-	};
-
-	Event.getTouchPos = function(event) {
-		return Event.getMousePos(event);
-	};
-
-	Event.getTouchMove = function(event) {
-		var new_touch_move = Event.getMousePosMove(event);
-
-		if(old_touch_move.x == -1 && old_touch_move.y == -1)
-			old_touch_move = new_touch_move;
-
-		var coords = {
-			x1: old_touch_move.x,
-			y1: old_touch_move.y,
-			x2: new_touch_move.x,
-			y2: new_touch_move.y,
+var Event = {};
+
+var old_touch_move = {x:-1, y:-1};
+Event.events = {
+	tap : (appOnDevice_real() ? 'click' : 'click'),
+	touchmove : (appOnDevice_real() ? 'touchmove' : 'mousemove'),
+	touchend : (appOnDevice_real() ? 'touchend' : 'mouseleave'),
+	dbltap : (appOnDevice_real() ? 'dblclick' : 'dblclick'),
+};
+
+Event.getMousePos = function(event) {
+	// event de createJS 'click'
+	return { x: event.stageX, y: event.stageY };
+};
+
+Event.getMousePosMove = function(event) {
+	// event classique HTML
+	if(!appOnDevice_real()) {
+		return { x: event.clientX, y: event.clientY };
+	}
+	else {
+		return { 
+			x: event.touches[0].clientX,
+			y: event.touches[0].clientY
 		};
-		old_touch_move = new_touch_move;
-
-		return coords;
-	};
+	}
+};
 
-	Event.invertTouchmoveXY = function(coords) {
-		var temp1 = coords.x1, temp2 = coords.x2;
+Event.getTouchPos = function(event) {
+	return Event.getMousePos(event);
+};
 
-		coords.x1 = coords.y1;
-		coords.x2 = coords.y2;
-		coords.y1 = temp1;
-		coords.y2 = temp2;
-
-		return coords;
-	};
-
-	Event.touchmove = function(event) {
-		event.preventDefault();
-		var coords = Event.getTouchMove(event);
+Event.getTouchMove = function(event) {
+	var new_touch_move = Event.getMousePosMove(event);
 
-		Event.cut(coords);
-		Event.erase(coords);
-		Event.open(Event.invertTouchmoveXY(coords));
-	};
+	if(old_touch_move.x == -1 && old_touch_move.y == -1)
+		old_touch_move = new_touch_move;
 
-	Event.touchend = function(event) {
-		old_touch_move = {x:-1, y:-1};
-		Event.touchMoveAbortAll(Event.cut_obj);
-		Event.touchMoveAbortAll(Event.erase_obj);
-		Event.touchMoveAbortAll(Event.open_obj);
+	var coords = {
+		x1: old_touch_move.x,
+		y1: old_touch_move.y,
+		x2: new_touch_move.x,
+		y2: new_touch_move.y,
 	};
-
-	Event.destroy = function(id, type) {
-		if(type !== undefined) {
-			switch(type) {
-				case 'tap' : Event.destroyTap(id); break;
-				case 'dbltap' : Event.destroyDbltap(id); break;
-				case 'cut' : Event.destroyCut(id); break;
-				case 'erase' : Event.destroyErase(id); break;
-				case 'open' : Event.destroyOpen(id); break;
-				default: alert('"' + type + '" inconnu dans Event.destroy()');
-			}
-		}
-		else {
-			Event.destroyTap(id);
-			Event.destroyDbltap(id);
-			Event.destroyCut(id);
-			Event.destroyErase(id);
-			Event.destroyOpen(id);
+	old_touch_move = new_touch_move;
+
+	return coords;
+};
+
+Event.invertTouchmoveXY = function(coords) {
+	var temp1 = coords.x1, temp2 = coords.x2;
+
+	coords.x1 = coords.y1;
+	coords.x2 = coords.y2;
+	coords.y1 = temp1;
+	coords.y2 = temp2;
+
+	return coords;
+};
+
+Event.touchmove = function(event) {
+	event.preventDefault();
+	var coords = Event.getTouchMove(event);
+
+	Event.cut(coords);
+	Event.erase(coords);
+	Event.open(Event.invertTouchmoveXY(coords));
+};
+
+Event.touchend = function(event) {
+	old_touch_move = {x:-1, y:-1};
+	Event.touchMoveAbortAll(Event.cut_obj);
+	Event.touchMoveAbortAll(Event.erase_obj);
+	Event.touchMoveAbortAll(Event.open_obj);
+};
+
+Event.destroy = function(id, type) {
+	if(type !== undefined) {
+		switch(type) {
+			case 'tap' : Event.destroyTap(id); break;
+			case 'dbltap' : Event.destroyDbltap(id); break;
+			case 'cut' : Event.destroyCut(id); break;
+			case 'erase' : Event.destroyErase(id); break;
+			case 'open' : Event.destroyOpen(id); break;
+			default: alert('"' + type + '" inconnu dans Event.destroy()');
 		}
-	};
-
-	Event.destroyAll = function() {
-		Destroy.list(Event.tap_obj);
-		Destroy.list(Event.dbltap_obj);
-		Destroy.list(Event.cut_obj);
-		Destroy.list(Event.erase_obj);
-		Destroy.list(Event.open_obj);
-	};
-})();
+	}
+	else {
+		Event.destroyTap(id);
+		Event.destroyDbltap(id);
+		Event.destroyCut(id);
+		Event.destroyErase(id);
+		Event.destroyOpen(id);
+	}
+};
+
+Event.destroyAll = function() {
+	Destroy.list(Event.tap_obj);
+	Destroy.list(Event.dbltap_obj);
+	Destroy.list(Event.cut_obj);
+	Destroy.list(Event.erase_obj);
+	Destroy.list(Event.open_obj);
+};
 
 scriptLoaded('scripts/libs/separation_toolkit/event/event.js');

src/lib_separation/word/word.js

@@ -49,15 +49,16 @@ function Word(value, next_value, police, code, autoAddGesture) {
 }
 
 Word.prototype.done = function(fct_done) {
-	if(this.list_done[fct_done] !== undefined)
+	if(this.list_done[fct_done] !== undefined) {
 		this.list_done[fct_done]();
+	}
 };
 
 Word.prototype.generate = function() {
 
 	var new_code, new_value, new_next_value;
 
-	if(!this.font) {
+	if(!!this.font) {
 		this.destroy();
 	}
 
@@ -126,9 +127,6 @@ Word.prototype.displayGUI = function() {
 
 Word.prototype.destroy = function() {
 	this.destroyTimeouts();
-
-
-
 	Event.destroy(this.getId());
 	for(var i = 0; i < this.tween.length; i++) {
 		this.tween[i].pause();