Adds SortedList ; Updates deps

acadet · Nov 16, 2014 · 33e5072 · 33e5072
1 parent 7caadc2
commit 33e5072
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 324 deletions.
diff --git a/app/dependencies.ts b/app/dependencies.ts
@@ -2,7 +2,7 @@
 
 /// <reference path="libs/jquery.d.ts" />
 /// <reference path="libs/jqueryui.d.ts" />
-/// <reference path="libs/ludivine.1.1.0.min.ts" />
+/// <reference path="libs/ludivine.1.2.0.min.ts" />
 
 // System part
 

diff --git a/app/helpers/VersionHelper.ts b/app/helpers/VersionHelper.ts
@@ -3,24 +3,24 @@
 // TODO : test
 class VersionHelper {
 	//region Fields
-	
+
 	private static _target : string = 'http://yimello.adriencadet.com/version';
-	private static _version : string = '0.3.2';
+	private static _version : string = '0.3.3';
 
 	//endregion Fields
-	
+
 	//region Constructors
-	
+
 	//endregion Constructors
-	
+
 	//region Methods
-	
+
 	//region Private Methods
-	
+
 	//endregion Private Methods
-	
+
 	//region Public Methods
-	
+
 	static isUpToDate(callback : Action<boolean>, errorHandler? : Action<string>) : void {
 		var get : GetRequest;
 
@@ -47,6 +47,6 @@ class VersionHelper {
 	}
 
 	//endregion Public Methods
-	
+
 	//endregion Methods
 }
diff --git a/app/libs/ludivine.1.1.0.min.ts b/app/libs/ludivine.1.1.0.min.ts
diff --git a/app/libs/ludivine.1.2.0.min.ts b/app/libs/ludivine.1.2.0.min.ts
diff --git a/app/models/business/ITagBookmarkBusiness.ts b/app/models/business/ITagBookmarkBusiness.ts
@@ -24,7 +24,7 @@ interface ITagBookmarkBusiness {
 		errorHandler? : Action<string>) : void;
 
 	/**
-	 * Sorts all bookmarks by title ascending 
+	 * Sorts all bookmarks by title ascending
 	 * @param {TagDAO}                     tag      [description]
 	 * @param {Action<IList<BookmarkDAO>>} callback [description]
 	 */
@@ -37,7 +37,10 @@ interface ITagBookmarkBusiness {
 
 	exportToBrowser(callback : Action<string>, errorHandler? : Action<string>) : void;
 
-	search(input : string, callback : Action<IList<ScoredBookmark>>, errorHandler? : Action<string>) : void;
+	search(
+		input : string,
+		callback : Action<SortedList<ScoredBookmark, number>>,
+		errorHandler? : Action<string>) : void;
 
 	rawBackup(callback : Action<any>, errorHandler? : Action<string>) : void;
 

diff --git a/app/models/business/impl/TagBookmarkBusiness.ts b/app/models/business/impl/TagBookmarkBusiness.ts
@@ -4,21 +4,21 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 	//region Fields
 
 	private _args : TagBookmarkBusinessArgs;
-	
+
 	//endregion Fields
-	
+
 	//region Constructors
 
 	constructor(args : TagBookmarkBusinessArgs) {
 		this._args = args;
 	}
-	
+
 	//endregion Constructors
-	
+
 	//region Methods
-	
+
 	//region Private Methods
-	
+
 	private _browseDLNode(
 		node : DOMElement,
 		currentTags : IList<Tag>,
@@ -130,19 +130,6 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 			);
 	}
 
-	private _addInScoredList(target : ScoredBookmark, list : IList<ScoredBookmark>) : void {
-		for (var i = 0; i < list.getLength(); i++) {
-			var e : ScoredBookmark = list.getAt(i);
-
-			if (target.getScore() > e.getScore()) {
-				list.insertAt(i, target);
-				return;
-			}
-		}
-
-		list.add(target);
-	}
-
 	private _addCouple(currentIndex : number, list : Array<any>, callback? : Action0) : void {
 		var e : any;
 		var t : Tag;
@@ -248,9 +235,9 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 	}
 
 	//endregion Private Methods
-	
+
 	//region Public Methods
-	
+
 	sortTagsByLabelAscForBookmark(
 		bookmark : Bookmark,
 		callback : Action<IList<Tag>>,
@@ -469,7 +456,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 		tag : Tag,
 		callback : Action<IList<Bookmark>>,
 		errorHandler? : Action<string>) : void {
-		
+
 		errorHandler = ActionHelper.getValueOrDefault(errorHandler);
 
 		if (!TSObject.exists(tag)) {
@@ -574,7 +561,10 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 			);
 	}
 
-	search(input : string, callback : Action<IList<ScoredBookmark>>, errorHandler? : Action<string>) : void {
+	search(
+		input : string,
+		callback : Action<SortedList<ScoredBookmark, number>>,
+		errorHandler? : Action<string>) : void {
 		errorHandler = ActionHelper.getValueOrDefault(errorHandler);
 
 		this
@@ -583,7 +573,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 			.sortBookmarksByTitleAscWithBoundTagsByLabelAsc(
 				(outcome) => {
 					var max : number;
-					var list : IList<ScoredBookmark>;
+					var list : SortedList<ScoredBookmark, number>;
 					var keywords : IList<string>;
 
 					if (!TSObject.exists(outcome)) {
@@ -593,7 +583,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 					}
 
 					max = 0.0;
-					list = new ArrayList<ScoredBookmark>();
+					list = new SortedList<ScoredBookmark, number>(x => x.getScore(), false);
 					keywords = StringHelper.extractWords(input);
 
 					outcome.forEach(
@@ -633,7 +623,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 
 							max = (currentScore > max) ? currentScore : max;
 							sbk.setScore(currentScore);
-							this._addInScoredList(sbk, list);
+							list.add(sbk);
 						}
 					);
 
@@ -715,7 +705,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 	backup(callback? : Action0, errorHandler? : Action<string>) : void {
 		callback = ActionHelper.getValueOrDefaultNoArgs(callback);
 		errorHandler = ActionHelper.getValueOrDefault(errorHandler);
-		
+
 		this.rawBackup(
 			(result) => {
 				FileAPI.writeFile(
@@ -780,11 +770,11 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 					}
 				);
 			};
-		
+
 		reader.readAsText(dataTransfer.files[0]);
 	}
 
 	//endregion Public Methods
-	
+
 	//endregion Methods
 }