From 2702518e31e99e3a8bd6d0aa358ce454be583ef6 Mon Sep 17 00:00:00 2001 From: rr- Date: Sun, 28 Jun 2015 10:07:11 +0200 Subject: [PATCH] Switched to spaces --- public_html/js/Api.js | 216 +-- public_html/js/Auth.js | 340 ++--- public_html/js/Bootstrap.js | 44 +- public_html/js/BrowsingSettings.js | 150 +- public_html/js/Controls/AutoCompleteInput.js | 486 +++--- public_html/js/Controls/FileDropper.js | 104 +- public_html/js/Controls/TagInput.js | 728 ++++----- public_html/js/DI.js | 84 +- public_html/js/Keyboard.js | 98 +- public_html/js/Pager.js | 236 +-- public_html/js/PresenterManager.js | 82 +- .../js/Presenters/CommentListPresenter.js | 388 ++--- .../Presenters/GlobalCommentListPresenter.js | 162 +- public_html/js/Presenters/HelpPresenter.js | 72 +- public_html/js/Presenters/HistoryPresenter.js | 118 +- public_html/js/Presenters/HomePresenter.js | 150 +- .../js/Presenters/HttpErrorPresenter.js | 68 +- public_html/js/Presenters/LoginPresenter.js | 136 +- public_html/js/Presenters/LogoutPresenter.js | 56 +- public_html/js/Presenters/MessagePresenter.js | 80 +- public_html/js/Presenters/PagerPresenter.js | 448 +++--- .../js/Presenters/PostContentPresenter.js | 118 +- .../js/Presenters/PostEditPresenter.js | 240 +-- .../js/Presenters/PostListPresenter.js | 456 +++--- .../js/Presenters/PostNotesPresenter.js | 322 ++-- public_html/js/Presenters/PostPresenter.js | 582 +++---- .../js/Presenters/PostUploadPresenter.js | 1360 ++++++++--------- .../js/Presenters/ProgressPresenter.js | 60 +- .../js/Presenters/RegistrationPresenter.js | 160 +- public_html/js/Presenters/TagListPresenter.js | 196 +-- public_html/js/Presenters/TagPresenter.js | 334 ++-- .../js/Presenters/TopNavigationPresenter.js | 126 +- .../Presenters/UserAccountRemovalPresenter.js | 128 +- .../UserAccountSettingsPresenter.js | 268 ++-- .../js/Presenters/UserActivationPresenter.js | 192 +-- .../UserBrowsingSettingsPresenter.js | 118 +- .../js/Presenters/UserListPresenter.js | 148 +- public_html/js/Presenters/UserPresenter.js | 176 +-- public_html/js/Promise.js | 136 +- public_html/js/Router.js | 320 ++-- .../js/Services/PostsAroundCalculator.js | 136 +- public_html/js/Services/TagList.js | 42 +- public_html/js/State.js | 78 +- public_html/js/Util/Draggable.js | 240 +-- public_html/js/Util/Misc.js | 450 +++--- public_html/js/Util/Resizable.js | 176 +-- src/Bootstrap.php | 62 +- src/Config.php | 126 +- src/Dao/AbstractDao.php | 508 +++--- src/Dao/CommentDao.php | 66 +- .../AbstractEntityConverter.php | 64 +- .../CommentEntityConverter.php | 44 +- .../FavoriteEntityConverter.php | 34 +- .../GlobalParamEntityConverter.php | 30 +- src/Dao/EntityConverters/IEntityConverter.php | 4 +- .../EntityConverters/PostEntityConverter.php | 94 +- .../PostNoteEntityConverter.php | 46 +- .../EntityConverters/ScoreEntityConverter.php | 42 +- .../SnapshotEntityConverter.php | 50 +- .../EntityConverters/TagEntityConverter.php | 40 +- .../EntityConverters/TokenEntityConverter.php | 34 +- .../EntityConverters/UserEntityConverter.php | 70 +- src/Dao/FavoritesDao.php | 102 +- src/Dao/FileDao.php | 160 +- src/Dao/GlobalParamDao.php | 50 +- src/Dao/IBatchDao.php | 6 +- src/Dao/ICrudDao.php | 6 +- src/Dao/IFileDao.php | 8 +- src/Dao/PostDao.php | 510 +++---- src/Dao/PostNoteDao.php | 48 +- src/Dao/PublicFileDao.php | 8 +- src/Dao/ScoreDao.php | 112 +- src/Dao/SnapshotDao.php | 72 +- src/Dao/TagDao.php | 356 ++--- src/Dao/TokenDao.php | 62 +- src/Dao/TransactionManager.php | 62 +- src/Dao/UserDao.php | 128 +- src/DatabaseConnection.php | 68 +- src/Dispatcher.php | 134 +- src/Entities/Comment.php | 140 +- src/Entities/Entity.php | 120 +- src/Entities/Favorite.php | 94 +- src/Entities/GlobalParam.php | 44 +- src/Entities/Post.php | 464 +++--- src/Entities/PostNote.php | 128 +- src/Entities/Score.php | 90 +- src/Entities/Snapshot.php | 156 +- src/Entities/Tag.php | 118 +- src/Entities/Token.php | 60 +- src/Entities/User.php | 262 ++-- src/FormData/LoginFormData.php | 26 +- src/FormData/PostEditFormData.php | 74 +- src/FormData/PostNoteFormData.php | 40 +- src/FormData/RegistrationFormData.php | 36 +- src/FormData/TagEditFormData.php | 56 +- src/FormData/UploadFormData.php | 56 +- src/FormData/UserEditFormData.php | 98 +- src/Helpers/EnumHelper.php | 180 +-- src/Helpers/HttpHelper.php | 148 +- src/Helpers/InputReader.php | 52 +- src/Helpers/MimeHelper.php | 154 +- src/Helpers/ProgramExecutor.php | 36 +- src/Helpers/TypeHelper.php | 28 +- src/IValidatable.php | 2 +- src/Injector.php | 52 +- src/NotSupportedException.php | 8 +- src/PDOEx/BaseQuery.php | 292 ++-- src/PDOEx/DeleteQuery.php | 8 +- src/PDOEx/InsertQuery.php | 60 +- src/PDOEx/PDOEx.php | 64 +- src/PDOEx/SelectQuery.php | 158 +- src/PDOEx/UpdateQuery.php | 48 +- src/Privilege.php | 98 +- src/RouteRepository.php | 40 +- src/Router.php | 82 +- src/Routes/AbstractRoute.php | 6 +- src/Routes/Comments/AbstractCommentRoute.php | 14 +- src/Routes/Comments/AddComment.php | 72 +- src/Routes/Comments/DeleteComment.php | 76 +- src/Routes/Comments/EditComment.php | 78 +- src/Routes/Comments/GetComments.php | 122 +- src/Routes/Comments/GetPostComments.php | 90 +- src/Routes/Favorites/AddToFavorites.php | 70 +- src/Routes/Favorites/GetFavoriteUsers.php | 64 +- src/Routes/Favorites/RemoveFromFavorites.php | 70 +- src/Routes/GetGlobals.php | 46 +- src/Routes/GetHistory.php | 76 +- src/Routes/Login.php | 124 +- src/Routes/Posts/AbstractPostRoute.php | 40 +- src/Routes/Posts/CreatePost.php | 66 +- src/Routes/Posts/DeletePost.php | 46 +- src/Routes/Posts/FeaturePost.php | 52 +- src/Routes/Posts/GetFeaturedPost.php | 56 +- src/Routes/Posts/GetPost.php | 52 +- src/Routes/Posts/GetPostContent.php | 74 +- src/Routes/Posts/GetPostThumbnail.php | 66 +- src/Routes/Posts/GetPosts.php | 84 +- src/Routes/Posts/Notes/AddPostNote.php | 68 +- src/Routes/Posts/Notes/DeletePostNote.php | 46 +- src/Routes/Posts/Notes/GetPostNotes.php | 64 +- src/Routes/Posts/Notes/UpdatePostNote.php | 62 +- src/Routes/Posts/UpdatePost.php | 84 +- src/Routes/Scores/AbstractScoreRoute.php | 66 +- src/Routes/Scores/GetCommentScore.php | 56 +- src/Routes/Scores/GetPostScore.php | 56 +- src/Routes/Scores/SetCommentScore.php | 56 +- src/Routes/Scores/SetPostScore.php | 56 +- src/Routes/Tags/AbstractTagRoute.php | 18 +- src/Routes/Tags/DeleteTag.php | 46 +- src/Routes/Tags/GetTag.php | 52 +- src/Routes/Tags/GetTagSiblings.php | 62 +- src/Routes/Tags/GetTags.php | 76 +- src/Routes/Tags/MergeTags.php | 58 +- src/Routes/Tags/UpdateTag.php | 80 +- src/Routes/Users/ActivateAccount.php | 36 +- src/Routes/Users/CreateUser.php | 60 +- src/Routes/Users/DeleteUser.php | 54 +- src/Routes/Users/FinishActivation.php | 44 +- src/Routes/Users/FinishPasswordReset.php | 44 +- src/Routes/Users/GetUser.php | 62 +- src/Routes/Users/GetUserAvatar.php | 140 +- src/Routes/Users/GetUsers.php | 82 +- src/Routes/Users/PasswordReset.php | 34 +- src/Routes/Users/UpdateUser.php | 142 +- src/Search/Filters/BasicFilter.php | 92 +- src/Search/Filters/CommentFilter.php | 12 +- src/Search/Filters/IFilter.php | 22 +- src/Search/Filters/PostFilter.php | 56 +- src/Search/Filters/SnapshotFilter.php | 14 +- src/Search/Filters/TagFilter.php | 20 +- src/Search/Filters/UserFilter.php | 12 +- src/Search/Parsers/AbstractSearchParser.php | 294 ++-- src/Search/Parsers/PostSearchParser.php | 624 ++++---- src/Search/Parsers/SnapshotSearchParser.php | 56 +- src/Search/Parsers/TagSearchParser.php | 72 +- src/Search/Parsers/UserSearchParser.php | 40 +- src/Search/Requirements/IRequirementValue.php | 2 +- src/Search/Requirements/Requirement.php | 54 +- .../RequirementCompositeValue.php | 26 +- .../Requirements/RequirementRangedValue.php | 44 +- .../Requirements/RequirementSingleValue.php | 34 +- src/Search/Result.php | 90 +- src/Search/Tokens/NamedSearchToken.php | 18 +- src/Search/Tokens/SearchToken.php | 36 +- src/Services/AuthService.php | 172 +-- src/Services/CommentService.php | 164 +- src/Services/EmailService.php | 134 +- src/Services/FavoritesService.php | 98 +- src/Services/HistoryService.php | 198 +-- src/Services/ISnapshotProvider.php | 6 +- src/Services/ImageConverter.php | 194 +-- .../ImageManipulation/GdImageManipulator.php | 146 +- .../ImageManipulation/IImageManipulator.php | 16 +- .../ImageManipulation/ImageManipulator.php | 84 +- .../ImagickImageManipulator.php | 102 +- src/Services/NetworkingService.php | 160 +- src/Services/PasswordService.php | 86 +- src/Services/PostFeatureService.php | 142 +- src/Services/PostHistoryService.php | 82 +- src/Services/PostNotesService.php | 152 +- src/Services/PostService.php | 666 ++++---- src/Services/PostSnapshotProvider.php | 176 +-- src/Services/PostThumbnailService.php | 32 +- src/Services/PrivilegeService.php | 152 +- src/Services/ScoreService.php | 106 +- src/Services/TagHistoryService.php | 82 +- src/Services/TagService.php | 394 ++--- src/Services/TagSnapshotProvider.php | 96 +- src/Services/ThumbnailGenerator.php | 120 +- src/Services/ThumbnailService.php | 216 +-- src/Services/TimeService.php | 16 +- src/Services/TokenService.php | 106 +- src/Services/UpgradeService.php | 152 +- src/Services/UserService.php | 538 +++---- src/Upgrades/IUpgrade.php | 2 +- src/Upgrades/Upgrade00.php | 36 +- src/Upgrades/Upgrade01.php | 66 +- src/Upgrades/Upgrade02.php | 10 +- src/Upgrades/Upgrade03.php | 70 +- src/Upgrades/Upgrade04.php | 54 +- src/Upgrades/Upgrade05.php | 50 +- src/Upgrades/Upgrade06.php | 56 +- src/Upgrades/Upgrade07.php | 26 +- src/Upgrades/Upgrade08.php | 24 +- src/Upgrades/Upgrade09.php | 60 +- src/Upgrades/Upgrade10.php | 92 +- src/Upgrades/Upgrade11.php | 92 +- src/Upgrades/Upgrade12.php | 18 +- src/Upgrades/Upgrade13.php | 84 +- src/Upgrades/Upgrade14.php | 86 +- src/Upgrades/Upgrade15.php | 92 +- src/Upgrades/Upgrade16.php | 84 +- src/Upgrades/Upgrade17.php | 12 +- src/Upgrades/Upgrade18.php | 10 +- src/Upgrades/Upgrade19.php | 10 +- src/Upgrades/Upgrade20.php | 10 +- src/Upgrades/Upgrade21.php | 10 +- src/Upgrades/Upgrade22.php | 50 +- src/Upgrades/Upgrade23.php | 22 +- src/Upgrades/Upgrade24.php | 26 +- src/Upgrades/Upgrade25.php | 10 +- src/Upgrades/Upgrade26.php | 12 +- src/Upgrades/Upgrade27.php | 30 +- src/Upgrades/Upgrade28.php | 10 +- src/Upgrades/Upgrade29.php | 28 +- src/Upgrades/Upgrade30.php | 72 +- src/Upgrades/Upgrade31.php | 32 +- src/Upgrades/Upgrade32.php | 20 +- src/Upgrades/Upgrade33.php | 22 +- src/Upgrades/Upgrade34.php | 68 +- src/Upgrades/Upgrade35.php | 148 +- src/Upgrades/Upgrade36.php | 16 +- src/Upgrades/Upgrade37.php | 36 +- src/Upgrades/Upgrade38.php | 78 +- src/Upgrades/UpgradeRepository.php | 18 +- src/Validator.php | 214 +-- src/ViewProxies/AbstractViewProxy.php | 20 +- src/ViewProxies/CommentViewProxy.php | 60 +- src/ViewProxies/PostNoteViewProxy.php | 30 +- src/ViewProxies/PostViewProxy.php | 186 +-- src/ViewProxies/SnapshotViewProxy.php | 40 +- src/ViewProxies/TagViewProxy.php | 74 +- src/ViewProxies/TokenViewProxy.php | 20 +- src/ViewProxies/UserViewProxy.php | 70 +- src/di.php | 198 +-- 265 files changed, 14902 insertions(+), 14902 deletions(-) diff --git a/public_html/js/Api.js b/public_html/js/Api.js index 63db4057..3d195b92 100644 --- a/public_html/js/Api.js +++ b/public_html/js/Api.js @@ -2,130 +2,130 @@ var App = App || {}; App.API = function(_, jQuery, promise, appState) { - var baseUrl = '/api/'; - var AJAX_UNSENT = 0; - var AJAX_OPENED = 1; - var AJAX_HEADERS_RECEIVED = 2; - var AJAX_LOADING = 3; - var AJAX_DONE = 4; + var baseUrl = '/api/'; + var AJAX_UNSENT = 0; + var AJAX_OPENED = 1; + var AJAX_HEADERS_RECEIVED = 2; + var AJAX_LOADING = 3; + var AJAX_DONE = 4; - var cache = {}; + var cache = {}; - function get(url, data) { - return request('GET', url, data); - } + function get(url, data) { + return request('GET', url, data); + } - function post(url, data) { - return request('POST', url, data); - } + function post(url, data) { + return request('POST', url, data); + } - function put(url, data) { - return request('PUT', url, data); - } + function put(url, data) { + return request('PUT', url, data); + } - function _delete(url, data) { - return request('DELETE', url, data); - } + function _delete(url, data) { + return request('DELETE', url, data); + } - function getCacheKey(method, url, data) { - return JSON.stringify({method: method, url: url, data: data}); - } + function getCacheKey(method, url, data) { + return JSON.stringify({method: method, url: url, data: data}); + } - function clearCache() { - cache = {}; - } + function clearCache() { + cache = {}; + } - function request(method, url, data) { - if (method === 'GET') { - return requestWithCache(method, url, data); - } - clearCache(); - return requestWithAjax(method, url, data); - } + function request(method, url, data) { + if (method === 'GET') { + return requestWithCache(method, url, data); + } + clearCache(); + return requestWithAjax(method, url, data); + } - function requestWithCache(method, url, data) { - var cacheKey = getCacheKey(method, url, data); - if (_.has(cache, cacheKey)) { - return promise.make(function(resolve, reject) { - resolve(cache[cacheKey]); - }); - } + function requestWithCache(method, url, data) { + var cacheKey = getCacheKey(method, url, data); + if (_.has(cache, cacheKey)) { + return promise.make(function(resolve, reject) { + resolve(cache[cacheKey]); + }); + } - return promise.make(function(resolve, reject) { - promise.wait(requestWithAjax(method, url, data)) - .then(function(response) { - setCache(method, url, data, response); - resolve(response); - }).fail(function(response) { - reject(response); - }); - }); - } + return promise.make(function(resolve, reject) { + promise.wait(requestWithAjax(method, url, data)) + .then(function(response) { + setCache(method, url, data, response); + resolve(response); + }).fail(function(response) { + reject(response); + }); + }); + } - function setCache(method, url, data, response) { - var cacheKey = getCacheKey(method, url, data); - cache[cacheKey] = response; - } + function setCache(method, url, data, response) { + var cacheKey = getCacheKey(method, url, data); + cache[cacheKey] = response; + } - function requestWithAjax(method, url, data) { - var fullUrl = baseUrl + '/' + url; - fullUrl = fullUrl.replace(/\/{2,}/, '/'); + function requestWithAjax(method, url, data) { + var fullUrl = baseUrl + '/' + url; + fullUrl = fullUrl.replace(/\/{2,}/, '/'); - var xhr = null; - var apiPromise = promise.make(function(resolve, reject) { - var options = { - headers: { - 'X-Authorization-Token': appState.get('loginToken') || '', - }, - success: function(data, textStatus, xhr) { - resolve({ - status: xhr.status, - json: stripMeta(data)}); - }, - error: function(xhr, textStatus, errorThrown) { - reject({ - status: xhr.status, - json: xhr.responseJSON ? - stripMeta(xhr.responseJSON) : - {error: errorThrown}}); - }, - type: method, - url: fullUrl, - data: data, - cache: false, - }; - if (data instanceof FormData) { - options.processData = false; - options.contentType = false; - } - xhr = jQuery.ajax(options); - }); - apiPromise.xhr = xhr; - return apiPromise; - } + var xhr = null; + var apiPromise = promise.make(function(resolve, reject) { + var options = { + headers: { + 'X-Authorization-Token': appState.get('loginToken') || '', + }, + success: function(data, textStatus, xhr) { + resolve({ + status: xhr.status, + json: stripMeta(data)}); + }, + error: function(xhr, textStatus, errorThrown) { + reject({ + status: xhr.status, + json: xhr.responseJSON ? + stripMeta(xhr.responseJSON) : + {error: errorThrown}}); + }, + type: method, + url: fullUrl, + data: data, + cache: false, + }; + if (data instanceof FormData) { + options.processData = false; + options.contentType = false; + } + xhr = jQuery.ajax(options); + }); + apiPromise.xhr = xhr; + return apiPromise; + } - function stripMeta(data) { - var result = {}; - _.each(data, function(v, k) { - if (!k.match(/^__/)) { - result[k] = v; - } - }); - return result; - } + function stripMeta(data) { + var result = {}; + _.each(data, function(v, k) { + if (!k.match(/^__/)) { + result[k] = v; + } + }); + return result; + } - return { - get: get, - post: post, - put: put, - delete: _delete, + return { + get: get, + post: post, + put: put, + delete: _delete, - AJAX_UNSENT: AJAX_UNSENT, - AJAX_OPENED: AJAX_OPENED, - AJAX_HEADERS_RECEIVED: AJAX_HEADERS_RECEIVED, - AJAX_LOADING: AJAX_LOADING, - AJAX_DONE: AJAX_DONE, - }; + AJAX_UNSENT: AJAX_UNSENT, + AJAX_OPENED: AJAX_OPENED, + AJAX_HEADERS_RECEIVED: AJAX_HEADERS_RECEIVED, + AJAX_LOADING: AJAX_LOADING, + AJAX_DONE: AJAX_DONE, + }; }; diff --git a/public_html/js/Auth.js b/public_html/js/Auth.js index 38ddc97a..468b571c 100644 --- a/public_html/js/Auth.js +++ b/public_html/js/Auth.js @@ -2,198 +2,198 @@ var App = App || {}; App.Auth = function(_, jQuery, util, api, appState, promise) { - var privileges = { - register: 'register', - listUsers: 'listUsers', - viewUsers: 'viewUsers', - viewAllAccessRanks: 'viewAllAccessRanks', - viewAllEmailAddresses: 'viewAllEmailAddresses', - changeAccessRank: 'changeAccessRank', - changeOwnAvatarStyle: 'changeOwnAvatarStyle', - changeOwnEmailAddress: 'changeOwnEmailAddress', - changeOwnName: 'changeOwnName', - changeOwnPassword: 'changeOwnPassword', - changeAllAvatarStyles: 'changeAllAvatarStyles', - changeAllEmailAddresses: 'changeAllEmailAddresses', - changeAllNames: 'changeAllNames', - changeAllPasswords: 'changeAllPasswords', - deleteOwnAccount: 'deleteOwnAccount', - deleteAllAccounts: 'deleteAllAccounts', - banUsers: 'banUsers', + var privileges = { + register: 'register', + listUsers: 'listUsers', + viewUsers: 'viewUsers', + viewAllAccessRanks: 'viewAllAccessRanks', + viewAllEmailAddresses: 'viewAllEmailAddresses', + changeAccessRank: 'changeAccessRank', + changeOwnAvatarStyle: 'changeOwnAvatarStyle', + changeOwnEmailAddress: 'changeOwnEmailAddress', + changeOwnName: 'changeOwnName', + changeOwnPassword: 'changeOwnPassword', + changeAllAvatarStyles: 'changeAllAvatarStyles', + changeAllEmailAddresses: 'changeAllEmailAddresses', + changeAllNames: 'changeAllNames', + changeAllPasswords: 'changeAllPasswords', + deleteOwnAccount: 'deleteOwnAccount', + deleteAllAccounts: 'deleteAllAccounts', + banUsers: 'banUsers', - listPosts: 'listPosts', - viewPosts: 'viewPosts', - uploadPosts: 'uploadPosts', - uploadPostsAnonymously: 'uploadPostsAnonymously', - deletePosts: 'deletePosts', - featurePosts: 'featurePosts', - changePostSafety: 'changePostSafety', - changePostSource: 'changePostSource', - changePostTags: 'changePostTags', - changePostContent: 'changePostContent', - changePostThumbnail: 'changePostThumbnail', - changePostRelations: 'changePostRelations', - changePostFlags: 'changePostFlags', + listPosts: 'listPosts', + viewPosts: 'viewPosts', + uploadPosts: 'uploadPosts', + uploadPostsAnonymously: 'uploadPostsAnonymously', + deletePosts: 'deletePosts', + featurePosts: 'featurePosts', + changePostSafety: 'changePostSafety', + changePostSource: 'changePostSource', + changePostTags: 'changePostTags', + changePostContent: 'changePostContent', + changePostThumbnail: 'changePostThumbnail', + changePostRelations: 'changePostRelations', + changePostFlags: 'changePostFlags', - addPostNotes: 'addPostNotes', - editPostNotes: 'editPostNotes', - deletePostNotes: 'deletePostNotes', + addPostNotes: 'addPostNotes', + editPostNotes: 'editPostNotes', + deletePostNotes: 'deletePostNotes', - listComments: 'listComments', - addComments: 'addComments', - editOwnComments: 'editOwnComments', - editAllComments: 'editAllComments', - deleteOwnComments: 'deleteOwnComments', - deleteAllComments: 'deleteAllComments', - deleteTags: 'deleteTags', - mergeTags: 'mergeTags', + listComments: 'listComments', + addComments: 'addComments', + editOwnComments: 'editOwnComments', + editAllComments: 'editAllComments', + deleteOwnComments: 'deleteOwnComments', + deleteAllComments: 'deleteAllComments', + deleteTags: 'deleteTags', + mergeTags: 'mergeTags', - listTags: 'listTags', - massTag: 'massTag', - changeTagName: 'changeTagName', - changeTagCategory: 'changeTagCategory', - changeTagImplications: 'changeTagImplications', - changeTagSuggestions: 'changeTagSuggestions', - banTags: 'banTags', + listTags: 'listTags', + massTag: 'massTag', + changeTagName: 'changeTagName', + changeTagCategory: 'changeTagCategory', + changeTagImplications: 'changeTagImplications', + changeTagSuggestions: 'changeTagSuggestions', + banTags: 'banTags', - viewHistory: 'viewHistory', - }; + viewHistory: 'viewHistory', + }; - function loginFromCredentials(userNameOrEmail, password, remember) { - return promise.make(function(resolve, reject) { - promise.wait(api.post('/login', {userNameOrEmail: userNameOrEmail, password: password})) - .then(function(response) { - updateAppState(response); - jQuery.cookie( - 'auth', - response.json.token.name, - remember ? { expires: 365 } : {}); - resolve(response); - }).fail(function(response) { - reject(response); - }); - }); - } + function loginFromCredentials(userNameOrEmail, password, remember) { + return promise.make(function(resolve, reject) { + promise.wait(api.post('/login', {userNameOrEmail: userNameOrEmail, password: password})) + .then(function(response) { + updateAppState(response); + jQuery.cookie( + 'auth', + response.json.token.name, + remember ? { expires: 365 } : {}); + resolve(response); + }).fail(function(response) { + reject(response); + }); + }); + } - function loginFromToken(token, isFromCookie) { - return promise.make(function(resolve, reject) { - var fd = { - token: token, - isFromCookie: isFromCookie - }; - promise.wait(api.post('/login', fd)) - .then(function(response) { - updateAppState(response); - resolve(response); - }).fail(function(response) { - reject(response); - }); - }); - } + function loginFromToken(token, isFromCookie) { + return promise.make(function(resolve, reject) { + var fd = { + token: token, + isFromCookie: isFromCookie + }; + promise.wait(api.post('/login', fd)) + .then(function(response) { + updateAppState(response); + resolve(response); + }).fail(function(response) { + reject(response); + }); + }); + } - function loginAnonymous() { - return promise.make(function(resolve, reject) { - promise.wait(api.post('/login')) - .then(function(response) { - updateAppState(response); - resolve(response); - }).fail(function(response) { - reject(response); - }); - }); - } + function loginAnonymous() { + return promise.make(function(resolve, reject) { + promise.wait(api.post('/login')) + .then(function(response) { + updateAppState(response); + resolve(response); + }).fail(function(response) { + reject(response); + }); + }); + } - function logout() { - return promise.make(function(resolve, reject) { - jQuery.removeCookie('auth'); - appState.set('loginToken', null); - return promise.wait(loginAnonymous()) - .then(resolve) - .fail(reject); - }); - } + function logout() { + return promise.make(function(resolve, reject) { + jQuery.removeCookie('auth'); + appState.set('loginToken', null); + return promise.wait(loginAnonymous()) + .then(resolve) + .fail(reject); + }); + } - function tryLoginFromCookie() { - return promise.make(function(resolve, reject) { - if (isLoggedIn()) { - resolve(); - return; - } + function tryLoginFromCookie() { + return promise.make(function(resolve, reject) { + if (isLoggedIn()) { + resolve(); + return; + } - var authCookie = jQuery.cookie('auth'); - if (!authCookie) { - reject(); - return; - } + var authCookie = jQuery.cookie('auth'); + if (!authCookie) { + reject(); + return; + } - promise.wait(loginFromToken(authCookie, true)) - .then(function(response) { - resolve(); - }).fail(function(response) { - jQuery.removeCookie('auth'); - reject(); - }); - }); - } + promise.wait(loginFromToken(authCookie, true)) + .then(function(response) { + resolve(); + }).fail(function(response) { + jQuery.removeCookie('auth'); + reject(); + }); + }); + } - function updateAppState(response) { - appState.set('privileges', response.json.privileges || []); - appState.set('loginToken', response.json.token && response.json.token.name); - appState.set('loggedIn', response.json.user && !!response.json.user.id); - appState.set('loggedInUser', response.json.user); - } + function updateAppState(response) { + appState.set('privileges', response.json.privileges || []); + appState.set('loginToken', response.json.token && response.json.token.name); + appState.set('loggedIn', response.json.user && !!response.json.user.id); + appState.set('loggedInUser', response.json.user); + } - function isLoggedIn(userName) { - if (!appState.get('loggedIn')) { - return false; - } - if (typeof(userName) !== 'undefined') { - if (getCurrentUser().name !== userName) { - return false; - } - } - return true; - } + function isLoggedIn(userName) { + if (!appState.get('loggedIn')) { + return false; + } + if (typeof(userName) !== 'undefined') { + if (getCurrentUser().name !== userName) { + return false; + } + } + return true; + } - function getCurrentUser() { - return appState.get('loggedInUser'); - } + function getCurrentUser() { + return appState.get('loggedInUser'); + } - function getCurrentPrivileges() { - return appState.get('privileges'); - } + function getCurrentPrivileges() { + return appState.get('privileges'); + } - function updateCurrentUser(user) { - if (user.id !== getCurrentUser().id) { - throw new Error('Cannot set current user to other user this way.'); - } - appState.set('loggedInUser', user); - } + function updateCurrentUser(user) { + if (user.id !== getCurrentUser().id) { + throw new Error('Cannot set current user to other user this way.'); + } + appState.set('loggedInUser', user); + } - function hasPrivilege(privilege) { - return _.contains(getCurrentPrivileges(), privilege); - } + function hasPrivilege(privilege) { + return _.contains(getCurrentPrivileges(), privilege); + } - function startObservingLoginChanges(listenerName, callback) { - appState.startObserving('loggedInUser', listenerName, callback); - } + function startObservingLoginChanges(listenerName, callback) { + appState.startObserving('loggedInUser', listenerName, callback); + } - return { - loginFromCredentials: loginFromCredentials, - loginFromToken: loginFromToken, - loginAnonymous: loginAnonymous, - tryLoginFromCookie: tryLoginFromCookie, - logout: logout, + return { + loginFromCredentials: loginFromCredentials, + loginFromToken: loginFromToken, + loginAnonymous: loginAnonymous, + tryLoginFromCookie: tryLoginFromCookie, + logout: logout, - startObservingLoginChanges: startObservingLoginChanges, - isLoggedIn: isLoggedIn, - getCurrentUser: getCurrentUser, - updateCurrentUser: updateCurrentUser, - getCurrentPrivileges: getCurrentPrivileges, - hasPrivilege: hasPrivilege, + startObservingLoginChanges: startObservingLoginChanges, + isLoggedIn: isLoggedIn, + getCurrentUser: getCurrentUser, + updateCurrentUser: updateCurrentUser, + getCurrentPrivileges: getCurrentPrivileges, + hasPrivilege: hasPrivilege, - privileges: privileges, - }; + privileges: privileges, + }; }; diff --git a/public_html/js/Bootstrap.js b/public_html/js/Bootstrap.js index 23429ade..8f5e98d7 100644 --- a/public_html/js/Bootstrap.js +++ b/public_html/js/Bootstrap.js @@ -2,29 +2,29 @@ var App = App || {}; App.Bootstrap = function(auth, router, promise, presenterManager) { - promise.wait(presenterManager.init()) - .then(function() { - promise.wait(auth.tryLoginFromCookie()) - .then(startRouting) - .fail(function(error) { - promise.wait(auth.loginAnonymous()) - .then(startRouting) - .fail(function() { - console.log(arguments); - window.alert('Fatal authentication error'); - }); - }); - }).fail(function() { - console.log(arguments); - }); + promise.wait(presenterManager.init()) + .then(function() { + promise.wait(auth.tryLoginFromCookie()) + .then(startRouting) + .fail(function(error) { + promise.wait(auth.loginAnonymous()) + .then(startRouting) + .fail(function() { + console.log(arguments); + window.alert('Fatal authentication error'); + }); + }); + }).fail(function() { + console.log(arguments); + }); - function startRouting() { - try { - router.start(); - } catch (err) { - console.log(err); - } - } + function startRouting() { + try { + router.start(); + } catch (err) { + console.log(err); + } + } }; diff --git a/public_html/js/BrowsingSettings.js b/public_html/js/BrowsingSettings.js index 79c8a881..142958d8 100644 --- a/public_html/js/BrowsingSettings.js +++ b/public_html/js/BrowsingSettings.js @@ -1,96 +1,96 @@ var App = App || {}; App.BrowsingSettings = function( - promise, - auth, - api) { + promise, + auth, + api) { - var settings = getDefaultSettings(); + var settings = getDefaultSettings(); - auth.startObservingLoginChanges('browsing-settings', loginStateChanged); + auth.startObservingLoginChanges('browsing-settings', loginStateChanged); - readFromLocalStorage(); - if (auth.isLoggedIn()) { - loginStateChanged(); - } + readFromLocalStorage(); + if (auth.isLoggedIn()) { + loginStateChanged(); + } - function setSettings(newSettings) { - settings = newSettings; - return save(); - } + function setSettings(newSettings) { + settings = newSettings; + return save(); + } - function getSettings() { - return settings; - } + function getSettings() { + return settings; + } - function getDefaultSettings() { - return { - hideDownvoted: true, - endlessScroll: false, - listPosts: { - safe: true, - sketchy: true, - unsafe: true, - }, - keyboardShortcuts: true, - }; - } + function getDefaultSettings() { + return { + hideDownvoted: true, + endlessScroll: false, + listPosts: { + safe: true, + sketchy: true, + unsafe: true, + }, + keyboardShortcuts: true, + }; + } - function loginStateChanged() { - readFromUser(auth.getCurrentUser()); - } + function loginStateChanged() { + readFromUser(auth.getCurrentUser()); + } - function readFromLocalStorage() { - readFromString(localStorage.getItem('browsingSettings')); - } + function readFromLocalStorage() { + readFromString(localStorage.getItem('browsingSettings')); + } - function readFromUser(user) { - readFromString(user.browsingSettings); - } + function readFromUser(user) { + readFromString(user.browsingSettings); + } - function readFromString(string) { - if (!string) { - return; - } + function readFromString(string) { + if (!string) { + return; + } - try { - if (typeof(string) === 'string' || string instanceof String) { - settings = JSON.parse(string); - } else { - settings = string; - } - } catch (e) { - } - } + try { + if (typeof(string) === 'string' || string instanceof String) { + settings = JSON.parse(string); + } else { + settings = string; + } + } catch (e) { + } + } - function saveToLocalStorage() { - localStorage.setItem('browsingSettings', JSON.stringify(settings)); - } + function saveToLocalStorage() { + localStorage.setItem('browsingSettings', JSON.stringify(settings)); + } - function saveToUser(user) { - var formData = { - browsingSettings: JSON.stringify(settings), - }; - return api.post('/users/' + user.name, formData); - } + function saveToUser(user) { + var formData = { + browsingSettings: JSON.stringify(settings), + }; + return api.post('/users/' + user.name, formData); + } - function save() { - return promise.make(function(resolve, reject) { - saveToLocalStorage(); - if (auth.isLoggedIn()) { - promise.wait(saveToUser(auth.getCurrentUser())) - .then(resolve) - .fail(reject); - } else { - resolve(); - } - }); - } + function save() { + return promise.make(function(resolve, reject) { + saveToLocalStorage(); + if (auth.isLoggedIn()) { + promise.wait(saveToUser(auth.getCurrentUser())) + .then(resolve) + .fail(reject); + } else { + resolve(); + } + }); + } - return { - getSettings: getSettings, - setSettings: setSettings, - }; + return { + getSettings: getSettings, + setSettings: setSettings, + }; }; diff --git a/public_html/js/Controls/AutoCompleteInput.js b/public_html/js/Controls/AutoCompleteInput.js index 0c268bd6..99aecf91 100644 --- a/public_html/js/Controls/AutoCompleteInput.js +++ b/public_html/js/Controls/AutoCompleteInput.js @@ -2,273 +2,273 @@ var App = App || {}; App.Controls = App.Controls || {}; App.Controls.AutoCompleteInput = function($input) { - var _ = App.DI.get('_'); - var jQuery = App.DI.get('jQuery'); - var tagList = App.DI.get('tagList'); + var _ = App.DI.get('_'); + var jQuery = App.DI.get('jQuery'); + var tagList = App.DI.get('tagList'); - var KEY_TAB = 9; - var KEY_RETURN = 13; - var KEY_DELETE = 46; - var KEY_ESCAPE = 27; - var KEY_UP = 38; - var KEY_DOWN = 40; + var KEY_TAB = 9; + var KEY_RETURN = 13; + var KEY_DELETE = 46; + var KEY_ESCAPE = 27; + var KEY_UP = 38; + var KEY_DOWN = 40; - var options = { - caseSensitive: false, - source: null, - maxResults: 15, - minLengthToArbitrarySearch: 3, - onApply: null, - onDelete: null, - onRender: null, - additionalFilter: null, - }; - var showTimeout = null; - var cachedSource = null; - var results = []; - var activeResult = -1; - var monitorInputHidingInterval = null; + var options = { + caseSensitive: false, + source: null, + maxResults: 15, + minLengthToArbitrarySearch: 3, + onApply: null, + onDelete: null, + onRender: null, + additionalFilter: null, + }; + var showTimeout = null; + var cachedSource = null; + var results = []; + var activeResult = -1; + var monitorInputHidingInterval = null; - if ($input.length === 0) { - throw new Error('Input element was not found'); - } - if ($input.length > 1) { - throw new Error('Cannot add autocompletion to more than one element at once'); - } - if ($input.attr('data-autocomplete')) { - throw new Error('Autocompletion was already added for this element'); - } - $input.attr('data-autocomplete', true); - $input.attr('autocomplete', 'off'); + if ($input.length === 0) { + throw new Error('Input element was not found'); + } + if ($input.length > 1) { + throw new Error('Cannot add autocompletion to more than one element at once'); + } + if ($input.attr('data-autocomplete')) { + throw new Error('Autocompletion was already added for this element'); + } + $input.attr('data-autocomplete', true); + $input.attr('autocomplete', 'off'); - var $div = jQuery('
'); - var $list = jQuery('