Skip to content

Commit

Permalink
vendoring plupload. removing outdated gem dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
GBH committed Dec 21, 2017
1 parent 7e50891 commit 098aeb8
Show file tree
Hide file tree
Showing 8 changed files with 2,517 additions and 7 deletions.
6 changes: 3 additions & 3 deletions app/assets/javascripts/comfy/admin/cms/uploader.js.coffee
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# CMS Uploader using plupload http://www.plupload.com/. Code inspired by
# plupload queue widget https://github.com/moxiecode/plupload/tree/master/js/jquery.plupload.queue
#
#= require moxie
#= require plupload.dev
#= require comfy/vendor/moxie.min
#= require comfy/vendor/plupload.dev

(($, o) ->
window.CMS or (window.CMS = {})
Expand Down Expand Up @@ -137,4 +137,4 @@
if settings.setup
settings.setup(uploader)

) jQuery, mOxie
) jQuery, plupload
Binary file added app/assets/javascripts/comfy/vendor/Moxie.swf
Binary file not shown.
Binary file added app/assets/javascripts/comfy/vendor/Moxie.xap
Binary file not shown.
16 changes: 16 additions & 0 deletions app/assets/javascripts/comfy/vendor/moxie.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 098aeb8

Please sign in to comment.