diff --git a/app/js/controllers.js b/app/js/controllers.js index 105f4f60..9152704d 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -2541,7 +2541,6 @@ angular.module('myApp.controllers', ['myApp.i18n']) draftDataPromise = DraftsManager.getDraft($scope.curDialog.peerID) } draftDataPromise.then(function (draftData) { - console.warn('draft', editMessageID, draftData) $scope.draftMessage.type = editMessageID ? 'edit' : 'new' $scope.draftMessage.text = draftData ? draftData.text : '' $scope.draftMessage.isBroadcast = AppPeersManager.isBroadcast($scope.curDialog.peerID) diff --git a/app/js/lib/ng_utils.js b/app/js/lib/ng_utils.js index e86d22c8..d9865138 100755 --- a/app/js/lib/ng_utils.js +++ b/app/js/lib/ng_utils.js @@ -1238,7 +1238,7 @@ angular.module('izhukov.utils', []) var soundcloudRegExp = /^https?:\/\/(?:soundcloud\.com|snd\.sc)\/([a-zA-Z0-9%\-\_]+)\/([a-zA-Z0-9%\-\_]+)/i var spotifyRegExp = /(https?:\/\/(open\.spotify\.com|play\.spotify\.com|spoti\.fi)\/(.+)|spotify:(.+))/i - var markdownTestRegExp = /[`_*@]/; + var markdownTestRegExp = /[`_*@]/ var markdownRegExp = /(^|\s)(````?)([\s\S]+?)(````?)([\s\n\.,:?!;]|$)|(^|\s)([`*_])([^\n]+?)\7([\s\.,:?!;]|$)|@(\d+)\s*\((.+?)\)/ var siteHashtags = { @@ -1877,7 +1877,7 @@ angular.module('izhukov.utils', []) function replaceUrlEncodings(urlWithEncoded) { return urlWithEncoded.replace(/(%[A-Z\d]{2})+/g, function (str) { try { - return decodeURIComponent(str); + return decodeURIComponent(str) } catch (e) { return str } diff --git a/app/js/message_composer.js b/app/js/message_composer.js index 14849ae3..5a9fcb64 100644 --- a/app/js/message_composer.js +++ b/app/js/message_composer.js @@ -943,8 +943,12 @@ MessageComposer.prototype.onKeyEvent = function (e) { } } - // Control keys when content is empty + // Direction keys when content is empty if ([33, 34, 35, 36, 38, 39].indexOf(e.keyCode) != -1 && + !e.shiftKey && + !e.altKey && + !e.ctrlKey && + !e.metaKey && this.richTextareaEl && !this.richTextareaEl[0].textContent.length) { return this.onDirectionKey(e) diff --git a/app/js/offline_manager.js b/app/js/offline_manager.js index ada4fbe3..60ce2b81 100644 --- a/app/js/offline_manager.js +++ b/app/js/offline_manager.js @@ -34,7 +34,7 @@ if (navigator.serviceWorker) { // If available, use a Service Worker to handle offlining. navigator.serviceWorker.register('service_worker.js').then(function (registration) { - console.log('offline worker registered') + console.log('Offline worker registered') registration.addEventListener('updatefound', function () { var installingWorker = this.installing diff --git a/app/js/services.js b/app/js/services.js index dfdbf324..3094b3db 100755 --- a/app/js/services.js +++ b/app/js/services.js @@ -4671,7 +4671,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) } function getDraft (peerID, unsyncOnly) { - console.warn(dT(), 'get draft', peerID, unsyncOnly) + // console.warn(dT(), 'get draft', peerID, unsyncOnly) return Storage.get('draft' + peerID).then(function (draft) { if (typeof draft === 'string') { if (draft.length > 0) { @@ -4684,9 +4684,9 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) } if (!draft && !unsyncOnly) { draft = getServerDraft(peerID) - console.warn(dT(), 'server', draft) + // console.warn(dT(), 'server', draft) } else { - console.warn(dT(), 'local', draft) + // console.warn(dT(), 'local', draft) } var replyToMsgID = draft && draft.replyToMsgID if (replyToMsgID) { @@ -4711,7 +4711,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) cachedServerDrafts[peerID] = draft if (options.notify) { - console.warn(dT(), 'save draft', peerID, apiDraft, options) + // console.warn(dT(), 'save draft', peerID, apiDraft, options) changeDraft(peerID, draft) $rootScope.$broadcast('draft_updated', { peerID: peerID, @@ -4724,7 +4724,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) } function changeDraft (peerID, draft) { - console.warn(dT(), 'change draft', peerID, draft) + // console.warn(dT(), 'change draft', peerID, draft) if (!peerID) { console.trace('empty peerID') } @@ -4821,14 +4821,14 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) } function syncDraft (peerID) { - console.warn(dT(), 'sync draft', peerID) + // console.warn(dT(), 'sync draft', peerID) getDraft(peerID, true).then(function (localDraft) { var serverDraft = cachedServerDrafts[peerID] if (draftsAreEqual(serverDraft, localDraft)) { - console.warn(dT(), 'equal drafts', localDraft, serverDraft) + // console.warn(dT(), 'equal drafts', localDraft, serverDraft) return } - console.warn(dT(), 'changed draft', localDraft, serverDraft) + // console.warn(dT(), 'changed draft', localDraft, serverDraft) var params = { flags: 0, peer: AppPeersManager.getInputPeerByID(peerID) diff --git a/app/service_worker.js b/app/service_worker.js index 4e08efa4..3ad22968 100644 --- a/app/service_worker.js +++ b/app/service_worker.js @@ -1,2 +1 @@ -// 111 importScripts('js/lib/push_worker.js')