NoLog.cz/decide.nolog.cz
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Import sjcl by newly added Anonymous AMD Support

Browse source 
Fixes: `invalid aes key size` error in sjcl 1.0.5 and 1.0.6.

https://github.com/ember-cli/ember-cli/pull/5976
This commit is contained in:
jelhan 2016-09-20 01:44:29 +02:00
parent fd0d7ffd39
commit ae0ad7bd42
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/services/encryption.js
View file

@ -1,6 +1,6 @@
import Ember from 'ember'; import Ember from 'ember';
import generatePassphrase from '../utils/generate-passphrase'; import generatePassphrase from '../utils/generate-passphrase';
/* global sjcl */ import sjcl from 'sjcl';
export default Ember.Service.extend({ export default Ember.Service.extend({
key: null, key: null,

2
bower.json
View file

@ -3,7 +3,7 @@
"dependencies": { "dependencies": {
"ember": "~2.8.0", "ember": "~2.8.0",
"ember-cli-shims": "0.1.3", "ember-cli-shims": "0.1.3",
"sjcl": "~1.0.0", "sjcl": "~1.0.6",
"bootstrap": "~3.3.5", "bootstrap": "~3.3.5",
"bootstrap-datepicker": "~1.4.0", "bootstrap-datepicker": "~1.4.0",
"floatThead": "^1.4.3", "floatThead": "^1.4.3",

6
ember-cli-build.js
View file

@ -43,7 +43,11 @@ module.exports = function() {
production: 'bower_components/floatThead/dist/jquery.floatThead.min.js' production: 'bower_components/floatThead/dist/jquery.floatThead.min.js'
}); });
app.import('bower_components/sjcl/sjcl.js'); app.import('bower_components/sjcl/sjcl.js', {
using: [
{ transformation: 'amd', as: 'sjcl' }
]
});
app.import('bower_components/jstimezonedetect/jstz.js'); app.import('bower_components/jstimezonedetect/jstz.js');

2
tests/helpers/server-get-polls.js
View file

@ -1,5 +1,5 @@
import Ember from 'ember'; import Ember from 'ember';
/* global sjcl */ import sjcl from 'sjcl';
export default function(attr, key) { export default function(attr, key) {
const defaultAttr = { const defaultAttr = {