Skip to content

Commit e134b88

Browse files
author
Mangled Deutz
committed
Merge pull request #1 from Education-Numerique/master
Backport stuff
2 parents 1c9ec8c + c824512 commit e134b88

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,20 @@ config-jenkins-linux:
7575
self:
7676
url: '//static.sn.ackitup.net/lib/webitup'
7777

78+
7879
# Roxee box
79-
config-roxee-Linux:
80+
config-www-data-linux:
8081
paths:
81-
deploy: '/home/roxee/www/static/lib/webitup'
82-
# DOC_ROOT: '/home/roxee/doc/spitfire'
82+
deploy: '/home/lxxl-deploy/lxxl'
8383
links:
8484
airstrip:
8585
version: '1.0'
86-
url: 'https://static.roxee.net/airstrip.json'
86+
url: 'https://www.education-et-numerique.fr/airstrip.json'
8787
spitfire:
8888
version: '1.0'
89-
url: 'https://static.roxee.net/lib/webitup/spitfire.json'
89+
url: 'https://www.education-et-numerique.fr/spitfire.json'
9090
self:
91-
url: '//static.roxee.net/lib/webitup'
91+
url: '//www.education-et-numerique.fr'
9292

9393
config-dmp-darwin:
9494
root: "${HOME}/buildd/stage.webitup.org"

src/onegateisopening/gate.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,27 @@
5151
ia[i] = byteString.charCodeAt(i);
5252
}
5353

54-
// write the ArrayBuffer to a blob, and you're done
5554
var bb;
5655
try {
5756
bb = new BlobBuilder();
5857
} catch (e) {
5958
try {
6059
bb = new WebKitBlobBuilder();
6160
} catch (e2) {
62-
bb = new MozBlobBuilder();
61+
try{
62+
bb = new MozBlobBuilder();
63+
}catch(e){
64+
65+
}
6366
}
6467
}
6568

66-
bb.append(ab);
67-
return bb.getBlob(mimeString);
69+
if(bb){
70+
bb.append(ab);
71+
return bb.getBlob(mimeString);
72+
}else{
73+
return new Blob([ab], { "type" : mimeString } );
74+
}
6875
};
6976

7077
// The "caller" url
@@ -91,8 +98,9 @@
9198
data = dataURItoBlob(data);
9299
xhr.send(data);
93100
}catch (e) {
94-
console.warn('Something very bad happened deep-down inside!', e);
95101
bouncer.apply(xhr);
102+
console.warn('Something very bad happened deep-down inside!', e);
103+
throw e;
96104
}
97105
};
98106

0 commit comments

Comments
 (0)