Update ckeditor

Move e2e tests
Code refactoring
This commit is contained in:
RainLoop Team 2016-09-12 23:50:21 +03:00
parent 9993432c7b
commit e5af98b04b
122 changed files with 617 additions and 561 deletions

View file

@ -3,11 +3,13 @@ import ko from 'ko';
import _ from '_';
import $ from '$';
import {showScreenPopup} from 'Knoin/Knoin';
import {i18n} from 'Common/Translator';
import {log, isArray, isNonEmptyArray, pString, isUnd, trim} from 'Common/Utils';
import AccountStore from 'Stores/User/Account';
import {showScreenPopup} from 'Knoin/Knoin';
class PgpUserStore
{
constructor() {
@ -139,7 +141,7 @@ class PgpUserStore
* @returns {?}
*/
findSelfPrivateKey(password) {
return this.findPrivateKeyByEmail(require('Stores/User/Account').email(), password);
return this.findPrivateKeyByEmail(AccountStore.email(), password);
}
decryptMessage(message, recipients, fCallback) {
@ -400,4 +402,4 @@ class PgpUserStore
}
}
module.exports = new PgpUserStore();
export default new PgpUserStore();