From d04d3c2e9febe706092adab2bf93ba5ddee984f3 Mon Sep 17 00:00:00 2001 From: Felipe Lima Date: Fri, 6 Apr 2012 00:30:43 -0700 Subject: [PATCH] adding images to the page as they are uploaded --- app/assets/images/delete.png | Bin 0 -> 3350 bytes app/assets/javascripts/uploads.js.coffee.erb | 15 +++++++++++- app/assets/stylesheets/uploads.css.scss | 24 +++++++++++++++++++ app/controllers/uploads_controller.rb | 2 +- 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 app/assets/images/delete.png diff --git a/app/assets/images/delete.png b/app/assets/images/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..e22ed6f43fc38bc1468121f8ae1561e73571bbe9 GIT binary patch literal 3350 zcmd5JR( zlO9pldw?gGOyPN#E6|iniBcaxL=T87S_66Uz+sY5bxFr9b3=VK1{GQ%~7-Fd`PBDJJpQ2fcW!>1qZS-qM%(*pVjtOC7gn%JIC504SBTP)OM^B>$lEm{w z9z2!Mk!~dPRFOh6@>#?Aql(iMCHg0YGXY*vT1l~a5430OSyRrmEtUm>)C@}Oilt4HGG&IKOi3nh0{Eq9Kr5V~yGx%j$IhTl!Xb7k(=1Pm| zBA}Veno=-x9Evt3j*V}{^)8D@G*KOJ-Wbd9UN6shAEFtarY&@9!T2X|tcoV8AzezF zIg5lENIc__6`AK)Ce-5h205n17YZ|sKP)u+>5z~1aYBo~R&c=Fq*R zsK0@1hhjVptT2f2Htmuw<18}ubUtHcY=Q`4oZtYE5=0cF(mkpomBkAuMMdq@A#Or_ z;v;2BVk~$E%$t`fAZUnJj?NQjHB?1#!^Dm;%41bW}i0emb4?wH^`e4 z9&BbgMxec+X1jU?Kkn<^FfA}_owvCqR2up?;dsX|4A%bN3;)-`FImnp!pm;;8_0No zGLN7_Ve5_pHQC(4nDOjF)O?G@(mj3mc)a*fLA!?NI^AqID9P#Papi z+Cg4WTCCXe35X>WgTOD8$OqmF^(2AYxZ_~Bo)*K*i-#yDvA}0Z94pC`DVb-94jmE; zYg&}pD5xMOYBGStV~T;#%1k+?f}6$UL^WCL1JXfK&{ZTUp9iZyD;a>VU&*Ad8H9ik zRC?0Z9jHy$+~#utB}G(;Hk}9osANQh9gK1k3#67rha|HxMy(^9?=ZwThyj>1{y$>> zPMsa1<5q|z+t2WA6JKU z2ZiOCuV-%cwVyibnK;?A{KG}QW!qm{_h8fEM=NS_{OkRfd#`*}s^eA8O;;|QnxLM(O+>t-l%sV)AnwxuPb=SK4BiobT zt@)*!nmjt=#Y?WA77mTLK0kILbKvO8lloq6+o4};&R<>qUh>IzPo4+_mQ4AwcJArw z?12-XlAAVz>HCh~G7OdtuI+|f&dMD14e|DsJuBYt%w?|~suD>N9qXV}lwkfkt z`syz1y5JgpW5LfGhjyPcb`9TkdVRM_kYRc*S#VZb!5Eb0!jQ3+-<1e(o $.ajax $('#uploader iframe').data('create-resource-url'), type: 'POST', - data: data + data: data, + dataType: 'text', + success: (upload_id) -> + wrapper = $('
') + img = $('') + remove_btn = $("' class='delete' />") + remove_btn.click () -> + $(this).parent().fadeOut(() -> $(this).remove()) + img_id = $('') + img.attr('src', "#{uploaderHost}/#{data.s3_key}/#{data.file_name}") + img.attr('data-img-id', upload_id) + img_id.val(upload_id) + wrapper.append(img).append(img_id).append(remove_btn) + $('#uploader').append(wrapper) when 'add upload' diff --git a/app/assets/stylesheets/uploads.css.scss b/app/assets/stylesheets/uploads.css.scss index 2f6e37d..5fe800a 100644 --- a/app/assets/stylesheets/uploads.css.scss +++ b/app/assets/stylesheets/uploads.css.scss @@ -59,4 +59,28 @@ progress{ .remove_link{ color: red; text-decoration: none; +} + +#uploader { + .wrapper { + position: relative; + display: inline-block; + &:hover { + .delete { + display: block; + } + } + .thumb { + height: 100px; + margin-right: 5px; + } + .delete { + display:none; + position: absolute; + top: 2px; + right: 7px; + background: white; + cursor: pointer; + } + } } \ No newline at end of file diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 4fc171c..5214420 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -6,7 +6,7 @@ def index def create @upload = Upload.new(params[:upload] || params.delete_if{ |p| !Upload.attribute_names.include?(p) }) - render nothing: true if @upload.save + @upload.save ? render(json: @upload.id) : render(nothing: true) end end