diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-06-17 15:40:40 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-06-17 15:40:40 -0400 |
| commit | 32932165724e9c9fa891cb58bac224c50d425340 (patch) | |
| tree | 5a5a63876d673cebda433104257b9d1c6e500f64 /public/assets/javascripts/ui | |
| parent | d277e9c8eb5454944a94bbfcb6d43c6dd41e18b9 (diff) | |
dropping stuff from media editor onto walls
Diffstat (limited to 'public/assets/javascripts/ui')
| -rw-r--r-- | public/assets/javascripts/ui/editor/MediaUpload.js | 10 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/lib/Parser.js | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js index 3ade132..30287a5 100644 --- a/public/assets/javascripts/ui/editor/MediaUpload.js +++ b/public/assets/javascripts/ui/editor/MediaUpload.js @@ -93,11 +93,11 @@ var MediaUpload = View.extend({ }, upload: function(f, width, height){ - var fd = new FormData(); - fd.append( 'image', f ) - fd.append( 'width', width ) - fd.append( 'height', height ) - fd.append( '_csrf', this.$csrf.val() ) + var fd = new FormData() + fd.append('image', f) + fd.append('width', width) + fd.append('height', height) + fd.append('_csrf', this.$csrf.val()) var request = $.ajax({ url: this.uploadAction, diff --git a/public/assets/javascripts/ui/lib/Parser.js b/public/assets/javascripts/ui/lib/Parser.js index f39239e..705ff04 100644 --- a/public/assets/javascripts/ui/lib/Parser.js +++ b/public/assets/javascripts/ui/lib/Parser.js @@ -27,6 +27,7 @@ var Parser = { $.ajax({ type: 'GET', url: 'https://www.googleapis.com/youtube/v3/videos', + dataType: "jsonp", data: { id: id, key: "AIzaSyDYPKGD0-_VRBWpUYRmX8Qg6BtWmcPU_cM", |