summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/MediaUpload.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-07-17 12:18:45 -0400
committerJules Laplace <jules@okfoc.us>2014-07-17 12:18:45 -0400
commit4ee827ad464dfa0edb664d27e5069811877deb1e (patch)
tree69c6ecb890a6af7f6c247c74f81bc36db591e970 /public/assets/javascripts/ui/editor/MediaUpload.js
parentb97f3d39ac0e387385aae2685dbe830ee53a686c (diff)
parentf20841988ccd27780d3801e4a6c32bf9afcc9368 (diff)
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor/MediaUpload.js')
-rw-r--r--public/assets/javascripts/ui/editor/MediaUpload.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index b7fea07..86bf767 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -39,7 +39,7 @@ var MediaUpload = View.extend({
var url = this.$url.val()
this.$url.val("")
- Parser.parse(url, $.proxy(function(media){
+ Parser.parse(url, function(media){
if (! media) {
alert("Not a valid image/video link")
return
@@ -53,8 +53,8 @@ var MediaUpload = View.extend({
url: this.createAction,
data: media,
})
- request.done($.proxy(this.add, this))
- }, this))
+ request.done(this.add.bind(this))
+ }.bind(this))
},
handleFileSelect: function(e) {
@@ -109,7 +109,7 @@ var MediaUpload = View.extend({
processData: false,
contentType: false,
})
- request.done($.proxy(this.add, this))
+ request.done(this.add.bind(this))
},
add: function(media){