Skip to content

Commit

Permalink
Upgrades Angular-audio, Mutagen and MidiJs (oppia#6912)
Browse files Browse the repository at this point in the history
* Upgrade Angular Audio and Mutagen

* Add Midijs

* update target dir

* Revert fsevents

* Revert More of fsevent

* Update dir

* Fix lint

* Revert Package-lock.json
  • Loading branch information
Nisheal John authored and seanlip committed Jun 21, 2019
1 parent 1ff00ca commit 780d1b1
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion appengine_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def save(self):
os.path.join(ROOT_PATH, 'third_party', 'gae-pipeline-1.9.17.0'),
os.path.join(ROOT_PATH, 'third_party', 'graphy-1.0.0'),
os.path.join(ROOT_PATH, 'third_party', 'html5lib-python-1.0.1'),
os.path.join(ROOT_PATH, 'third_party', 'mutagen-1.38'),
os.path.join(ROOT_PATH, 'third_party', 'mutagen-1.42.0'),
os.path.join(ROOT_PATH, 'third_party', 'requests-2.22.0'),
os.path.join(ROOT_PATH, 'third_party', 'simplejson-3.16.0'),
os.path.join(ROOT_PATH, 'third_party', 'six-1.12.0'),
Expand Down
2 changes: 1 addition & 1 deletion core/tests/gae_suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
os.path.join(THIRD_PARTY_DIR, 'gae-pipeline-1.9.17.0'),
os.path.join(THIRD_PARTY_DIR, 'graphy-1.0.0'),
os.path.join(THIRD_PARTY_DIR, 'html5lib-python-1.0.1'),
os.path.join(THIRD_PARTY_DIR, 'mutagen-1.38'),
os.path.join(THIRD_PARTY_DIR, 'mutagen-1.42.0'),
os.path.join(THIRD_PARTY_DIR, 'requests-2.22.0'),
os.path.join(THIRD_PARTY_DIR, 'simplejson-3.16.0'),
os.path.join(THIRD_PARTY_DIR, 'six-1.12.0'),
Expand Down
6 changes: 3 additions & 3 deletions extensions/dependencies/midijs.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<script src="/third_party/static/midi-js-2ef687/build/MIDI.js"></script>
<script src="/third_party/static/midi-js-a8a842/build/MIDI.js"></script>
<!-- This is needed for MIDI.js to work. -->
<script src="/third_party/static/midi-js-2ef687/inc/base64binary.js"></script>
<script src="/third_party/static/midi-js-a8a842/inc/shim/Base64binary.js"></script>
<script>
$(document).ready(function() {
MIDI.loadPlugin({
soundfontUrl: '/third_party/static/midi-js-2ef687/soundfont/',
soundfontUrl: '/third_party/static/midi-js-a8a842/examples/soundfont/',
instrument: 'acoustic_grand_piano',
callback: function() {}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ oppia.directive('oppiaInteractiveMusicNotesInput', [
return scope;
};

scope.SOUNDFONT_URL = '/third_party/static/midi-js-2ef687/soundfont/';
scope.SOUNDFONT_URL =
'/third_party/static/midi-js-a8a842/examples/soundfont/';
scope.sequenceToGuess = HtmlEscaperService.escapedJsonToObj(
attrs.sequenceToGuessWithValue);

Expand Down
16 changes: 8 additions & 8 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
"targetDirPrefix": "beautifulsoup4-"
},
"mutagen": {
"version": "1.38",
"version": "1.42.0",
"downloadFormat": "tar",
"url": "https://pypi.python.org/packages/57/ec/d7534cdb2766f1fee534a3aabdbdfbf05d6cf77cde617d77b526336a1a72/mutagen-1.38.tar.gz#md5=c54443dfb8d4ac088eb2a0c4fd569772",
"url": "https://files.pythonhosted.org/packages/30/4c/5ad1a6e1ccbcfaf6462db727989c302d9d721beedd9b09c11e6f0c7065b0/mutagen-1.42.0.tar.gz",
"tarRootDirPrefix": "mutagen-",
"rootDirPrefix": "mutagen-",
"targetDirPrefix": "mutagen-"
Expand Down Expand Up @@ -143,11 +143,11 @@
}
},
"angularAudio": {
"version": "f403ea9e86de141278d410bade8ef1f43e6d188c",
"version": "1.7.4",
"downloadFormat": "zip",
"url": "https://github.com/danielstern/ngAudio/archive/f403ea9e86de141278d410bade8ef1f43e6d188c.zip",
"url": "https://github.com/danielstern/ngAudio/archive/1.7.4.zip",
"rootDirPrefix": "ngAudio-",
"targetDir": "angular-audio-f403ea",
"targetDirPrefix": "angular-audio-",
"bundle": {
"js": ["app/angular.audio.js"]
}
Expand Down Expand Up @@ -419,11 +419,11 @@
}
},
"midiJs": {
"version": "2ef687b47e5f478f1506b47238f3785d9ea8bd25",
"version": "a8a84257afa70721ae462448048a87301fc1554a",
"downloadFormat": "zip",
"url": "https://github.com/mudcube/MIDI.js/archive/2ef687b47e5f478f1506b47238f3785d9ea8bd25.zip",
"url": "https://github.com/mudcube/MIDI.js/archive/a8a84257afa70721ae462448048a87301fc1554a.zip",
"rootDirPrefix": "MIDI.js-",
"targetDir": "midi-js-2ef687"
"targetDir": "midi-js-a8a842"
},
"ngJoyride": {
"version": "5b25d076405c9a787db602d2a8ff49919228f4fc",
Expand Down
2 changes: 1 addition & 1 deletion scripts/pre_commit_linter.py
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@
os.path.join('third_party', 'gae-cloud-storage-1.9.15.0'),
os.path.join('third_party', 'gae-mapreduce-1.9.17.0'),
os.path.join('third_party', 'gae-pipeline-1.9.17.0'),
os.path.join('third_party', 'mutagen-1.38'),
os.path.join('third_party', 'mutagen-1.42.0'),
os.path.join('third_party', 'soupsieve-1.9.1'),
os.path.join('third_party', 'six-1.12.0'),
os.path.join('third_party', 'webencodings-0.5.1'),
Expand Down

0 comments on commit 780d1b1

Please sign in to comment.