From ff6eb5d67466adc01dfbe13eb44d819a51d1d7c8 Mon Sep 17 00:00:00 2001 From: Manson Wang Date: Wed, 6 Nov 2013 16:31:27 +0800 Subject: [PATCH] Fix annoucement preview image bug --- app/assets/javascripts/lib/modal-preview.js | 141 +++++++----------- .../shared/preview/_modal_preview.html.erb | 16 ++ 2 files changed, 73 insertions(+), 84 deletions(-) diff --git a/app/assets/javascripts/lib/modal-preview.js b/app/assets/javascripts/lib/modal-preview.js index df59cd87..d3dd0c32 100644 --- a/app/assets/javascripts/lib/modal-preview.js +++ b/app/assets/javascripts/lib/modal-preview.js @@ -1,93 +1,66 @@ -//Preview need a link in form as Ex and a corresponding PUT action in controller -//Ex preview trigger: -// <%= link_to "NewPreview", realtime_preview_admin_ad_banner_path(ad_banner_tab) , :class=>'preview_trigger'%> - $(function() { - // $(".post_preview").click(function(e){ - // $("#main-wrap").after(""); - // e.preventDefault(); - // var form = $(this).parents("form").first() - // //var cont = form["content"].value; - // // $.ajax({ - // // type: 'POST', - // // url: $(this).attr("href")+'?preview=true', - // // data: form.serialize(), - // // dataType: "script", - // // success: function (msg) { - // // $("#"+start_modal_with_id).modal('show'); }, - // // error: function(){ - // // alert("ERROR"); - // // } - // // }); - // url = "/panel/news/back_end/news_bulletins/preview?preview=true" - // // alert(url) - // form.attr("action",url); - // form.submit(); - // //return false; - // }); -// /panel/announcement/back_end/bulletins/preview - $('#main-wrap').on(clickEvent, '.post_preview, .preview_trigger', function(e) { + $(".post_preview").click(function(){ $("#main-wrap").after(""); - if($(this).hasClass('post_preview')) { - var attrs = e.target.attributes; - var url = attrs['url']; - $("form.previewable").ajaxSubmit({ - beforeSubmit: function(a,f,o){ - o.dataType = 'script'; - o.url = url.nodeValue; - o.type = 'post'; - },success: function(msg) { - $('#show_preview .modal').modal() - $('#show_preview .modal').height(function() { - return $(window).height() * 0.7; - }); - } + $.post($(this).attr('url'), $(".previewable").serialize() ,function(data){ + $('#show_preview .modal').modal(); + $('#show_preview .modal').height(function() { + return $(window).height() * 0.7; }); - } else if($(this).hasClass('preview_trigger')) { - $.ajax({ - type: 'PUT', - url: $(this).attr("href"), - data: $(this).parents("form").serialize(), - success: function (msg) { - $('#show_preview .modal').modal(); - $('#show_preview .modal').height(function() { - return $(window).height() * 0.7; - }); - }, - error: function(){ - alert("ERROR"); - } - }); - return false; - } + },'script'); }); - // $("a.preview_trigger").on('click',function(){ + $(".preview_trigger").click(function(){ + $("#main-wrap").after(""); + $.ajax({ + type: 'PUT', + url: $(this).attr("href"), + data: $(this).parents("form").serialize(), + success: function (msg) { + $('#show_preview .modal').modal(); + $('#show_preview .modal').height(function() { + return $(window).height() * 0.7; + }); + }, + error: function(){ + alert("ERROR"); + } + }); + return false; + }); + // $('#main-wrap').on(clickEvent, '.post_preview, .preview_trigger', function(e) { // $("#main-wrap").after(""); - // $.ajax({ - // type: 'PUT', - // url:$(this).attr("href"), - // data:$(this).parents("form").serialize(), - // success: function (msg) { - // $("#"+start_modal_with_id).modal('show'); }, - // error: function(){ - // alert("ERROR"); + // if($(this).hasClass('post_preview')) { + // var attrs = e.target.attributes; + // var url = attrs['url']; + // $("form.previewable").ajaxSubmit({ + // beforeSubmit: function(a,f,o){ + // o.dataType = 'script'; + // o.url = url.nodeValue; + // o.type = 'post'; + // },success: function(msg) { + // $('#show_preview .modal').modal() + // $('#show_preview .modal').height(function() { + // return $(window).height() * 0.7; + // }); + // } + + // }); + // } else if($(this).hasClass('preview_trigger')) { + // $.ajax({ + // type: 'PUT', + // url: $(this).attr("href"), + // data: $(this).parents("form").serialize(), + // success: function (msg) { + // $('#show_preview .modal').modal(); + // $('#show_preview .modal').height(function() { + // return $(window).height() * 0.7; + // }); + // }, + // error: function(){ + // alert("ERROR"); // } - // }); - // return false; + // }); + // return false; + // } // }); - // $("form.nccu_ajax_form").ajaxForm({ - // beforeSubmit: function(a,f,o) { - // // if(clicked_what.hasClass("post_preview")){ - // // $("#main-wrap").after(""); - // // o.dataType = 'script'; - // // o.url = clicked_what.attr("url"); - // // } - // }, - // success: function(data) { - // // if(!clicked_what.hasClass("post_preview")){ - // // window.location = data.redirect_url; - // // } - // } - // }) }); \ No newline at end of file diff --git a/app/views/shared/preview/_modal_preview.html.erb b/app/views/shared/preview/_modal_preview.html.erb index 98f5f149..ba53d1e6 100644 --- a/app/views/shared/preview/_modal_preview.html.erb +++ b/app/views/shared/preview/_modal_preview.html.erb @@ -13,13 +13,21 @@
\ No newline at end of file