From b65d785834c9b2709131672b229a459fcdd63fb7 Mon Sep 17 00:00:00 2001
From: Matt <matt@rulingcom.com>
Date: Mon, 1 Oct 2012 17:21:23 +0800
Subject: [PATCH] harry's fix, announcement still broken

---
 app/assets/javascripts/inc/modal-preview.js               | 8 +++++---
 .../panel/announcement/back_end/bulletins/_form.html.erb  | 2 +-
 .../panel/news/back_end/news_bulletins/_form.html.erb     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/inc/modal-preview.js b/app/assets/javascripts/inc/modal-preview.js
index c7fcedc7..bf4de054 100644
--- a/app/assets/javascripts/inc/modal-preview.js
+++ b/app/assets/javascripts/inc/modal-preview.js
@@ -25,14 +25,16 @@ $(document).ready(function() {
  //        	form.submit();
 	// 	//return false;
 	// });
-	var clicked_what = null;
 	$("button.post_preview").click(function(){
-		clicked_what = $(this);
+		var btn = document.getElementById("button_for_preview");
+		var attrs = btn.attributes;
+		var url = attrs['url'];
+		// url = url.replace("url=","");
 		$("form.nccu_ajax_form").ajaxSubmit({
 			beforeSubmit: function(a,f,o){
 				$("#main-wrap").after("<span id='show_preview'></span>");
 				o.dataType = 'script';
-				o.url = clicked_what.attr("url");
+				o.url = url.nodeValue;
 				o.type =  'post';
 			}
 		});
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 9d4d8df8..5034fa02 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -240,7 +240,7 @@
 	</div>
 
 	  <div class="form-actions">
-	  	<%= button_tag t("preview"), :name=>"commit",:class=>'btn post_preview two_btn',:type=>:button,:url=>preview_panel_announcement_back_end_bulletins_path %>
+	  	<%= button_tag t("preview"), :id=>"button_for_preview", :name=>"commit",:class=>'btn post_preview two_btn',:type=>:button,:url=>preview_panel_announcement_back_end_bulletins_path %>
 		<%= f.submit t('submit'), :class=>'btn btn-primary two_btn' %>
 		<%= link_to t('cancel'), get_go_back, :class=>"btn" %> 
 	  </div>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
index cc4d483e..45c4ec76 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
@@ -279,7 +279,7 @@
 	</div>
 		
 	  <div class="form-actions">
-	  	<%= button_tag t("preview"), :name=>"commit", :class=>'btn post_preview two_btn',:type=>:button, :url=>preview_panel_news_back_end_news_bulletins_path %>
+	  	<%= button_tag t("preview"), :id=>"button_for_preview", :name=>"commit", :class=>'btn post_preview two_btn',:type=>:button, :url=>preview_panel_news_back_end_news_bulletins_path %>
 		<%= f.submit t('submit'), :class=>'btn btn-primary two_btn' %>
 		<%= link_to t('cancel'), get_go_back, :class=>"btn" %> 
 	  </div>