diff --git a/dev/Common/HtmlEditor.js b/dev/Common/HtmlEditor.js index 8558ce6d3..cc9f3b632 100644 --- a/dev/Common/HtmlEditor.js +++ b/dev/Common/HtmlEditor.js @@ -138,7 +138,17 @@ return sResult; }; - HtmlEditor.prototype.modeToggle = function (bPlain) + /** + * @param {boolean=} bWrapIsHtml = false + * @param {boolean=} bClearSignatureSigns = false + * @return {string} + */ + HtmlEditor.prototype.getDataWithHtmlMark = function (bWrapIsHtml, bClearSignatureSigns) + { + return (this.isHtml() ? ':HTML:' : '') + this.getData(bWrapIsHtml, bClearSignatureSigns); + }; + + HtmlEditor.prototype.modeToggle = function (bPlain, bResize) { if (this.editor) { @@ -159,7 +169,22 @@ } } catch(e) {} - this.resize(); + if (bResize) + { + this.resize(); + } + } + }; + + HtmlEditor.prototype.setHtmlOrPlain = function (sText, bFocus) + { + if (':HTML:' === sText.substr(0, 6)) + { + this.setHtml(sText.substr(6), bFocus); + } + else + { + this.setPlain(sText, bFocus); } }; @@ -205,7 +230,7 @@ HtmlEditor.prototype.init = function () { - if (this.$element && this.$element[0]) + if (this.$element && this.$element[0] && !this.editor) { var self = this, @@ -332,6 +357,16 @@ } }; + HtmlEditor.prototype.setReadOnly = function (bValue) + { + if (this.editor) + { + try { + this.editor.setReadOnly(!!bValue); + } catch (e) {} + } + }; + HtmlEditor.prototype.clear = function (bFocus) { this.setHtml('', bFocus); diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js index f53db4e5b..2869afecb 100644 --- a/dev/Common/Utils.js +++ b/dev/Common/Utils.js @@ -548,6 +548,7 @@ */ Utils.delegateRun = function (oObject, sMethodName, aParameters, nDelay) { +// window.console.log('->' + sMethodName); // TODO if (oObject && oObject[sMethodName]) { nDelay = Utils.pInt(nDelay); diff --git a/dev/External/ko.js b/dev/External/ko.js index 637963178..2be924d5a 100644 --- a/dev/External/ko.js +++ b/dev/External/ko.js @@ -656,9 +656,9 @@ fAllBindings = fAllBindingsAccessor(), fAutoCompleteSource = fAllBindings['autoCompleteSource'] || null, fFocusCallback = function (bValue) { - if (fValue && fValue.focusTrigger) + if (fValue && fValue.focused) { - fValue.focusTrigger(bValue); + fValue.focused(!!bValue); } } ; @@ -693,14 +693,20 @@ fValue(oEvent.target.value); }, this) }); + + if (fValue && fValue.focused && fValue.focused.subscribe) + { + fValue.focused.subscribe(function (bValue) { + $oEl.inputosaurus(!!bValue ? 'focus' : 'blur'); + }); + } }, - 'update': function (oElement, fValueAccessor, fAllBindingsAccessor) { + 'update': function (oElement, fValueAccessor) { var $oEl = $(oElement), - fAllValueFunc = fAllBindingsAccessor(), - fEmailsTagsFilter = fAllValueFunc['emailsTagsFilter'] || null, - sValue = ko.unwrap(fValueAccessor()) + fValue = fValueAccessor(), + sValue = ko.unwrap(fValue) ; if ($oEl.data('EmailsTagsValue') !== sValue) @@ -709,11 +715,6 @@ $oEl.data('EmailsTagsValue', sValue); $oEl.inputosaurus('refresh'); } - - if (fEmailsTagsFilter && ko.unwrap(fEmailsTagsFilter)) - { - $oEl.inputosaurus('focus'); - } } }; diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js index 455eb20db..69d718667 100644 --- a/dev/Knoin/Knoin.js +++ b/dev/Knoin/Knoin.js @@ -170,11 +170,20 @@ Globals.popupVisibilityNames.push(this.viewModelName); oViewModel.viewModelDom.css('z-index', 3000 + Globals.popupVisibilityNames().length + 10); - Utils.delegateRun(this, 'onFocus', [], 500); +// Utils.delegateRun(this, 'onShow'); // moved to showScreenPopup function (for parameters) + + if (this.onShowTrigger) + { + this.onShowTrigger(!this.onShowTrigger()); + } + + Utils.delegateRun(this, 'onShowWithDelay', [], 500); } else { Utils.delegateRun(this, 'onHide'); + Utils.delegateRun(this, 'onHideWithDelay', [], 500); + if (this.onHideTrigger) { this.onHideTrigger(!this.onHideTrigger()); @@ -251,11 +260,8 @@ if (ViewModelClassToShow.__vm && ViewModelClassToShow.__dom) { ViewModelClassToShow.__vm.modalVisibility(true); + Utils.delegateRun(ViewModelClassToShow.__vm, 'onShow', aParameters || []); - if (ViewModelClassToShow.__vm.onShowTrigger) - { - ViewModelClassToShow.__vm.onShowTrigger(!ViewModelClassToShow.__vm.onShowTrigger()); - } _.each(ViewModelClassToShow.__names, function (sName) { Plugins.runHook('view-model-on-show', [sName, ViewModelClassToShow.__vm, aParameters || []]); @@ -325,6 +331,7 @@ if (self.oCurrentScreen) { Utils.delegateRun(self.oCurrentScreen, 'onHide'); + Utils.delegateRun(self.oCurrentScreen, 'onHideWithDelay', [], 500); if (self.oCurrentScreen.onHideTrigger) { @@ -340,7 +347,9 @@ { ViewModelClass.__dom.hide(); ViewModelClass.__vm.viewModelVisibility(false); + Utils.delegateRun(ViewModelClass.__vm, 'onHide'); + Utils.delegateRun(ViewModelClass.__vm, 'onHideWithDelay', [], 500); if (ViewModelClass.__vm.onHideTrigger) { @@ -382,7 +391,7 @@ ViewModelClass.__vm.onShowTrigger(!ViewModelClass.__vm.onShowTrigger()); } - Utils.delegateRun(ViewModelClass.__vm, 'onFocus', [], 200); + Utils.delegateRun(ViewModelClass.__vm, 'onShowWithDelay', [], 200); _.each(ViewModelClass.__names, function (sName) { Plugins.runHook('view-model-on-show', [sName, ViewModelClass.__vm]); diff --git a/dev/Screen/AbstractSettings.js b/dev/Screen/AbstractSettings.js index ba41b0005..ba436c843 100644 --- a/dev/Screen/AbstractSettings.js +++ b/dev/Screen/AbstractSettings.js @@ -133,7 +133,7 @@ { self.oCurrentSubScreen.viewModelDom.show(); Utils.delegateRun(self.oCurrentSubScreen, 'onShow'); - Utils.delegateRun(self.oCurrentSubScreen, 'onFocus', [], 200); + Utils.delegateRun(self.oCurrentSubScreen, 'onShowWithDelay', [], 200); _.each(self.menu(), function (oItem) { oItem.selected(oSettingsScreen && oSettingsScreen.__rlSettingsData && oItem.route === oSettingsScreen.__rlSettingsData.Route); diff --git a/dev/Settings/User/Security.js b/dev/Settings/User/Security.js index 6658fde85..e8d4cf8a2 100644 --- a/dev/Settings/User/Security.js +++ b/dev/Settings/User/Security.js @@ -24,15 +24,60 @@ this.secreting = ko.observable(false); this.viewUser = ko.observable(''); - this.viewEnable = ko.observable(false); - this.viewEnable.subs = true; this.twoFactorStatus = ko.observable(false); + this.twoFactorTested = ko.observable(false); + this.viewSecret = ko.observable(''); this.viewBackupCodes = ko.observable(''); this.viewUrl = ko.observable(''); - this.bFirst = true; + this.viewEnable_ = ko.observable(false); + + this.viewEnable = ko.computed({ + 'owner': this, + 'read': this.viewEnable_, + 'write': function (bValue) { + + var self = this; + + bValue = !!bValue; + + if (bValue && this.twoFactorTested()) + { + this.viewEnable_(bValue); + + Remote.enableTwoFactor(function (sResult, oData) { + if (Enums.StorageResultType.Success !== sResult || !oData || !oData.Result) + { + self.viewEnable_(false); + } + + }, true); + } + else + { + if (!bValue) + { + this.viewEnable_(bValue); + } + + Remote.enableTwoFactor(function (sResult, oData) { + if (Enums.StorageResultType.Success !== sResult || !oData || !oData.Result) + { + self.viewEnable_(false); + } + + }, false); + } + } + }); + + this.viewTwoFactorEnableTooltip = ko.computed(function () { + Translator.trigger(); + return this.twoFactorTested() || this.viewEnable_() ? '' : + Translator.i18n('SETTINGS_SECURITY/TWO_FACTOR_SECRET_TEST_BEFORE_DESC'); + }, this); this.viewTwoFactorStatus = ko.computed(function () { Translator.trigger(); @@ -43,14 +88,18 @@ ); }, this); + this.twoFactorAllowedEnable = ko.computed(function () { + return this.viewEnable() || this.twoFactorTested(); + }, this); + this.onResult = _.bind(this.onResult, this); - this.onSecretResult = _.bind(this.onSecretResult, this); + this.onShowSecretResult = _.bind(this.onShowSecretResult, this); } SecurityUserSettings.prototype.showSecret = function () { this.secreting(true); - Remote.showTwoFactorSecret(this.onSecretResult); + Remote.showTwoFactorSecret(this.onShowSecretResult); }; SecurityUserSettings.prototype.hideSecret = function () @@ -68,7 +117,7 @@ SecurityUserSettings.prototype.testTwoFactor = function () { - require('Knoin/Knoin').showScreenPopup(require('View/Popup/TwoFactorTest')); + require('Knoin/Knoin').showScreenPopup(require('View/Popup/TwoFactorTest'), [this.twoFactorTested]); }; SecurityUserSettings.prototype.clearTwoFactor = function () @@ -77,6 +126,8 @@ this.viewBackupCodes(''); this.viewUrl(''); + this.twoFactorTested(false); + this.clearing(true); Remote.clearTwoFactor(this.onResult); }; @@ -96,8 +147,9 @@ if (Enums.StorageResultType.Success === sResult && oData && oData.Result) { this.viewUser(Utils.pString(oData.Result.User)); - this.viewEnable(!!oData.Result.Enable); + this.viewEnable_(!!oData.Result.Enable); this.twoFactorStatus(!!oData.Result.IsSet); + this.twoFactorTested(!!oData.Result.Tested); this.viewSecret(Utils.pString(oData.Result.Secret)); this.viewBackupCodes(Utils.pString(oData.Result.BackupCodes).replace(/[\s]+/g, ' ')); @@ -106,36 +158,17 @@ else { this.viewUser(''); - this.viewEnable(false); + this.viewEnable_(false); this.twoFactorStatus(false); + this.twoFactorTested(false); this.viewSecret(''); this.viewBackupCodes(''); this.viewUrl(''); } - - if (this.bFirst) - { - this.bFirst = false; - - var self = this; - this.viewEnable.subscribe(function (bValue) { - if (this.viewEnable.subs) - { - Remote.enableTwoFactor(function (sResult, oData) { - if (Enums.StorageResultType.Success !== sResult || !oData || !oData.Result) - { - self.viewEnable.subs = false; - self.viewEnable(false); - self.viewEnable.subs = true; - } - }, bValue); - } - }, this); - } }; - SecurityUserSettings.prototype.onSecretResult = function (sResult, oData) + SecurityUserSettings.prototype.onShowSecretResult = function (sResult, oData) { this.secreting(false); diff --git a/dev/Stores/User/Notification.js b/dev/Stores/User/Notification.js index 4b10981d9..f6be376a7 100644 --- a/dev/Stores/User/Notification.js +++ b/dev/Stores/User/Notification.js @@ -23,7 +23,7 @@ this.buzz = null; - this.enableSoundNotification = ko.observable(true); + this.enableSoundNotification = ko.observable(false); this.soundNotificationIsSupported = ko.observable(false); this.allowDesktopNotification = ko.observable(false); diff --git a/dev/Styles/Animations.less b/dev/Styles/Animations.less index 353a5fa68..0136136c7 100644 --- a/dev/Styles/Animations.less +++ b/dev/Styles/Animations.less @@ -108,7 +108,8 @@ html.rl-started-trigger.no-mobile .b-login-content .loginFormWrapper { &.csstransitions .modal.fade { .transition(all 200ms ease-out); - transform: scale(0.95); + /*transform: scale(0.95);*/ + transform: translateY(-20px); &.in { transform: none; diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less index 2c005356a..d902975cf 100644 --- a/dev/Styles/_BootstrapFix.less +++ b/dev/Styles/_BootstrapFix.less @@ -303,6 +303,10 @@ html.no-rgba .modal { top: 0; } +.modal-backdrop { + .g-ui-user-select-none(); +} + .modal.loginContent .modal-body, .modal.loginAdminContent .modal-body { background-color: transparent !important; } diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less index 36cfb3c1f..9e61f787a 100644 --- a/dev/Styles/_FontasticToBoot.less +++ b/dev/Styles/_FontasticToBoot.less @@ -154,7 +154,7 @@ margin-left: -2px; } - &.white { + &.white, &.icon-white { border-color: #fff; border-top-color: #999; diff --git a/dev/View/Admin/Settings/Menu.js b/dev/View/Admin/Settings/Menu.js index a9693e246..c77975c4a 100644 --- a/dev/View/Admin/Settings/Menu.js +++ b/dev/View/Admin/Settings/Menu.js @@ -6,6 +6,7 @@ var _ = require('_'), + Enums = require('Common/Enums'), Globals = require('Common/Globals'), kn = require('Knoin/Knoin'), @@ -37,6 +38,39 @@ return '#/' + sRoute; }; + MenuSettingsAdminView.prototype.onBuild = function (oDom) + { + key('up, down', _.throttle(function (event, handler) { + + var + sH = '', + iIndex = -1, + bUp = handler && 'up' === handler.shortcut, + $items = $('.b-admin-menu .e-item', oDom) + ; + + if (event && $items.length) + { + iIndex = $items.index($items.filter('.selected')); + if (bUp && iIndex > 0) + { + iIndex--; + } + else if (!bUp && iIndex < $items.length - 1) + { + iIndex++; + } + + sH = $items.eq(iIndex).attr('href'); + if (sH) + { + kn.setHash(sH, false, true); + } + } + + }, 200)); + }; + module.exports = MenuSettingsAdminView; }()); diff --git a/dev/View/Popup/Account.js b/dev/View/Popup/Account.js index 9bf99562e..403e76d0a 100644 --- a/dev/View/Popup/Account.js +++ b/dev/View/Popup/Account.js @@ -116,7 +116,7 @@ } }; - AccountPopupView.prototype.onFocus = function () + AccountPopupView.prototype.onShowWithDelay = function () { this.emailFocus(true); }; diff --git a/dev/View/Popup/Activate.js b/dev/View/Popup/Activate.js index 5315ecce0..f164dcce8 100644 --- a/dev/View/Popup/Activate.js +++ b/dev/View/Popup/Activate.js @@ -124,7 +124,7 @@ } }; - ActivatePopupView.prototype.onFocus = function () + ActivatePopupView.prototype.onShowWithDelay = function () { if (!this.activateProcess()) { diff --git a/dev/View/Popup/AddOpenPgpKey.js b/dev/View/Popup/AddOpenPgpKey.js index 6422b7f75..a978936d3 100644 --- a/dev/View/Popup/AddOpenPgpKey.js +++ b/dev/View/Popup/AddOpenPgpKey.js @@ -100,7 +100,7 @@ this.clearPopup(); }; - AddOpenPgpKeyPopupView.prototype.onFocus = function () + AddOpenPgpKeyPopupView.prototype.onShowWithDelay = function () { this.key.focus(true); }; diff --git a/dev/View/Popup/AdvancedSearch.js b/dev/View/Popup/AdvancedSearch.js index 62d036538..ed8d00dd5 100644 --- a/dev/View/Popup/AdvancedSearch.js +++ b/dev/View/Popup/AdvancedSearch.js @@ -148,7 +148,7 @@ this.clearPopup(); }; - AdvancedSearchPopupView.prototype.onFocus = function () + AdvancedSearchPopupView.prototype.onShowWithDelay = function () { this.fromFocus(true); }; diff --git a/dev/View/Popup/Ask.js b/dev/View/Popup/Ask.js index 0f95383c6..3d1cb4754 100644 --- a/dev/View/Popup/Ask.js +++ b/dev/View/Popup/Ask.js @@ -106,7 +106,7 @@ this.bFocusYesOnShow = Utils.isUnd(bFocusYesOnShow) ? true : !!bFocusYesOnShow; }; - AskPopupView.prototype.onFocus = function () + AskPopupView.prototype.onShowWithDelay = function () { if (this.bFocusYesOnShow) { diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index 4d9d92c27..4d18b1701 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -80,6 +80,8 @@ this.bFromDraft = false; this.sReferences = ''; + this.sLastFocusedField = 'to'; + this.resizerTrigger = _.bind(this.resizerTrigger, this); this.allowContacts = !!AppStore.contactsIsAllowed(); @@ -93,10 +95,28 @@ this.identitiesDropdownTrigger = ko.observable(false); this.to = ko.observable(''); - this.to.focusTrigger = ko.observable(false); + this.to.focused = ko.observable(false); this.cc = ko.observable(''); + this.cc.focused = ko.observable(false); this.bcc = ko.observable(''); + this.bcc.focused = ko.observable(false); this.replyTo = ko.observable(''); + this.replyTo.focused = ko.observable(false); + + ko.computed(function () { + switch (true) + { + case this.to.focused(): + this.sLastFocusedField = 'to'; + break; + case this.cc.focused(): + this.sLastFocusedField = 'cc'; + break; + case this.bcc.focused(): + this.sLastFocusedField = 'bcc'; + break; + } + }, this).extend({'notify': 'always'}); this.subject = ko.observable(''); this.isHtml = ko.observable(false); @@ -411,8 +431,13 @@ { this.skipCommand(); + var self = this; + + window.console.log(this.sLastFocusedField); + _.delay(function () { - kn.showScreenPopup(require('View/Popup/Contacts'), [true]); + kn.showScreenPopup(require('View/Popup/Contacts'), + [true, self.sLastFocusedField]); }, 200); } @@ -1233,11 +1258,11 @@ this.resizerTrigger(); }; - ComposePopupView.prototype.onFocus = function () + ComposePopupView.prototype.onShowWithDelay = function () { if ('' === this.to()) { - this.to.focusTrigger(!this.to.focusTrigger()); + this.to.focused(true); } else if (this.oEditor) { diff --git a/dev/View/Popup/ComposeOpenPgp.js b/dev/View/Popup/ComposeOpenPgp.js index 220b0d10d..828c49bad 100644 --- a/dev/View/Popup/ComposeOpenPgp.js +++ b/dev/View/Popup/ComposeOpenPgp.js @@ -198,12 +198,12 @@ }, this)); }; - ComposeOpenPgpPopupView.prototype.onHide = function () + ComposeOpenPgpPopupView.prototype.onHideWithDelay = function () { this.clearPopup(); }; - ComposeOpenPgpPopupView.prototype.onFocus = function () + ComposeOpenPgpPopupView.prototype.onShowWithDelay = function () { if (this.sign()) { diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js index 815cc7979..1a61b0c2c 100644 --- a/dev/View/Popup/Contacts.js +++ b/dev/View/Popup/Contacts.js @@ -50,6 +50,7 @@ ; this.bBackToCompose = false; + this.sLastComposeFocusedField = ''; this.allowContactsSync = Data.allowContactsSync; this.enableContactsSync = Data.enableContactsSync; @@ -236,7 +237,15 @@ }); this.newMessageCommand = Utils.createCommand(this, function () { - var aC = this.contactsCheckedOrSelected(), aE = []; + var + aE = [], + aC = this.contactsCheckedOrSelected(), + aToEmails = null, + aCcEmails = null, + aBccEmails = null, + aReplyToEmails = null + ; + if (Utils.isNonEmptyArray(aC)) { aE = _.map(aC, function (oItem) { @@ -265,8 +274,25 @@ kn.hideScreenPopup(require('View/Popup/Contacts')); + switch (self.sLastComposeFocusedField) + { + default: + case 'to': + aToEmails = aE; + break; + case 'cc': + aCcEmails = aE; + break; + case 'bcc': + aBccEmails = aE; + break; + } + + self.sLastComposeFocusedField = ''; + _.delay(function () { - kn.showScreenPopup(require('View/Popup/Compose'), [Enums.ComposeType.Empty, null, aE]); + kn.showScreenPopup(require('View/Popup/Compose'), + [Enums.ComposeType.Empty, null, aToEmails, aCcEmails, aBccEmails]); }, 200); } @@ -721,9 +747,10 @@ this.initUploader(); }; - ContactsPopupView.prototype.onShow = function (bBackToCompose) + ContactsPopupView.prototype.onShow = function (bBackToCompose, sLastComposeFocusedField) { this.bBackToCompose = Utils.isUnd(bBackToCompose) ? false : !!bBackToCompose; + this.sLastComposeFocusedField = Utils.isUnd(sLastComposeFocusedField) ? '' : sLastComposeFocusedField; kn.routeOff(); this.reloadContactList(true); @@ -732,6 +759,7 @@ ContactsPopupView.prototype.onHide = function () { kn.routeOn(); + this.currentContact(null); this.emptySelection(true); this.search(''); @@ -740,6 +768,8 @@ Utils.delegateRunOnDestroy(this.contacts()); this.contacts([]); + this.sLastComposeFocusedField = ''; + if (this.bBackToCompose) { this.bBackToCompose = false; diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js index c6f1b809a..4c5d49c64 100644 --- a/dev/View/Popup/Domain.js +++ b/dev/View/Popup/Domain.js @@ -410,7 +410,7 @@ } }; - DomainPopupView.prototype.onFocus = function () + DomainPopupView.prototype.onShowWithDelay = function () { if ('' === this.name()) { diff --git a/dev/View/Popup/Filter.js b/dev/View/Popup/Filter.js index 7d03ada3a..30ef06e0f 100644 --- a/dev/View/Popup/Filter.js +++ b/dev/View/Popup/Filter.js @@ -184,7 +184,7 @@ } }; - FilterPopupView.prototype.onFocus = function () + FilterPopupView.prototype.onShowWithDelay = function () { if (this.isNew() && this.filter()) { diff --git a/dev/View/Popup/FolderCreate.js b/dev/View/Popup/FolderCreate.js index dcc637e8d..3c65a6056 100644 --- a/dev/View/Popup/FolderCreate.js +++ b/dev/View/Popup/FolderCreate.js @@ -123,7 +123,7 @@ this.clearPopup(); }; - FolderCreateView.prototype.onFocus = function () + FolderCreateView.prototype.onShowWithDelay = function () { this.folderName.focused(true); }; diff --git a/dev/View/Popup/Identity.js b/dev/View/Popup/Identity.js index a513dcb34..c15559edf 100644 --- a/dev/View/Popup/Identity.js +++ b/dev/View/Popup/Identity.js @@ -164,6 +164,31 @@ } }; + IdentityPopupView.prototype.populateSignatureFromEditor = function () + { + if (this.editor) + { + this.signature(this.editor.getDataWithHtmlMark()); + } + }; + + IdentityPopupView.prototype.editorSetSignature = function (sSignature) + { + if (!this.editor && this.signatureDom()) + { + var self = this; + this.editor = new HtmlEditor(self.signatureDom(), function () { + self.populateSignatureFromEditor(); + }, function () { + self.editor.setHtmlOrPlain(sSignature); + }); + } + else + { + this.editor.setHtmlOrPlain(sSignature); + } + }; + /** * @param {?IdentityModel} oIdentity */ @@ -189,60 +214,23 @@ { this.id = Utils.fakeMd5(); } + + this.editorSetSignature(this.signature()); }; - IdentityPopupView.prototype.onHide = function () + IdentityPopupView.prototype.onShowWithDelay = function () { - this.clearPopup(); - }; - - IdentityPopupView.prototype.setSignature = function (sSignature) - { - if (this.editor) - { - if (':HTML:' === sSignature.substr(0, 6)) - { - this.editor.setHtml(sSignature.substr(6), false); - } - else - { - this.editor.setPlain(sSignature, false); - } - } - }; - - IdentityPopupView.prototype.populateSignatureFromEditor = function () - { - if (this.editor) - { - this.signature( - (this.editor.isHtml() ? ':HTML:' : '') + this.editor.getData() - ); - } - }; - - IdentityPopupView.prototype.onFocus = function () - { - if (!this.editor && this.signatureDom()) - { - var self = this; - this.editor = new HtmlEditor(self.signatureDom(), function () { - self.populateSignatureFromEditor(); - }, function () { - self.setSignature(self.signature()); - }); - } - else - { - this.setSignature(this.signature()); - } - if (!this.owner()) { this.email.focused(true); } }; + IdentityPopupView.prototype.onHideWithDelay = function () + { + this.clearPopup(); + }; + module.exports = IdentityPopupView; }()); \ No newline at end of file diff --git a/dev/View/Popup/NewOpenPgpKey.js b/dev/View/Popup/NewOpenPgpKey.js index 8b0a221ab..83e0ac2bf 100644 --- a/dev/View/Popup/NewOpenPgpKey.js +++ b/dev/View/Popup/NewOpenPgpKey.js @@ -104,7 +104,7 @@ this.clearPopup(); }; - NewOpenPgpKeyPopupView.prototype.onFocus = function () + NewOpenPgpKeyPopupView.prototype.onShowWithDelay = function () { this.email.focus(true); }; diff --git a/dev/View/Popup/Template.js b/dev/View/Popup/Template.js index 5b745d4b0..e59f8e0bd 100644 --- a/dev/View/Popup/Template.js +++ b/dev/View/Popup/Template.js @@ -115,22 +115,8 @@ if (this.editor) { - this.setBody(''); - } - }; - - TemplatePopupView.prototype.setBody = function (sBody) - { - if (this.editor) - { - if (':HTML:' === sBody.substr(0, 6)) - { - this.editor.setHtml(sBody.substr(6), false); - } - else - { - this.editor.setPlain(sBody, false); - } + this.editor.setPlain('', false); + this.editor.setReadOnly(true); } }; @@ -138,9 +124,7 @@ { if (this.editor) { - this.body( - (this.editor.isHtml() ? ':HTML:' : '') + this.editor.getData() - ); + this.body(this.editor.getDataWithHtmlMark()); } }; @@ -152,12 +136,12 @@ this.editor = new HtmlEditor(self.signatureDom(), function () { self.populateBodyFromEditor(); }, function () { - self.setBody(sBody); + self.editor.setHtmlOrPlain(sBody); }); } else { - this.setBody(sBody); + this.editor.setHtmlOrPlain(sBody); } }; @@ -212,7 +196,7 @@ } }; - TemplatePopupView.prototype.onFocus = function () + TemplatePopupView.prototype.onShowWithDelay = function () { this.name.focus(true); }; diff --git a/dev/View/Popup/TwoFactorTest.js b/dev/View/Popup/TwoFactorTest.js index a672911f2..431dbbe42 100644 --- a/dev/View/Popup/TwoFactorTest.js +++ b/dev/View/Popup/TwoFactorTest.js @@ -30,6 +30,8 @@ this.code.focused = ko.observable(false); this.code.status = ko.observable(null); + this.koTestedTrigger = null; + this.testing = ko.observable(false); // commands @@ -41,6 +43,11 @@ self.testing(false); self.code.status(Enums.StorageResultType.Success === sResult && oData && oData.Result ? true : false); + if (self.koTestedTrigger && self.code.status()) + { + self.koTestedTrigger(true); + } + }, this.code()); }, function () { @@ -59,14 +66,18 @@ this.code.focused(false); this.code.status(null); this.testing(false); + + this.koTestedTrigger = null; }; - TwoFactorTestPopupView.prototype.onShow = function () + TwoFactorTestPopupView.prototype.onShow = function (koTestedTrigger) { this.clearPopup(); + + this.koTestedTrigger = koTestedTrigger; }; - TwoFactorTestPopupView.prototype.onFocus = function () + TwoFactorTestPopupView.prototype.onShowWithDelay = function () { this.code.focused(true); }; diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index 9f313f809..d3b64bb48 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -252,10 +252,19 @@ this.selector.scrollToTop(); }, this); + Data.messageListEndFolder.subscribe(function (sFolder) { + var oMessage = Data.message(); + if (oMessage && sFolder && sFolder !== oMessage.folderFullNameRaw) + { + Data.message(null); + } + }, this); + SettingsStore.layout.subscribe(function (mValue) { this.selector.autoSelect(Enums.Layout.NoPreview !== mValue); }, this); + SettingsStore.layout.valueHasMutated(); Events diff --git a/dev/View/User/Settings/Menu.js b/dev/View/User/Settings/Menu.js index dbcf213a3..aeac72aa7 100644 --- a/dev/View/User/Settings/Menu.js +++ b/dev/View/User/Settings/Menu.js @@ -5,7 +5,9 @@ var _ = require('_'), + key = require('key'), + Enums = require('Common/Enums'), Globals = require('Common/Globals'), Links = require('Common/Links'), @@ -35,6 +37,44 @@ kn.extendAsViewModel(['View/User/Settings/Menu', 'View/App/Settings/Menu', 'SettingsMenuViewModel'], MenuSettingsUserView); _.extend(MenuSettingsUserView.prototype, AbstractView.prototype); + MenuSettingsUserView.prototype.onBuild = function (oDom) + { +// var self = this; +// key('esc', Enums.KeyState.Settings, function () { +// self.backToMailBoxClick(); +// }); + + key('up, down', Enums.KeyState.Settings, _.throttle(function (event, handler) { + + var + sH = '', + iIndex = -1, + bUp = handler && 'up' === handler.shortcut, + $items = $('.b-settings-menu .e-item', oDom) + ; + + if (event && $items.length) + { + iIndex = $items.index($items.filter('.selected')); + if (bUp && iIndex > 0) + { + iIndex--; + } + else if (!bUp && iIndex < $items.length - 1) + { + iIndex++; + } + + sH = $items.eq(iIndex).attr('href'); + if (sH) + { + kn.setHash(sH, false, true); + } + } + + }, 200)); + }; + MenuSettingsUserView.prototype.link = function (sRoute) { return Links.settings(sRoute); diff --git a/dev/View/User/Settings/Pane.js b/dev/View/User/Settings/Pane.js index 6fd8eaf91..129710a83 100644 --- a/dev/View/User/Settings/Pane.js +++ b/dev/View/User/Settings/Pane.js @@ -5,9 +5,7 @@ var _ = require('_'), - key = require('key'), - Enums = require('Common/Enums'), Links = require('Common/Links'), Data = require('Storage/User/Data'), @@ -31,14 +29,6 @@ kn.extendAsViewModel(['View/User/Settings/Pane', 'View/App/Settings/Pane', 'SettingsPaneViewModel'], PaneSettingsUserView); _.extend(PaneSettingsUserView.prototype, AbstractView.prototype); - PaneSettingsUserView.prototype.onBuild = function () - { - var self = this; - key('esc', Enums.KeyState.Settings, function () { - self.backToMailBoxClick(); - }); - }; - PaneSettingsUserView.prototype.onShow = function () { Data.message(null); diff --git a/gulpfile.js b/gulpfile.js index 79fa17b93..e88d86ef6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -420,6 +420,7 @@ gulp.task('ckeditor', ['ckeditor:copy-plugins'], function () { return gulp.src('rainloop/v/' + cfg.devVersion + '/static/ckeditor/*.js') .pipe(stripbom()) // .pipe(replace("\u200B", "\\u200B")) + .pipe(replace('console.log("Detecting changes using MutationObservers")', 'true')) .pipe(header("\uFEFF")) // BOM .pipe(gulp.dest('rainloop/v/' + cfg.devVersion + '/static/ckeditor')); }); diff --git a/package.json b/package.json index 613447947..e5dcbadbc 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.8.1", - "release": "258", + "release": "259", "description": "Simple, modern & fast web-based email client", "homepage": "http://rainloop.net", "main": "gulpfile.js", diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index 8367cd599..abf36e70b 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -1288,6 +1288,7 @@ class Actions 'AllowAppendMessage' => (bool) $oConfig->Get('labs', 'allow_message_append', false), 'MaterialDesign' => (bool) $oConfig->Get('labs', 'use_material_design', true), 'PremType' => $this->PremType(), + 'Admin' => array(), 'Capa' => array(), 'Plugins' => array() ); @@ -6420,10 +6421,10 @@ class Actions $aData = $this->getTwoFactorInfo($oAccount); $sSecret = !empty($aData['Secret']) ? $aData['Secret'] : ''; - $this->Logger()->WriteDump(array( - $sCode, $sSecret, $aData, - $this->TwoFactorAuthProvider()->VerifyCode($sSecret, $sCode) - )); +// $this->Logger()->WriteDump(array( +// $sCode, $sSecret, $aData, +// $this->TwoFactorAuthProvider()->VerifyCode($sSecret, $sCode) +// )); \sleep(1); return $this->DefaultResponse(__FUNCTION__, diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html index f7c9d8d40..cd07c251c 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html +++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html @@ -14,7 +14,12 @@

RainLoop

-

+

+ + + ( channel) + +

Simple, modern & fast web-based email client

@@ -27,9 +32,6 @@    New - - () - version is available. () diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html index ac33f802e..60318b591 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html @@ -11,7 +11,7 @@    - + × @@ -106,7 +106,7 @@
- + diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsIdentity.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsIdentity.html index 9ea11e3dd..17e13af12 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsIdentity.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsIdentity.html @@ -1,7 +1,7 @@
-
+
-
+

@@ -9,7 +9,7 @@

-
+
@@ -66,8 +66,10 @@
-
-
+
+
+
+
-
+
-
+

@@ -9,7 +9,7 @@

-
+
@@ -22,7 +22,9 @@ data-bind="textInput: name, onEnter: addTemplateCommand, hasfocus: name.focus" />
-
+
+
+
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsPane.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsPane.html index c4f7b39aa..da4ccc8df 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsPane.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsPane.html @@ -1,5 +1,5 @@
-
+
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsSecurity.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsSecurity.html index 7576f1b59..d40cfd87f 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsSecurity.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsSecurity.html @@ -3,12 +3,13 @@
-
-
+
+
@@ -29,8 +30,7 @@    -    - +    diff --git a/rainloop/v/0.0.0/langs/bg.ini b/rainloop/v/0.0.0/langs/bg.ini index 31679cdb4..f6f7da4d7 100644 --- a/rainloop/v/0.0.0/langs/bg.ini +++ b/rainloop/v/0.0.0/langs/bg.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured" TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually." TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator, you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Общи" diff --git a/rainloop/v/0.0.0/langs/de.ini b/rainloop/v/0.0.0/langs/de.ini index b5845d22b..f45f69549 100644 --- a/rainloop/v/0.0.0/langs/de.ini +++ b/rainloop/v/0.0.0/langs/de.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Konfiguriert" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Nicht konfiguriert" TWO_FACTOR_SECRET_DESC = "Importieren Sie diese Informationen in Ihren Google Authenticator-Client (oder andere TOTP-Clienten) mit Hilfe des mitgelieferten QR-Code unten oder durch manuelle Eingabe des Codes." TWO_FACTOR_BACKUP_CODES_DESC = "Wenn Sie keine Codes via Google Authenticator erhalten können, können Sie Backup-Codes für die Anmeldung verwenden. Nachdem Sie einen Backup-Code verwendet haben, um sich anzumelden, wird dieser inaktiv." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Allgemein" diff --git a/rainloop/v/0.0.0/langs/en.ini b/rainloop/v/0.0.0/langs/en.ini index 1c3bef9a7..8410f4500 100644 --- a/rainloop/v/0.0.0/langs/en.ini +++ b/rainloop/v/0.0.0/langs/en.ini @@ -435,13 +435,13 @@ LABEL_SIGNATURE = "Signature" LABEL_ADD_SIGNATURE_TO_ALL = "Add your signature to all the outgoing messages" [SETTINGS_SECURITY] -LEGEND_TWO_FACTOR_AUTH = "2-Step Verification" +LEGEND_TWO_FACTOR_AUTH = "2-Step Verification (TOTP)" LABEL_ENABLE_TWO_FACTOR = "Enable 2-Step verification" LABEL_TWO_FACTOR_USER = "User" LABEL_TWO_FACTOR_STATUS = "Status" LABEL_TWO_FACTOR_SECRET = "Secret" LABEL_TWO_FACTOR_BACKUP_CODES = "Backup codes" -BUTTON_CREATE = "Create New Secret" +BUTTON_CREATE = "Create a secret" BUTTON_CLEAR = "Clear" BUTTON_TEST = "Test" BUTTON_SHOW_SECRET = "Show Secret" @@ -449,7 +449,8 @@ BUTTON_HIDE_SECRET = "Hide Secret" TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured" TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually." -TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator, you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive." +TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator (or other TOTP client), you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "General" diff --git a/rainloop/v/0.0.0/langs/es.ini b/rainloop/v/0.0.0/langs/es.ini index c3f92b6e7..01daf9877 100644 --- a/rainloop/v/0.0.0/langs/es.ini +++ b/rainloop/v/0.0.0/langs/es.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configurado" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "No configurado" TWO_FACTOR_SECRET_DESC = "Importar esta información en su cliente Google Authenticator (u otro cliente TOTP) utilizando el código QR ​​se indica debajo o introduciendo el código manualmente." TWO_FACTOR_BACKUP_CODES_DESC = "Si usted no puede recibir los códigos a través de Google Authenticator, puede utilizar códigos de copia de seguridad para firmar pulg Después de que usted ha utilizado un código de copia de seguridad para iniciar sesión, se convertirá en inactiva." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "General" diff --git a/rainloop/v/0.0.0/langs/fr.ini b/rainloop/v/0.0.0/langs/fr.ini index f4cfc4938..c6c2ac196 100644 --- a/rainloop/v/0.0.0/langs/fr.ini +++ b/rainloop/v/0.0.0/langs/fr.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configurer" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Non configuré" TWO_FACTOR_SECRET_DESC = "Importez ces informations dans votre client Google Authenticator (ou un autre client TOTP) en utilisant le code QR fourni ci-dessous ou en entrant les valeurs manuellement." TWO_FACTOR_BACKUP_CODES_DESC = "Si vous ne pouvez pas recevoir les codes par Google Authenticator, vous pouvez utiliser les codes de sauvegarde pour vous connecter. Après avoir fait cela, il deviendra inactif." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Général" diff --git a/rainloop/v/0.0.0/langs/hu.ini b/rainloop/v/0.0.0/langs/hu.ini index f99e7a42b..0ba5efb7d 100644 --- a/rainloop/v/0.0.0/langs/hu.ini +++ b/rainloop/v/0.0.0/langs/hu.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured" TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually." TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator, you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "General" diff --git a/rainloop/v/0.0.0/langs/is.ini b/rainloop/v/0.0.0/langs/is.ini index 39726a21c..7cf770015 100644 --- a/rainloop/v/0.0.0/langs/is.ini +++ b/rainloop/v/0.0.0/langs/is.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured" TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually." TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator, you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Almennt" diff --git a/rainloop/v/0.0.0/langs/it.ini b/rainloop/v/0.0.0/langs/it.ini index 333b8a598..16f94b51a 100644 --- a/rainloop/v/0.0.0/langs/it.ini +++ b/rainloop/v/0.0.0/langs/it.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configurato" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Non configurato" TWO_FACTOR_SECRET_DESC = "Importa questo codice nel tuo client di Google Authenticator (o un altro client TOTP) usando il codice QR presente sotto o inserendo il codice manualmente." TWO_FACTOR_BACKUP_CODES_DESC = "Se non puoi ricevere codici da Google Authenticator, puoi usare i codici di riserva per entrare. Dopo aver usato un codice di riserva per entrare, esso si disattiverà." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Generali" diff --git a/rainloop/v/0.0.0/langs/ja-jp.ini b/rainloop/v/0.0.0/langs/ja-jp.ini index dcf8e85a4..95a2f2062 100644 --- a/rainloop/v/0.0.0/langs/ja-jp.ini +++ b/rainloop/v/0.0.0/langs/ja-jp.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured" TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually." TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator, you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "全般" diff --git a/rainloop/v/0.0.0/langs/ko-kr.ini b/rainloop/v/0.0.0/langs/ko-kr.ini index 923bfeae0..1a0fede03 100644 --- a/rainloop/v/0.0.0/langs/ko-kr.ini +++ b/rainloop/v/0.0.0/langs/ko-kr.ini @@ -447,6 +447,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured" TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually." TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator, you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "일반" diff --git a/rainloop/v/0.0.0/langs/lt.ini b/rainloop/v/0.0.0/langs/lt.ini index 417a5a3a8..ec71ef9ce 100644 --- a/rainloop/v/0.0.0/langs/lt.ini +++ b/rainloop/v/0.0.0/langs/lt.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Sukonfiguruota" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Nesukonfiguruota" TWO_FACTOR_SECRET_DESC = "Importuoti šią informaciją į Google autentifikavimo klientą naudojant žemiau pateiktą QR kodą arba įveskite kodą rankiniu būdu." TWO_FACTOR_BACKUP_CODES_DESC = "Jei negaunate kodo per Google autentifikavimo klientą, galite nautotis savo sukurta atsargine kodų kopija. Kai panaudosite atsarginę kopiją prisijungimui, ji taps neaktyvi." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Pagrindiniai" diff --git a/rainloop/v/0.0.0/langs/lv.ini b/rainloop/v/0.0.0/langs/lv.ini index 2c7b5efcb..8d7056871 100644 --- a/rainloop/v/0.0.0/langs/lv.ini +++ b/rainloop/v/0.0.0/langs/lv.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured" TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually." TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator, you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Vispārējie" diff --git a/rainloop/v/0.0.0/langs/nl.ini b/rainloop/v/0.0.0/langs/nl.ini index 097271e54..97c252f0d 100644 --- a/rainloop/v/0.0.0/langs/nl.ini +++ b/rainloop/v/0.0.0/langs/nl.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Geconfigureerd" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Niet geconfigureerd" TWO_FACTOR_SECRET_DESC = "Importeer deze informatie in uw Google Authenticator-client (of andere TOTP-client) door gebruik te maken van de QR code hier beneden of door de code handmatig in te voeren." TWO_FACTOR_BACKUP_CODES_DESC = "Als u geen codes ontvangt via de Google Authenticator kan je de backup codes gebruiken om in te loggen. Na gebruik van de backup code wordt deze inactief." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Algemeen" diff --git a/rainloop/v/0.0.0/langs/no.ini b/rainloop/v/0.0.0/langs/no.ini index 7611f97c9..9e3f4ed67 100644 --- a/rainloop/v/0.0.0/langs/no.ini +++ b/rainloop/v/0.0.0/langs/no.ini @@ -449,6 +449,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Konfigurert" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Ikke konfigurert" TWO_FACTOR_SECRET_DESC = "Importer denne informasjonen til din Google Authenticator klient (eller andre klienter) ved å bruke QR-koden under, eller ved å skrive inn koden manuelt." TWO_FACTOR_BACKUP_CODES_DESC = "Om du ikke mottar koder fra Google Authenticator, kan du brukeyou can use backupkodene for å logge inn. Disse kodene vil bli deaktivert etter bruk." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Generelt" diff --git a/rainloop/v/0.0.0/langs/pl.ini b/rainloop/v/0.0.0/langs/pl.ini index 89cfa9bde..579132ce4 100644 --- a/rainloop/v/0.0.0/langs/pl.ini +++ b/rainloop/v/0.0.0/langs/pl.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Skonfigurowane" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Nie skonfigurowane" TWO_FACTOR_SECRET_DESC = "Zaimportuj te informacje do swojego klienta usługi Google Authenticator (lub innego klienta TOTP), używając poniższego kodu QR lub wpisując kod ręcznie." TWO_FACTOR_BACKUP_CODES_DESC = "Jeżeli nie możesz otrzymać kodu poprzez apikację Google Authenticator, możesz użyć kodów zapasowych. Po zużyciu kodów, opcja ta będzie nieaktywna." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Ogólne" diff --git a/rainloop/v/0.0.0/langs/pt-br.ini b/rainloop/v/0.0.0/langs/pt-br.ini index 8ad4a46dc..7e812e5c4 100644 --- a/rainloop/v/0.0.0/langs/pt-br.ini +++ b/rainloop/v/0.0.0/langs/pt-br.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configurado" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Não configurado" TWO_FACTOR_SECRET_DESC = "Importe este código no seu cliente Google Authenticator (ou outro cliente TOTP) usando o QR code abaixo ou informando o código manualmente." TWO_FACTOR_BACKUP_CODES_DESC = "Se você não puder receber os códigos via Google Authenticator, você pode usar esses códigos de backup para acessar sua conta. Depois de você usar um código de backup, ele se expira." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Geral" diff --git a/rainloop/v/0.0.0/langs/pt-pt.ini b/rainloop/v/0.0.0/langs/pt-pt.ini index 5c64e3bd8..cd420148b 100644 --- a/rainloop/v/0.0.0/langs/pt-pt.ini +++ b/rainloop/v/0.0.0/langs/pt-pt.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured" TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually." TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator, you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Geral" diff --git a/rainloop/v/0.0.0/langs/ro.ini b/rainloop/v/0.0.0/langs/ro.ini index 9d8342d93..9b63ef78f 100644 --- a/rainloop/v/0.0.0/langs/ro.ini +++ b/rainloop/v/0.0.0/langs/ro.ini @@ -449,6 +449,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured" TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually." TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator, you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Setări de bază" diff --git a/rainloop/v/0.0.0/langs/ru.ini b/rainloop/v/0.0.0/langs/ru.ini index f7da92721..ffd014adb 100644 --- a/rainloop/v/0.0.0/langs/ru.ini +++ b/rainloop/v/0.0.0/langs/ru.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Настроен" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Не настроен" TWO_FACTOR_SECRET_DESC = "Используйте эту информацию для настройки Google Authenticator клиента (или другого TOTP клиента) с помощью прилагаемого QR-кода, или вручную." TWO_FACTOR_BACKUP_CODES_DESC = "Если вы не можете получить коды через Google Authenticator, вы можете использовать резервные коды, чтобы войти. После того как вы использовали резервный код для входа в систему, он становится неактивным." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Основные Настройки" diff --git a/rainloop/v/0.0.0/langs/sk.ini b/rainloop/v/0.0.0/langs/sk.ini index 9fa0afb56..5faf626cb 100644 --- a/rainloop/v/0.0.0/langs/sk.ini +++ b/rainloop/v/0.0.0/langs/sk.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured" TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually." TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator, you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Všeobecné" diff --git a/rainloop/v/0.0.0/langs/sv.ini b/rainloop/v/0.0.0/langs/sv.ini index 170c0c66c..9ecb24b43 100644 --- a/rainloop/v/0.0.0/langs/sv.ini +++ b/rainloop/v/0.0.0/langs/sv.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Konfigurerad" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Inte konfigurarad" TWO_FACTOR_SECRET_DESC = "Importera denna information till din Google Authenticator klient (eller annan TOTP klient) med denna QR kod eller manuellt med koden här nedan." TWO_FACTOR_BACKUP_CODES_DESC = "Om du inte kan ta emot koderna med Google Authenticator, så använd backupkoderna för att logga in. När du använt backupkoderna för att logga in så blir dom inaktiva." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Allmänt" diff --git a/rainloop/v/0.0.0/langs/tr.ini b/rainloop/v/0.0.0/langs/tr.ini index deb2a2430..bdca0395c 100644 --- a/rainloop/v/0.0.0/langs/tr.ini +++ b/rainloop/v/0.0.0/langs/tr.ini @@ -448,6 +448,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Yapılandırılmış" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Yapılandırılmamış" TWO_FACTOR_SECRET_DESC = "Aşağıda sunulan QR kodu kullanarak Google Şifrematik istemcisi (veya başka TOTP istemci) içine veya elle kod girerek bu bilgi aktarın." TWO_FACTOR_BACKUP_CODES_DESC = "Google Şifrematik'te aracılığıyla kodları alamıyorsa Eğer oturum için bir yedek kod kullandım sonra, bunu pasif olacaktır, oturum yedekleme kodlarını kullanabilirsiniz." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Genel" diff --git a/rainloop/v/0.0.0/langs/ua.ini b/rainloop/v/0.0.0/langs/ua.ini index f74bf85a1..a4662aaba 100644 --- a/rainloop/v/0.0.0/langs/ua.ini +++ b/rainloop/v/0.0.0/langs/ua.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Налаштований" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Не налаштований" TWO_FACTOR_SECRET_DESC = "Використовуйте цю інформацію для налаштування Google Authenticator клиенту (чи іншого TOTP клиенту) за допомогою прикладеного QR-коду, чи вручну." TWO_FACTOR_BACKUP_CODES_DESC = "Якщо Ви не можете отримати коди через Google Authenticator, ви можете використовувати резервні коди, щоб увійти. Після того як Ви використали резервний код для входу в систему, він стає неактивним." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "Основні Налаштування" diff --git a/rainloop/v/0.0.0/langs/zh-cn.ini b/rainloop/v/0.0.0/langs/zh-cn.ini index 9102c6b87..942247637 100644 --- a/rainloop/v/0.0.0/langs/zh-cn.ini +++ b/rainloop/v/0.0.0/langs/zh-cn.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured" TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually." TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator, you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "一般设置" diff --git a/rainloop/v/0.0.0/langs/zh-tw.ini b/rainloop/v/0.0.0/langs/zh-tw.ini index 48b671bcd..1bae70f98 100644 --- a/rainloop/v/0.0.0/langs/zh-tw.ini +++ b/rainloop/v/0.0.0/langs/zh-tw.ini @@ -450,6 +450,7 @@ TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured" TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured" TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually." TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator, you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive." +TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test." [SETTINGS_GENERAL] LEGEND_GENERAL = "一般設置" diff --git a/rainloop/v/0.0.0/static/ckeditor/ckeditor.js b/rainloop/v/0.0.0/static/ckeditor/ckeditor.js index 8ee20e1bd..19e2fbb06 100644 --- a/rainloop/v/0.0.0/static/ckeditor/ckeditor.js +++ b/rainloop/v/0.0.0/static/ckeditor/ckeditor.js @@ -875,7 +875,7 @@ b),e="undefined"==typeof this.state?CKEDITOR.TRISTATE_OFF:this.state,j="",i=e==C "false",disabled:e==CKEDITOR.TRISTATE_DISABLED,title:this.label,href:"javascript:void('"+(this.label||"").replace("'")+"')",hoverFn:a._.itemOverFn,moveOutFn:a._.itemOutFn,clickFn:a._.itemClickFn,index:b,iconStyle:CKEDITOR.skin.getIconStyle(g,"rtl"==this.editor.lang.dir,g==this.icon?null:this.icon,this.iconOffset),arrowHtml:f?l.output({label:d}):"",role:this.role?this.role:"menuitem",ariaChecked:j};m.output(a,c)}}})})();CKEDITOR.config.menu_groups="clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div";CKEDITOR.plugins.add("menubutton",{requires:"button,menu",onLoad:function(){var d=function(c){var a=this._,b=a.menu;a.state!==CKEDITOR.TRISTATE_DISABLED&&(a.on&&b?b.hide():(a.previousState=a.state,b||(b=a.menu=new CKEDITOR.menu(c,{panel:{className:"cke_menu_panel",attributes:{"aria-label":c.lang.common.options}}}),b.onHide=CKEDITOR.tools.bind(function(){var b=this.command?c.getCommand(this.command).modes:this.modes;this.setState(!b||b[c.mode]?a.previousState:CKEDITOR.TRISTATE_DISABLED);a.on=0},this), this.onMenu&&b.addListener(this.onMenu)),this.setState(CKEDITOR.TRISTATE_ON),a.on=1,setTimeout(function(){b.show(CKEDITOR.document.getById(a.id),4)},0)))};CKEDITOR.ui.menuButton=CKEDITOR.tools.createClass({base:CKEDITOR.ui.button,$:function(c){delete c.panel;this.base(c);this.hasArrow=!0;this.click=d},statics:{handler:{create:function(c){return new CKEDITOR.ui.menuButton(c)}}}})},beforeInit:function(d){d.ui.addHandler(CKEDITOR.UI_MENUBUTTON,CKEDITOR.ui.menuButton.handler)}}); CKEDITOR.UI_MENUBUTTON="menubutton";CKEDITOR.plugins.add("onchange",{init:function(a){function b(){a.readOnly||d||(d=setTimeout(function(){d=0;a.fire("change")},a.config.minimumChangeMilliseconds||100))}var d,g=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver,f;a.on("destroy",function(){d&&clearTimeout(d);d=null});a.on("saveSnapshot",function(a){(!a.data||!a.data.contentOnly)&&b()});var e=a.getCommand("undo");e&&e.on("afterUndo",b);(e=a.getCommand("redo"))&&e.on("afterRedo",b);a.on("afterCommandExec", -function(a){"source"!=a.data.name&&!1!==a.data.command.canUndo&&b()});g&&(f=new g(function(){b()}),window.console&&window.console.log&&console.log("Detecting changes using MutationObservers"));a.on("contentDom",function(){if(f)var c=setInterval(function(){if(typeof a.document==="object"){f.observe(a.document.getBody().$,{attributes:true,childList:true,characterData:true});clearInterval(c)}},100);a.document.on("keydown",function(a){if(!a.data.$.ctrlKey&&!a.data.$.metaKey){a=a.data.$.keyCode;(a==8|| +function(a){"source"!=a.data.name&&!1!==a.data.command.canUndo&&b()});g&&(f=new g(function(){b()}),window.console&&window.console.log&&true);a.on("contentDom",function(){if(f)var c=setInterval(function(){if(typeof a.document==="object"){f.observe(a.document.getBody().$,{attributes:true,childList:true,characterData:true});clearInterval(c)}},100);a.document.on("keydown",function(a){if(!a.data.$.ctrlKey&&!a.data.$.metaKey){a=a.data.$.keyCode;(a==8|| a==13||a==32||a>=46&&a<=90||a>=96&&a<=111||a>=186&&a<=222||a==229)&&b()}});a.document.on("drop",b);a.document.getBody().on("drop",b)});a.on("mode",function(){if(a.mode=="source"){var c=a.textarea||a._.editable;c.on("keydown",function(a){!a.data.$.ctrlKey&&!a.data.$.metaKey&&b()});c.on("drop",b);c.on("input",b);if(CKEDITOR.env.ie){c.on("cut",b);c.on("paste",b)}}})}});CKEDITOR.plugins.add("removeformat",{init:function(a){a.addCommand("removeFormat",CKEDITOR.plugins.removeformat.commands.removeformat);a.ui.addButton&&a.ui.addButton("RemoveFormat",{label:a.lang.removeformat.toolbar,command:"removeFormat",toolbar:"cleanup,10"})}}); CKEDITOR.plugins.removeformat={commands:{removeformat:{exec:function(a){for(var h=a._.removeFormatRegex||(a._.removeFormatRegex=RegExp("^(?:"+a.config.removeFormatTags.replace(/,/g,"|")+")$","i")),e=a._.removeAttributes||(a._.removeAttributes=a.config.removeFormatAttributes.split(",")),f=CKEDITOR.plugins.removeformat.filter,k=a.getSelection().getRanges(),l=k.createIterator(),m=function(a){return a.type==CKEDITOR.NODE_ELEMENT},c;c=l.getNextRange();){c.collapsed||c.enlarge(CKEDITOR.ENLARGE_ELEMENT); var j=c.createBookmark(),b=j.startNode,d=j.endNode,i=function(b){for(var c=a.elementPath(b),e=c.elements,d=1,g;(g=e[d])&&!g.equals(c.block)&&!g.equals(c.blockLimit);d++)h.test(g.getName())&&f(a,g)&&b.breakParent(g)};i(b);if(d){i(d);for(b=b.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT);b&&!b.equals(d);)if(b.isReadOnly()){if(b.getPosition(d)&CKEDITOR.POSITION_CONTAINS)break;b=b.getNext(m)}else i=b.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT),!("img"==b.getName()&&b.data("cke-realelement"))&&f(a,b)&&(h.test(b.getName())? diff --git a/rainloop/v/0.0.0/static/ckeditor/ckeditor.orig.js b/rainloop/v/0.0.0/static/ckeditor/ckeditor.orig.js index 79aab00d7..a3672e420 100644 --- a/rainloop/v/0.0.0/static/ckeditor/ckeditor.orig.js +++ b/rainloop/v/0.0.0/static/ckeditor/ckeditor.orig.js @@ -867,7 +867,7 @@ b),e="undefined"==typeof this.state?CKEDITOR.TRISTATE_OFF:this.state,j="",i=e==C "false",disabled:e==CKEDITOR.TRISTATE_DISABLED,title:this.label,href:"javascript:void('"+(this.label||"").replace("'")+"')",hoverFn:a._.itemOverFn,moveOutFn:a._.itemOutFn,clickFn:a._.itemClickFn,index:b,iconStyle:CKEDITOR.skin.getIconStyle(g,"rtl"==this.editor.lang.dir,g==this.icon?null:this.icon,this.iconOffset),arrowHtml:f?l.output({label:d}):"",role:this.role?this.role:"menuitem",ariaChecked:j};m.output(a,c)}}})})();CKEDITOR.config.menu_groups="clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div";CKEDITOR.plugins.add("menubutton",{requires:"button,menu",onLoad:function(){var d=function(c){var a=this._,b=a.menu;a.state!==CKEDITOR.TRISTATE_DISABLED&&(a.on&&b?b.hide():(a.previousState=a.state,b||(b=a.menu=new CKEDITOR.menu(c,{panel:{className:"cke_menu_panel",attributes:{"aria-label":c.lang.common.options}}}),b.onHide=CKEDITOR.tools.bind(function(){var b=this.command?c.getCommand(this.command).modes:this.modes;this.setState(!b||b[c.mode]?a.previousState:CKEDITOR.TRISTATE_DISABLED);a.on=0},this), this.onMenu&&b.addListener(this.onMenu)),this.setState(CKEDITOR.TRISTATE_ON),a.on=1,setTimeout(function(){b.show(CKEDITOR.document.getById(a.id),4)},0)))};CKEDITOR.ui.menuButton=CKEDITOR.tools.createClass({base:CKEDITOR.ui.button,$:function(c){delete c.panel;this.base(c);this.hasArrow=!0;this.click=d},statics:{handler:{create:function(c){return new CKEDITOR.ui.menuButton(c)}}}})},beforeInit:function(d){d.ui.addHandler(CKEDITOR.UI_MENUBUTTON,CKEDITOR.ui.menuButton.handler)}}); CKEDITOR.UI_MENUBUTTON="menubutton";CKEDITOR.plugins.add("onchange",{init:function(a){function b(){a.readOnly||d||(d=setTimeout(function(){d=0;a.fire("change")},a.config.minimumChangeMilliseconds||100))}var d,g=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver,f;a.on("destroy",function(){d&&clearTimeout(d);d=null});a.on("saveSnapshot",function(a){(!a.data||!a.data.contentOnly)&&b()});var e=a.getCommand("undo");e&&e.on("afterUndo",b);(e=a.getCommand("redo"))&&e.on("afterRedo",b);a.on("afterCommandExec", -function(a){"source"!=a.data.name&&!1!==a.data.command.canUndo&&b()});g&&(f=new g(function(){b()}),window.console&&window.console.log&&console.log("Detecting changes using MutationObservers"));a.on("contentDom",function(){if(f)var c=setInterval(function(){if(typeof a.document==="object"){f.observe(a.document.getBody().$,{attributes:true,childList:true,characterData:true});clearInterval(c)}},100);a.document.on("keydown",function(a){if(!a.data.$.ctrlKey&&!a.data.$.metaKey){a=a.data.$.keyCode;(a==8|| +function(a){"source"!=a.data.name&&!1!==a.data.command.canUndo&&b()});g&&(f=new g(function(){b()}),window.console&&window.console.log&&true);a.on("contentDom",function(){if(f)var c=setInterval(function(){if(typeof a.document==="object"){f.observe(a.document.getBody().$,{attributes:true,childList:true,characterData:true});clearInterval(c)}},100);a.document.on("keydown",function(a){if(!a.data.$.ctrlKey&&!a.data.$.metaKey){a=a.data.$.keyCode;(a==8|| a==13||a==32||a>=46&&a<=90||a>=96&&a<=111||a>=186&&a<=222||a==229)&&b()}});a.document.on("drop",b);a.document.getBody().on("drop",b)});a.on("mode",function(){if(a.mode=="source"){var c=a.textarea||a._.editable;c.on("keydown",function(a){!a.data.$.ctrlKey&&!a.data.$.metaKey&&b()});c.on("drop",b);c.on("input",b);if(CKEDITOR.env.ie){c.on("cut",b);c.on("paste",b)}}})}});CKEDITOR.plugins.add("removeformat",{init:function(a){a.addCommand("removeFormat",CKEDITOR.plugins.removeformat.commands.removeformat);a.ui.addButton&&a.ui.addButton("RemoveFormat",{label:a.lang.removeformat.toolbar,command:"removeFormat",toolbar:"cleanup,10"})}}); CKEDITOR.plugins.removeformat={commands:{removeformat:{exec:function(a){for(var h=a._.removeFormatRegex||(a._.removeFormatRegex=RegExp("^(?:"+a.config.removeFormatTags.replace(/,/g,"|")+")$","i")),e=a._.removeAttributes||(a._.removeAttributes=a.config.removeFormatAttributes.split(",")),f=CKEDITOR.plugins.removeformat.filter,k=a.getSelection().getRanges(),l=k.createIterator(),m=function(a){return a.type==CKEDITOR.NODE_ELEMENT},c;c=l.getNextRange();){c.collapsed||c.enlarge(CKEDITOR.ENLARGE_ELEMENT); var j=c.createBookmark(),b=j.startNode,d=j.endNode,i=function(b){for(var c=a.elementPath(b),e=c.elements,d=1,g;(g=e[d])&&!g.equals(c.block)&&!g.equals(c.blockLimit);d++)h.test(g.getName())&&f(a,g)&&b.breakParent(g)};i(b);if(d){i(d);for(b=b.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT);b&&!b.equals(d);)if(b.isReadOnly()){if(b.getPosition(d)&CKEDITOR.POSITION_CONTAINS)break;b=b.getNext(m)}else i=b.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT),!("img"==b.getName()&&b.data("cke-realelement"))&&f(a,b)&&(h.test(b.getName())? diff --git a/vendors/inputosaurus/inputosaurus.js b/vendors/inputosaurus/inputosaurus.js index b1e44b999..87bb0b885 100644 --- a/vendors/inputosaurus/inputosaurus.js +++ b/vendors/inputosaurus/inputosaurus.js @@ -600,6 +600,10 @@ this.elements.input.focus(); }, + blur : function () { + this.elements.input.blur(); + }, + _focus : function(ev) { var widget = (ev && ev.data.widget) || this, diff --git a/vendors/inputosaurus/inputosaurus.min.js b/vendors/inputosaurus/inputosaurus.min.js index 9abe5b717..ba915abe1 100644 --- a/vendors/inputosaurus/inputosaurus.min.js +++ b/vendors/inputosaurus/inputosaurus.min.js @@ -1,2 +1,2 @@ /*! Inputosaurus Text v0.1.6 (c) 2013 Dan Kielp ; modified by RainLoop Team | MIT */ -!function(e){var t={version:"0.1.6",fakeSpan:e(''),eventprefix:"inputosaurus",options:{inputDelimiters:[",",";"],outputDelimiter:",",allowDuplicates:!1,allowDragAndDrop:!0,focusCallback:null,parseOnBlur:!1,wrapperElement:null,width:null,autoCompleteSource:"",activateFinalResult:!1,parseHook:null,placeholder:null},_create:function(){var t=this,i={},n=t.options,s=n.placeholder||this.element.attr("placeholder")||null;this._chosenValues=[],i.ul=e('
    '),this.options.allowDragAndDrop&&i.ul.droppable({drop:function(e,n){n.draggable.addClass("inputosaurus-dropped"),i.input.val(n.draggable.data("inputosaurus-value")),n.draggable.__widget&&n.draggable.__widget._removeDraggedTag(n.draggable),t.parseInput()}}),i.input=e(''),i.inputCont=e('
  • '),i.origInputCont=e('
  • '),i.lastEdit="",i.input.on("focus",function(){t._focusTrigger(!0)}).on("blur",function(){t._focusTrigger(!1)}),s&&(n.placeholder=s,i.input.attr("placeholder",n.placeholder),n.width&&i.input.css("min-width",n.width-50)),n.wrapperElement&&n.wrapperElement.append(i.ul),this.element.replaceWith(n.wrapperElement||i.ul),i.origInputCont.append(this.element).hide(),i.inputCont.append(i.input),i.ul.append(i.inputCont),i.ul.append(i.origInputCont),n.width&&i.ul.css("width",n.width),this.elements=i,t._attachEvents(),e.trim(this.element.val())&&(i.input.val(this.element.val()),this.parseInput()),this._instAutocomplete()},_focusTriggerTimer:0,_focusTrigger:function(e){var t=this;window.clearTimeout(this._focusTriggerTimer),this._focusTriggerTimer=window.setTimeout(function(){t.elements.ul[e?"addClass":"removeClass"]("inputosaurus-focused"),t.options.focusCallback&&t.options.focusCallback(e)},10)},_instAutocomplete:function(){if(this.options.autoCompleteSource){var t=this;this.elements.input.autocomplete({position:{of:this.elements.ul},source:this.options.autoCompleteSource,minLength:1,autoFocus:!0,select:function(e,i){e.preventDefault(),t.elements.input.val(i.item.value),t.parseInput()},open:function(){var i,n=e(this).data("ui-autocomplete").menu;n.element.width(t.elements.ul.outerWidth()-6),t.options.activateFinalResult&&(i=n.element.find("li"),1===i.size()&&n[n.activate?"activate":"focus"](e.Event("click"),i))},focus:function(){return!1}})}},_autoCompleteMenuPosition:function(){var e;this.options.autoCompleteSource&&(e=this.elements.input.data("ui-autocomplete"),e&&e.menu.element.position({of:this.elements.ul,my:"left top",at:"left bottom",collision:"none"}))},parseInput:function(t){var i,n=t&&t.data.widget||this,s=!1,u=[];i=n.elements.input.val(),i&&(s=n._containsDelimiter(i)),s!==!1?u=i.split(s):t&&(t.which!==e.ui.keyCode.ENTER||e(".ui-menu-item .ui-state-focus").size()||e("#ui-active-menuitem").size())?"blur"!==t.type||e("#ui-active-menuitem").size()||u.push(i):(u.push(i),t&&t.preventDefault()),e.isFunction(n.options.parseHook)&&(u=n.options.parseHook(u)),u.length&&(n._setChosen(u),n.elements.input.val(""),n._resizeInput()),n._resetPlaceholder()},_inputFocus:function(e){var t=e.data.widget||this;t.elements.input.value||t.options.autoCompleteSource.length&&t.elements.input.autocomplete("search","")},_inputKeypress:function(t){var i=t.data.widget||this;switch("keyup"===t.type&&i._trigger("keyup",t,i),t.which){case e.ui.keyCode.BACKSPACE:"keydown"===t.type&&i._inputBackspace(t);break;case e.ui.keyCode.LEFT:"keydown"===t.type&&i._inputBackspace(t);break;default:i.parseInput(t),i._resizeInput(t)}i.options.autoCompleteSource&&setTimeout(function(){i._autoCompleteMenuPosition.call(i)},200)},resizeInput:function(){this._resizeInput()},_resizeInput:function(e){var i=e&&e.data.widget||this;t.fakeSpan.text(i.elements.input.val());var n=25+t.fakeSpan.width();n=n>50?n:50,n=500>n?n:500,i.elements.input.width(n)},_resetPlaceholder:function(){var e=this.options.placeholder,t=this.elements.input,i=this.options.width||"inherit";e&&0===this.element.val().length?t.attr("placeholder",e).css("min-width",i-50):t.attr("placeholder","").css("min-width","inherit")},_inputBackspace:function(t){var i=t&&t.data.widget||this,n=i.elements.ul.find("li:not(.inputosaurus-required):last");t.stopPropagation(),(!e(t.currentTarget).val()||"selectionStart"in t.currentTarget&&0===t.currentTarget.selectionStart&&0===t.currentTarget.selectionEnd)&&n.size()&&(t.preventDefault(),n.find("a").focus())},_editTag:function(t){var i=t&&t.data.widget||this,n="",s=e(t.currentTarget).closest("li"),u=s.data("inputosaurus");if(!u)return!0;t.preventDefault();var a=null,o=!1;e.each(i._chosenValues,function(e,t){t.key===u?(n=t.value,o=!0):o&&!a&&(a=t)}),a&&(i.elements.lastEdit=a.value),s.after(i.elements.inputCont),i.elements.input.val(n),window.setTimeout(function(){i.elements.input.select()},100),i._removeTag(t),i._resizeInput(t)},_tagKeypress:function(t){var i=t.data.widget;switch(t.which){case e.ui.keyCode.DELETE:case e.ui.keyCode.BACKSPACE:t&&t.preventDefault(),t&&t.stopPropagation(),e(t.currentTarget).trigger("click");break;case 69:case e.ui.keyCode.ENTER:i._editTag(t);break;case e.ui.keyCode.LEFT:"keydown"===t.type&&i._prevTag(t);break;case e.ui.keyCode.RIGHT:"keydown"===t.type&&i._nextTag(t);break;case e.ui.keyCode.DOWN:"keydown"===t.type&&i._focus(t)}},_prevTag:function(t){var i=t&&t.data.widget||this,n=e(t.currentTarget).closest("li"),s=n.prev();s.is("li")?s.find("a").focus():i._focus()},_nextTag:function(t){var i=t&&t.data.widget||this,n=e(t.currentTarget).closest("li"),s=n.next();s.is("li:not(.inputosaurus-input)")?s.find("a").focus():i._focus()},_containsDelimiter:function(t){var i=!1;return e.each(this.options.inputDelimiters,function(e,n){-1!==t.indexOf(n)&&(i=n)}),i},_setChosen:function(t){var i=this;return e.isArray(t)?(e.each(t,function(t,n){var s="",u=!1,a=-1,o={key:"",obj:null,value:""};s=e.trim(n[0]),e.each(i._chosenValues,function(e,t){t.value===i.elements.lastEdit&&(a=e),t.value===s&&(u=!0)}),""===s||u&&!i.options.allowDuplicates||(o.key="mi_"+Math.random().toString(16).slice(2,10),o.value=s,o.obj=n[1],a>-1?i._chosenValues.splice(a,0,o):i._chosenValues.push(o),i.elements.lastEdit="",i._renderTags())}),1===t.length&&""===t[0]&&""!==i.elements.lastEdit&&(i.elements.lastEdit="",i._renderTags()),void i._setValue(i._buildValue())):!1},_buildValue:function(){var t=this,i="";return e.each(this._chosenValues,function(e,n){i+=i.length?t.options.outputDelimiter+n.value:n.value}),i},_setValue:function(e){var t=this.element.val();t!==e&&(this.element.val(e),this._trigger("change"))},_createTag:function(t,i,n){if(void 0!==t&&n){var s=this,u=e('
  • ✖'+n.toLine(!0,!1,!0)+"
    • ");return u.data("inputosaurus-value",n.toLine(!1,!1,!1)),this.options.allowDragAndDrop&&u.draggable({revert:"invalid",revertDuration:200,start:function(e,t){t.helper.__widget=s}}),u}},_renderTags:function(){var t=this;this.elements.ul.find("li:not(.inputosaurus-required)").remove(),e.each(this._chosenValues,function(e,i){var n=t._createTag(i.value,i.key,i.obj);t.elements.ul.find("li.inputosaurus-input").before(n)})},_removeTag:function(t){var i=e(t.currentTarget).closest("li").data("inputosaurus"),n=!1,s=t&&t.data.widget||this;e.each(s._chosenValues,function(e,t){i===t.key&&(n=e)}),n!==!1&&s._chosenValues.splice(n,1),s._setValue(s._buildValue()),e(t.currentTarget).closest("li").remove(),window.setTimeout(function(){s.elements.input.focus()},100)},_removeDraggedTag:function(t){var i=t.data("inputosaurus"),n=this,s=!1;e.each(n._chosenValues,function(e,t){i===t.key&&(s=e)}),!1!==s&&(n._chosenValues.splice(s,1),n._setValue(n._buildValue())),t.remove()},focus:function(){this.elements.input.focus()},_focus:function(t){var i=t&&t.data.widget||this,n=t&&t.target?e(t.target).closest("li"):null;n&&n.is("li")&&n.find("a").focus(),t&&e(t.target).closest("li").data("inputosaurus")||i.elements.input.focus()},_tagFocus:function(t){e(t.currentTarget).parent()["focusout"===t.type?"removeClass":"addClass"]("inputosaurus-selected")},refresh:function(){var t=this.options.outputDelimiter,i=this.element.val(),n=[];n.push(i),t&&(n=i.split(t)),n.length&&(this._chosenValues=[],e.isFunction(this.options.parseHook)&&(n=this.options.parseHook(n)),this._setChosen(n),this._renderTags(),this.elements.input.val(""),this._resizeInput())},_attachEvents:function(){var e=this;this.elements.input.on("keyup.inputosaurus",{widget:e},this._inputKeypress),this.elements.input.on("keydown.inputosaurus",{widget:e},this._inputKeypress),this.elements.input.on("change.inputosaurus",{widget:e},this._inputKeypress),this.elements.input.on("focus.inputosaurus",{widget:e},this._inputFocus),this.options.parseOnBlur&&this.elements.input.on("blur.inputosaurus",{widget:e},this.parseInput),this.elements.ul.on("click.inputosaurus",{widget:e},this._focus),this.elements.ul.on("click.inputosaurus","a",{widget:e},this._removeTag),this.elements.ul.on("dblclick.inputosaurus","li",{widget:e},this._editTag),this.elements.ul.on("doubletap.inputosaurus","li",{widget:e},this._editTag),this.elements.ul.on("focus.inputosaurus","a",{widget:e},this._tagFocus),this.elements.ul.on("blur.inputosaurus","a",{widget:e},this._tagFocus),this.elements.ul.on("keydown.inputosaurus","a",{widget:e},this._tagKeypress)},_destroy:function(){this.elements.input.unbind(".inputosaurus"),this.elements.ul.replaceWith(this.element)}};e("body").append(t.fakeSpan),e.widget("ui.inputosaurus",t)}(jQuery); \ No newline at end of file +!function(e){var t={version:"0.1.6",fakeSpan:e(''),eventprefix:"inputosaurus",options:{inputDelimiters:[",",";"],outputDelimiter:",",allowDuplicates:!1,allowDragAndDrop:!0,focusCallback:null,parseOnBlur:!1,wrapperElement:null,width:null,autoCompleteSource:"",activateFinalResult:!1,parseHook:null,placeholder:null},_create:function(){var t=this,i={},n=t.options,s=n.placeholder||this.element.attr("placeholder")||null;this._chosenValues=[],i.ul=e('
      '),this.options.allowDragAndDrop&&i.ul.droppable({drop:function(e,n){n.draggable.addClass("inputosaurus-dropped"),i.input.val(n.draggable.data("inputosaurus-value")),n.draggable.__widget&&n.draggable.__widget._removeDraggedTag(n.draggable),t.parseInput()}}),i.input=e(''),i.inputCont=e('
    • '),i.origInputCont=e('
    • '),i.lastEdit="",i.input.on("focus",function(){t._focusTrigger(!0)}).on("blur",function(){t._focusTrigger(!1)}),s&&(n.placeholder=s,i.input.attr("placeholder",n.placeholder),n.width&&i.input.css("min-width",n.width-50)),n.wrapperElement&&n.wrapperElement.append(i.ul),this.element.replaceWith(n.wrapperElement||i.ul),i.origInputCont.append(this.element).hide(),i.inputCont.append(i.input),i.ul.append(i.inputCont),i.ul.append(i.origInputCont),n.width&&i.ul.css("width",n.width),this.elements=i,t._attachEvents(),e.trim(this.element.val())&&(i.input.val(this.element.val()),this.parseInput()),this._instAutocomplete()},_focusTriggerTimer:0,_focusTrigger:function(e){var t=this;window.clearTimeout(this._focusTriggerTimer),this._focusTriggerTimer=window.setTimeout(function(){t.elements.ul[e?"addClass":"removeClass"]("inputosaurus-focused"),t.options.focusCallback&&t.options.focusCallback(e)},10)},_instAutocomplete:function(){if(this.options.autoCompleteSource){var t=this;this.elements.input.autocomplete({position:{of:this.elements.ul},source:this.options.autoCompleteSource,minLength:1,autoFocus:!0,select:function(e,i){e.preventDefault(),t.elements.input.val(i.item.value),t.parseInput()},open:function(){var i,n=e(this).data("ui-autocomplete").menu;n.element.width(t.elements.ul.outerWidth()-6),t.options.activateFinalResult&&(i=n.element.find("li"),1===i.size()&&n[n.activate?"activate":"focus"](e.Event("click"),i))},focus:function(){return!1}})}},_autoCompleteMenuPosition:function(){var e;this.options.autoCompleteSource&&(e=this.elements.input.data("ui-autocomplete"),e&&e.menu.element.position({of:this.elements.ul,my:"left top",at:"left bottom",collision:"none"}))},parseInput:function(t){var i,n=t&&t.data.widget||this,s=!1,u=[];i=n.elements.input.val(),i&&(s=n._containsDelimiter(i)),s!==!1?u=i.split(s):t&&(t.which!==e.ui.keyCode.ENTER||e(".ui-menu-item .ui-state-focus").size()||e("#ui-active-menuitem").size())?"blur"!==t.type||e("#ui-active-menuitem").size()||u.push(i):(u.push(i),t&&t.preventDefault()),e.isFunction(n.options.parseHook)&&(u=n.options.parseHook(u)),u.length&&(n._setChosen(u),n.elements.input.val(""),n._resizeInput()),n._resetPlaceholder()},_inputFocus:function(e){var t=e.data.widget||this;t.elements.input.value||t.options.autoCompleteSource.length&&t.elements.input.autocomplete("search","")},_inputKeypress:function(t){var i=t.data.widget||this;switch("keyup"===t.type&&i._trigger("keyup",t,i),t.which){case e.ui.keyCode.BACKSPACE:"keydown"===t.type&&i._inputBackspace(t);break;case e.ui.keyCode.LEFT:"keydown"===t.type&&i._inputBackspace(t);break;default:i.parseInput(t),i._resizeInput(t)}i.options.autoCompleteSource&&setTimeout(function(){i._autoCompleteMenuPosition.call(i)},200)},resizeInput:function(){this._resizeInput()},_resizeInput:function(e){var i=e&&e.data.widget||this;t.fakeSpan.text(i.elements.input.val());var n=25+t.fakeSpan.width();n=n>50?n:50,n=500>n?n:500,i.elements.input.width(n)},_resetPlaceholder:function(){var e=this.options.placeholder,t=this.elements.input,i=this.options.width||"inherit";e&&0===this.element.val().length?t.attr("placeholder",e).css("min-width",i-50):t.attr("placeholder","").css("min-width","inherit")},_inputBackspace:function(t){var i=t&&t.data.widget||this,n=i.elements.ul.find("li:not(.inputosaurus-required):last");t.stopPropagation(),(!e(t.currentTarget).val()||"selectionStart"in t.currentTarget&&0===t.currentTarget.selectionStart&&0===t.currentTarget.selectionEnd)&&n.size()&&(t.preventDefault(),n.find("a").focus())},_editTag:function(t){var i=t&&t.data.widget||this,n="",s=e(t.currentTarget).closest("li"),u=s.data("inputosaurus");if(!u)return!0;t.preventDefault();var a=null,o=!1;e.each(i._chosenValues,function(e,t){t.key===u?(n=t.value,o=!0):o&&!a&&(a=t)}),a&&(i.elements.lastEdit=a.value),s.after(i.elements.inputCont),i.elements.input.val(n),window.setTimeout(function(){i.elements.input.select()},100),i._removeTag(t),i._resizeInput(t)},_tagKeypress:function(t){var i=t.data.widget;switch(t.which){case e.ui.keyCode.DELETE:case e.ui.keyCode.BACKSPACE:t&&t.preventDefault(),t&&t.stopPropagation(),e(t.currentTarget).trigger("click");break;case 69:case e.ui.keyCode.ENTER:i._editTag(t);break;case e.ui.keyCode.LEFT:"keydown"===t.type&&i._prevTag(t);break;case e.ui.keyCode.RIGHT:"keydown"===t.type&&i._nextTag(t);break;case e.ui.keyCode.DOWN:"keydown"===t.type&&i._focus(t)}},_prevTag:function(t){var i=t&&t.data.widget||this,n=e(t.currentTarget).closest("li"),s=n.prev();s.is("li")?s.find("a").focus():i._focus()},_nextTag:function(t){var i=t&&t.data.widget||this,n=e(t.currentTarget).closest("li"),s=n.next();s.is("li:not(.inputosaurus-input)")?s.find("a").focus():i._focus()},_containsDelimiter:function(t){var i=!1;return e.each(this.options.inputDelimiters,function(e,n){-1!==t.indexOf(n)&&(i=n)}),i},_setChosen:function(t){var i=this;return e.isArray(t)?(e.each(t,function(t,n){var s="",u=!1,a=-1,o={key:"",obj:null,value:""};s=e.trim(n[0]),e.each(i._chosenValues,function(e,t){t.value===i.elements.lastEdit&&(a=e),t.value===s&&(u=!0)}),""===s||u&&!i.options.allowDuplicates||(o.key="mi_"+Math.random().toString(16).slice(2,10),o.value=s,o.obj=n[1],a>-1?i._chosenValues.splice(a,0,o):i._chosenValues.push(o),i.elements.lastEdit="",i._renderTags())}),1===t.length&&""===t[0]&&""!==i.elements.lastEdit&&(i.elements.lastEdit="",i._renderTags()),void i._setValue(i._buildValue())):!1},_buildValue:function(){var t=this,i="";return e.each(this._chosenValues,function(e,n){i+=i.length?t.options.outputDelimiter+n.value:n.value}),i},_setValue:function(e){var t=this.element.val();t!==e&&(this.element.val(e),this._trigger("change"))},_createTag:function(t,i,n){if(void 0!==t&&n){var s=this,u=e('
    • ✖'+n.toLine(!0,!1,!0)+"
      • ");return u.data("inputosaurus-value",n.toLine(!1,!1,!1)),this.options.allowDragAndDrop&&u.draggable({revert:"invalid",revertDuration:200,start:function(e,t){t.helper.__widget=s}}),u}},_renderTags:function(){var t=this;this.elements.ul.find("li:not(.inputosaurus-required)").remove(),e.each(this._chosenValues,function(e,i){var n=t._createTag(i.value,i.key,i.obj);t.elements.ul.find("li.inputosaurus-input").before(n)})},_removeTag:function(t){var i=e(t.currentTarget).closest("li").data("inputosaurus"),n=!1,s=t&&t.data.widget||this;e.each(s._chosenValues,function(e,t){i===t.key&&(n=e)}),n!==!1&&s._chosenValues.splice(n,1),s._setValue(s._buildValue()),e(t.currentTarget).closest("li").remove(),window.setTimeout(function(){s.elements.input.focus()},100)},_removeDraggedTag:function(t){var i=t.data("inputosaurus"),n=this,s=!1;e.each(n._chosenValues,function(e,t){i===t.key&&(s=e)}),!1!==s&&(n._chosenValues.splice(s,1),n._setValue(n._buildValue())),t.remove()},focus:function(){this.elements.input.focus()},blur:function(){this.elements.input.blur()},_focus:function(t){var i=t&&t.data.widget||this,n=t&&t.target?e(t.target).closest("li"):null;n&&n.is("li")&&n.find("a").focus(),t&&e(t.target).closest("li").data("inputosaurus")||i.elements.input.focus()},_tagFocus:function(t){e(t.currentTarget).parent()["focusout"===t.type?"removeClass":"addClass"]("inputosaurus-selected")},refresh:function(){var t=this.options.outputDelimiter,i=this.element.val(),n=[];n.push(i),t&&(n=i.split(t)),n.length&&(this._chosenValues=[],e.isFunction(this.options.parseHook)&&(n=this.options.parseHook(n)),this._setChosen(n),this._renderTags(),this.elements.input.val(""),this._resizeInput())},_attachEvents:function(){var e=this;this.elements.input.on("keyup.inputosaurus",{widget:e},this._inputKeypress),this.elements.input.on("keydown.inputosaurus",{widget:e},this._inputKeypress),this.elements.input.on("change.inputosaurus",{widget:e},this._inputKeypress),this.elements.input.on("focus.inputosaurus",{widget:e},this._inputFocus),this.options.parseOnBlur&&this.elements.input.on("blur.inputosaurus",{widget:e},this.parseInput),this.elements.ul.on("click.inputosaurus",{widget:e},this._focus),this.elements.ul.on("click.inputosaurus","a",{widget:e},this._removeTag),this.elements.ul.on("dblclick.inputosaurus","li",{widget:e},this._editTag),this.elements.ul.on("doubletap.inputosaurus","li",{widget:e},this._editTag),this.elements.ul.on("focus.inputosaurus","a",{widget:e},this._tagFocus),this.elements.ul.on("blur.inputosaurus","a",{widget:e},this._tagFocus),this.elements.ul.on("keydown.inputosaurus","a",{widget:e},this._tagKeypress)},_destroy:function(){this.elements.input.unbind(".inputosaurus"),this.elements.ul.replaceWith(this.element)}};e("body").append(t.fakeSpan),e.widget("ui.inputosaurus",t)}(jQuery);