Skip to content

Commit e4a63cf

Browse files
committed
Merge branch 'guanaco'
2 parents 9d2859d + 1fbb028 commit e4a63cf

File tree

161 files changed

+11870
-12107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+11870
-12107
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Tmp files
1+
# Tmp files/Project files
22
.DS_Store
33
*~
44
.tscache/
@@ -7,6 +7,7 @@
77
.recognizer
88
node_modules/
99
tscommand*.txt
10+
yimello.sublime-workspace
1011

1112
# Special files & folders
1213
release/

Gruntfile.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ module.exports = function (grunt) {
22

33
// load the task
44
grunt.loadNpmTasks("grunt-ts");
5+
grunt.loadNpmTasks("grunt-csscomb");
56
grunt.loadNpmTasks("grunt-contrib-copy");
67
grunt.loadNpmTasks("grunt-remove");
78
grunt.loadNpmTasks("grunt-mkdir");
@@ -96,6 +97,17 @@ module.exports = function (grunt) {
9697
},
9798
}
9899
},
100+
csscomb : {
101+
release : {
102+
options : {
103+
config : 'csscomb-config.json'
104+
},
105+
expand : true,
106+
cwd : 'app/ui/assets/',
107+
src : ['**/*.scss'],
108+
dest : 'app/ui/assets/'
109+
}
110+
},
99111
copy : {
100112
appDependencies : {
101113
src : 'app/dependencies.ts',

README.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,11 @@ Yimello is a tiny tool to save your bookmarks and browse them easily.
88
Current version is a beta one. Then, you can encounter some issues when
99
using it. Please open a ticket in tracker to notify me :) I'll appreciate.
1010

11-
## Known issues
12-
13-
* Troubles with menu animations
14-
* Import/export functions are experimental
15-
1611
## Future improvements
1712

18-
* Export to browser
19-
* Create a backup from app
20-
* A reset feature
21-
* Improve design
22-
* Social network sharing
13+
* Add more keyboard shorcuts
14+
* Improve performances
15+
* Increase sturdiness
2316

2417
## Baked with love <3
2518

app/dependencies.ts

Lines changed: 58 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
/// <reference path="system/DOMTree.ts" />
1616
/// <reference path="system/strings/StringBuffer.ts" />
1717
/// <reference path="system/node-webkit/NodeWindow.ts" />
18+
/// <reference path="system/node-webkit/Presenter.ts" />
1819
/// <reference path="system/Regex.ts" />
1920
/// <reference path="system/Log.ts" />
2021
/// <reference path="system/Pair.ts" />
@@ -39,14 +40,14 @@
3940
// Storage part
4041

4142
/// <reference path="system/storage/SQLAPI.ts" />
43+
/// <reference path="system/storage/ActiveRecord/IActiveRecordObject.ts" />
4244
/// <reference path="system/storage/ActiveRecord/ActiveRecordConfig.ts" />
4345
/// <reference path="system/storage/ActiveRecord/ActiveRecordException.ts" />
4446
/// <reference path="system/storage/ActiveRecord/ActiveRecordHelper.ts" />
4547
/// <reference path="system/storage/ActiveRecord/ActiveRecordObject.ts" />
4648

4749
// Ajax part
4850

49-
5051
/// <reference path="system/ajax/AjaxRequest.ts" />
5152
/// <reference path="system/ajax/AjaxRequestDataType.ts" />
5253
/// <reference path="system/ajax/AjaxRequestException.ts" />
@@ -60,54 +61,84 @@
6061
/// <reference path="helpers/URLDetailsProvider.ts" />
6162
/// <reference path="helpers/SecurityHelper.ts" />
6263
/// <reference path="helpers/FaviconHelper.ts" />
64+
/// <reference path="helpers/VersionHelper.ts" />
65+
66+
// Beans part
67+
68+
/// <reference path="models/beans/Bookmark.ts" />
69+
/// <reference path="models/beans/Tag.ts" />
6370

6471
// DAO part
6572

73+
/// <reference path="models/utils/AROFactory.ts" />
6674
/// <reference path="models/dao/utils/DAOException.ts" />
67-
/// <reference path="models/dao/DAOTables.ts" />
68-
/// <reference path="models/dao/DataAccessObject.ts" />
69-
/// <reference path="models/dao/BookmarkDAO.ts" />
70-
/// <reference path="models/dao/TagDAO.ts" />
75+
/// <reference path="models/dao/IBookmarkDAO.ts" />
76+
/// <reference path="models/dao/ITagDAO.ts" />
77+
/// <reference path="models/dao/ITagBookmarkDAO.ts" />
78+
/// <reference path="models/dao/utils/DataAccessObject.ts" />
79+
/// <reference path="models/dao/impl/BookmarkDAO.ts" />
80+
/// <reference path="models/dao/impl/TagDAO.ts" />
81+
/// <reference path="models/dao/impl/TagBookmarkDAO.ts" />
82+
/// <reference path="models/dao/utils/DAOTables.ts" />
83+
/// <reference path="models/utils/DAOFactory.ts" />
7184

7285
// Business part
86+
/// <reference path="models/business/utils/IInternalBookmarkBusiness.ts" />
87+
/// <reference path="models/business/utils/IInternalTagBusiness.ts" />
88+
/// <reference path="models/business/utils/InternalBusinessFactory.ts" />
89+
/// <reference path="models/business/utils/TagBookmarkBusinessArgs.ts" />
7390
/// <reference path="models/business/utils/BusinessException.ts" />
7491
/// <reference path="models/business/IBookmarkBusiness.ts" />
7592
/// <reference path="models/business/impl/BookmarkBusiness.ts" />
7693
/// <reference path="models/business/ITagBusiness.ts" />
7794
/// <reference path="models/business/impl/TagBusiness.ts" />
78-
/// <reference path="models/business/utils/ScoredBookmarkDAO.ts" />
95+
/// <reference path="models/business/utils/ScoredBookmark.ts" />
7996
/// <reference path="models/business/ITagBookmarkBusiness.ts" />
8097
/// <reference path="models/business/impl/TagBookmarkBusiness.ts" />
81-
/// <reference path="models/business/utils/BusinessMediator.ts" />
98+
/// <reference path="models/utils/BusinessFactory.ts" />
8299

83100
// Presenters part
84101

85-
/// <reference path="presenters/utils/NotificationMessage.ts" />
86-
/// <reference path="presenters/utils/PresenterException.ts" />
87-
/// <reference path="presenters/Presenter.ts" />
88102
/// <reference path="presenters/YimelloPresenter.ts" />
89-
/// <reference path="presenters/utils/PresenterMediator.ts" />
90103
/// <reference path="presenters/IntroPresenter.ts" />
91104
/// <reference path="presenters/TourPresenter.ts" />
92105

93106
// Main presenter
107+
/// <reference path="presenters/MainPresenter/context-menus/ContextMenu.ts" />
108+
/// <reference path="presenters/MainPresenter/context-menus/BookmarkContextMenu.ts" />
94109

95-
/// <reference path="presenters/MainPresenter/utils/MainPresenterMediator.ts" />
96-
/// <reference path="presenters/MainPresenter/interfaces/IBookmarkFormSubscriber.ts" />
97-
/// <reference path="presenters/MainPresenter/interfaces/IBookmarkListSubscriber.ts" />
98-
/// <reference path="presenters/MainPresenter/interfaces/ITagListSubscriber.ts" />
99-
/// <reference path="presenters/MainPresenter/Menu/interfaces/IMenuControlSubscriber.ts" />
100-
/// <reference path="presenters/MainPresenter/Menu/interfaces/ISubMenuOwner.ts" />
101-
/// <reference path="presenters/MainPresenter/TagList.ts" />
102-
/// <reference path="presenters/MainPresenter/BookmarkForm.ts" />
103-
/// <reference path="presenters/MainPresenter/BookmarkList.ts" />
104-
/// <reference path="presenters/MainPresenter/MainPresenter.ts" />
105-
/// <reference path="presenters/MainPresenter/Menu/SubMenu.ts" />
106-
/// <reference path="presenters/MainPresenter/Menu/TagFormSubMenu.ts" />
107-
/// <reference path="presenters/MainPresenter/Menu/MenuSubMenu.ts" />
108-
/// <reference path="presenters/MainPresenter/Menu/MenuControl.ts" />
109-
/// <reference path="presenters/MainPresenter/Menu/utils/DragFileArea.ts" />
110+
/// <reference path="presenters/MainPresenter/overlay-menus/OverlayMenu.ts" />
111+
/// <reference path="presenters/MainPresenter/overlay-menus/BookmarkFormMenu.ts" />
112+
/// <reference path="presenters/MainPresenter/overlay-menus/TagListMenu.ts" />
110113

111114
//grunt-start
112-
/// <reference path="helpers/VersionHelper.ts" />
115+
/// <reference path="models/business/utils/BusinessMessages.ts" />
116+
/// <reference path="presenters/MainPresenter/BookmarkList.ts" />
117+
/// <reference path="presenters/MainPresenter/MainPresenter.ts" />
118+
/// <reference path="presenters/MainPresenter/SearchBar.ts" />
119+
/// <reference path="presenters/MainPresenter/context-menus/TagContextMenu.ts" />
120+
/// <reference path="presenters/MainPresenter/context-menus/interfaces/IBookmarkContextMenuListener.ts" />
121+
/// <reference path="presenters/MainPresenter/context-menus/interfaces/ITagContextMenuListener.ts" />
122+
/// <reference path="presenters/MainPresenter/interfaces/IBookmarkListListener.ts" />
123+
/// <reference path="presenters/MainPresenter/interfaces/ISearchBarListener.ts" />
124+
/// <reference path="presenters/MainPresenter/overlay-menus/BookmarkDeletionMenu.ts" />
125+
/// <reference path="presenters/MainPresenter/overlay-menus/CreateBackupMenu.ts" />
126+
/// <reference path="presenters/MainPresenter/overlay-menus/ExportBrowserMenu.ts" />
127+
/// <reference path="presenters/MainPresenter/overlay-menus/ImportBackupMenu.ts" />
128+
/// <reference path="presenters/MainPresenter/overlay-menus/ImportBrowserMenu.ts" />
129+
/// <reference path="presenters/MainPresenter/overlay-menus/TagDeletionMenu.ts" />
130+
/// <reference path="presenters/MainPresenter/overlay-menus/TagFormMenu.ts" />
131+
/// <reference path="presenters/MainPresenter/overlay-menus/interfaces/IBookmarkDeletionMenuListener.ts" />
132+
/// <reference path="presenters/MainPresenter/overlay-menus/interfaces/IBookmarkFormMenuListener.ts" />
133+
/// <reference path="presenters/MainPresenter/overlay-menus/interfaces/IImportBackupMenuListener.ts" />
134+
/// <reference path="presenters/MainPresenter/overlay-menus/interfaces/IImportBrowserMenuListener.ts" />
135+
/// <reference path="presenters/MainPresenter/overlay-menus/interfaces/ITagDeletionMenuListener.ts" />
136+
/// <reference path="presenters/MainPresenter/overlay-menus/interfaces/ITagFormMenuListener.ts" />
137+
/// <reference path="presenters/MainPresenter/overlay-menus/interfaces/ITagListMenuListener.ts" />
138+
/// <reference path="presenters/MainPresenter/templates/BookmarkTemplate.ts" />
139+
/// <reference path="presenters/MainPresenter/templates/TagBookmarkFormTemplate.ts" />
140+
/// <reference path="presenters/MainPresenter/templates/TagListTemplate.ts" />
141+
/// <reference path="presenters/utils/INotifier.ts" />
142+
/// <reference path="presenters/utils/Notifier.ts" />
143+
/// <reference path="presenters/utils/PresenterMessages.ts" />
113144
//grunt-end

app/helpers/FormHelper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/// <reference path="../dependencies.ts" />
22

33
/**
4-
* Provides methods for form
4+
* Provides methods for form handling
55
*/
66
class FormHelper {
77

app/helpers/URLDetailsProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class URLDetailsProvider extends TSObject {
8080
success(title, description);
8181
});
8282
} else {
83-
errorHandler(URLDetailsProviderError.BadURL, 'URL is bad formatted');
83+
errorHandler(URLDetailsProviderError.BadURL, 'You provided a bad URL');
8484
}
8585
}
8686

app/helpers/VersionHelper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class VersionHelper {
55
//region Fields
66

77
private static _target : string = 'http://yimello.adriencadet.com/version';
8-
private static _version : string = '0.2.2';
8+
private static _version : string = '0.3.0';
99

1010
//endregion Fields
1111

0 commit comments

Comments
 (0)