Skip to content

Commit 33e5072

Browse files
committed
Adds SortedList ; Updates deps
1 parent 7caadc2 commit 33e5072

File tree

10 files changed

+55
-324
lines changed

10 files changed

+55
-324
lines changed

app/dependencies.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/// <reference path="libs/jquery.d.ts" />
44
/// <reference path="libs/jqueryui.d.ts" />
5-
/// <reference path="libs/ludivine.1.1.0.min.ts" />
5+
/// <reference path="libs/ludivine.1.2.0.min.ts" />
66

77
// System part
88

app/helpers/VersionHelper.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
// TODO : test
44
class VersionHelper {
55
//region Fields
6-
6+
77
private static _target : string = 'http://yimello.adriencadet.com/version';
8-
private static _version : string = '0.3.2';
8+
private static _version : string = '0.3.3';
99

1010
//endregion Fields
11-
11+
1212
//region Constructors
13-
13+
1414
//endregion Constructors
15-
15+
1616
//region Methods
17-
17+
1818
//region Private Methods
19-
19+
2020
//endregion Private Methods
21-
21+
2222
//region Public Methods
23-
23+
2424
static isUpToDate(callback : Action<boolean>, errorHandler? : Action<string>) : void {
2525
var get : GetRequest;
2626

@@ -47,6 +47,6 @@ class VersionHelper {
4747
}
4848

4949
//endregion Public Methods
50-
50+
5151
//endregion Methods
5252
}

app/libs/ludivine.1.1.0.min.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/libs/ludivine.1.2.0.min.ts

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

app/models/business/ITagBookmarkBusiness.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ interface ITagBookmarkBusiness {
2424
errorHandler? : Action<string>) : void;
2525

2626
/**
27-
* Sorts all bookmarks by title ascending
27+
* Sorts all bookmarks by title ascending
2828
* @param {TagDAO} tag [description]
2929
* @param {Action<IList<BookmarkDAO>>} callback [description]
3030
*/
@@ -37,7 +37,10 @@ interface ITagBookmarkBusiness {
3737

3838
exportToBrowser(callback : Action<string>, errorHandler? : Action<string>) : void;
3939

40-
search(input : string, callback : Action<IList<ScoredBookmark>>, errorHandler? : Action<string>) : void;
40+
search(
41+
input : string,
42+
callback : Action<SortedList<ScoredBookmark, number>>,
43+
errorHandler? : Action<string>) : void;
4144

4245
rawBackup(callback : Action<any>, errorHandler? : Action<string>) : void;
4346

app/models/business/impl/TagBookmarkBusiness.ts

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
44
//region Fields
55

66
private _args : TagBookmarkBusinessArgs;
7-
7+
88
//endregion Fields
9-
9+
1010
//region Constructors
1111

1212
constructor(args : TagBookmarkBusinessArgs) {
1313
this._args = args;
1414
}
15-
15+
1616
//endregion Constructors
17-
17+
1818
//region Methods
19-
19+
2020
//region Private Methods
21-
21+
2222
private _browseDLNode(
2323
node : DOMElement,
2424
currentTags : IList<Tag>,
@@ -130,19 +130,6 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
130130
);
131131
}
132132

133-
private _addInScoredList(target : ScoredBookmark, list : IList<ScoredBookmark>) : void {
134-
for (var i = 0; i < list.getLength(); i++) {
135-
var e : ScoredBookmark = list.getAt(i);
136-
137-
if (target.getScore() > e.getScore()) {
138-
list.insertAt(i, target);
139-
return;
140-
}
141-
}
142-
143-
list.add(target);
144-
}
145-
146133
private _addCouple(currentIndex : number, list : Array<any>, callback? : Action0) : void {
147134
var e : any;
148135
var t : Tag;
@@ -248,9 +235,9 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
248235
}
249236

250237
//endregion Private Methods
251-
238+
252239
//region Public Methods
253-
240+
254241
sortTagsByLabelAscForBookmark(
255242
bookmark : Bookmark,
256243
callback : Action<IList<Tag>>,
@@ -469,7 +456,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
469456
tag : Tag,
470457
callback : Action<IList<Bookmark>>,
471458
errorHandler? : Action<string>) : void {
472-
459+
473460
errorHandler = ActionHelper.getValueOrDefault(errorHandler);
474461

475462
if (!TSObject.exists(tag)) {
@@ -574,7 +561,10 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
574561
);
575562
}
576563

577-
search(input : string, callback : Action<IList<ScoredBookmark>>, errorHandler? : Action<string>) : void {
564+
search(
565+
input : string,
566+
callback : Action<SortedList<ScoredBookmark, number>>,
567+
errorHandler? : Action<string>) : void {
578568
errorHandler = ActionHelper.getValueOrDefault(errorHandler);
579569

580570
this
@@ -583,7 +573,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
583573
.sortBookmarksByTitleAscWithBoundTagsByLabelAsc(
584574
(outcome) => {
585575
var max : number;
586-
var list : IList<ScoredBookmark>;
576+
var list : SortedList<ScoredBookmark, number>;
587577
var keywords : IList<string>;
588578

589579
if (!TSObject.exists(outcome)) {
@@ -593,7 +583,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
593583
}
594584

595585
max = 0.0;
596-
list = new ArrayList<ScoredBookmark>();
586+
list = new SortedList<ScoredBookmark, number>(x => x.getScore(), false);
597587
keywords = StringHelper.extractWords(input);
598588

599589
outcome.forEach(
@@ -633,7 +623,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
633623

634624
max = (currentScore > max) ? currentScore : max;
635625
sbk.setScore(currentScore);
636-
this._addInScoredList(sbk, list);
626+
list.add(sbk);
637627
}
638628
);
639629

@@ -715,7 +705,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
715705
backup(callback? : Action0, errorHandler? : Action<string>) : void {
716706
callback = ActionHelper.getValueOrDefaultNoArgs(callback);
717707
errorHandler = ActionHelper.getValueOrDefault(errorHandler);
718-
708+
719709
this.rawBackup(
720710
(result) => {
721711
FileAPI.writeFile(
@@ -780,11 +770,11 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
780770
}
781771
);
782772
};
783-
773+
784774
reader.readAsText(dataTransfer.files[0]);
785775
}
786776

787777
//endregion Public Methods
788-
778+
789779
//endregion Methods
790780
}

0 commit comments

Comments
 (0)