developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'various_bugs' into nccu_master

Browse Source 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
This commit is contained in:
chris committed 2012-10-29 16:10:07 +08:00
2 parents 38e6d6c2c8 9b5f4e4775
commit 65ac6980c4
2087 files changed
+80434 -3692
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/javascripts/ajax_form.js.erb
+6 -120
View File
@@ -1,121 +1,7 @@
<%#= encoding: utf-8 %>
// $(document).on('click', '#ajax_form_submit', function(){
// $('#ajaxForm').ajaxSubmit({
// beforeSubmit: function(a,f,o) {
// o.dataType = 'script';
// if (o.dataType == 'script') {
// o.url = o.url.split('?'); // split on GET params
// if (o.url[0].substr(-3) != '.js') o.url[0] += '.js'; // force rails to respond to respond to the request with :format = js
// o.url = o.url.join('?'); // join on GET params
// }
// },
// success: function(response,status,xhr){
// alert(response);
// alert(status);
// alert(xhr);
// },
// error:function(){
// alert("error");
// }
// });
// var o = {
// // dataType: 'script',
// dataType: 'html',
// url:$("#ajaxForm").attr("action"),
// beforeSubmit: function(){
// var sub = true;
// $("span.error").remove();
// $("#dyn_error").empty();
// $("#ajaxForm input").each(function(){
// if($(this).val() == ""){
// $("<span class='error'> *</span>").insertAfter($(this));
// sub = false;
// }
// })
// if(!sub){
// $("#dyn_error").text("Cannot be empty.");
// $("#dyn_error").text("<%= I18n.t('cant_empty_star') %>");
// return false;
// }
// },
// success: function(response,status,xhr){
// if(typeof tinyMCEPopup != "undefined"){
// var x = response.split("#");
// var returnurl = x[0],
// returntitle = x[1],
// returndescription = x[2];
// var win = tinyMCEPopup.getWindowArg("window");
// win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = returnurl;
// win.document.getElementById(tinyMCEPopup.getWindowArg("alt")).value = returndescription;
// win.document.getElementById(tinyMCEPopup.getWindowArg("title")).value = returntitle;
// if (typeof(win.ImageDialog) != "undefined") {
// // we are, so update image dimensions...
// if (win.ImageDialog.getImageData)
// win.ImageDialog.getImageData();
// // ... and preview if necessary
// if (win.ImageDialog.showPreviewImage)
// win.ImageDialog.showPreviewImage(returnurl);
// }
// tinyMCEPopup.close();
// }else{
// //incase if we want to do something for quick edit file upload
// // var modalvalues = "";
// // var r = "";
// // if(rcom.getInternetExplorerVersion() > -1){
// // r = "<tr><td>" + response + "</td></tr>";
// // r = r.replace("**","</td><td>");
// // r = r.replace("**","</td><td>");
// // r = $(r);
// // modalvalues = r.find("span").attr("data-content").split("#");
// // r.attr("id",r.find("span").attr("for"));
// // var table=document.getElementById(modalvalues[0]);
// // //var tbody = table.getElementsByTagName("tbody");
// // var row = table.insertRow(table.rows.length-1);
// // var c1 = row.insertCell(0),
// // c2 = row.insertCell(1),
// // c3 = row.insertCell(2);
// // c1.innerHTML = r.find("td").eq(0).html();
// // c2.innerHTML = r.find("td").eq(1).html();
// // c3.innerHTML = r.find("td").eq(2).html();
// // var trow = $("#bulletin_files tfoot").find("tr").eq(0);
// // $("#bulletin_files tbody").append(trow);
// // }else{
// // response = response.replace("**","");
// // response = response.replace("**","");
// // r = $(response);
// // modalvalues = r.find("span").attr("data-content").split("#");
// // $('#' + modalvalues[0]+ ' tbody').append(r);
// // }
// // console.log(modalvalues[1]);
// // $("#"+modalvalues[1]).modal('hide');
// //$('#bulletin_files tbody').append(r);
// //$(response).fadeIn();
// }
// },
// error:function(){
// alert("error");
// }
// }
// if (o.dataType == 'script') {
// o.url = o.url.split('?'); // split on GET params
// if (o.url[0].substr(-3) != '.js') o.url[0] += '.js'; // force rails to respond to respond to the request with :format = js
// o.url = o.url.join('?'); // join on GET params
// }
// $('#ajaxForm').ajaxSubmit(o);
// });
$('#ajaxForm').ajaxForm({
beforeSubmit: function(a,f,o) {
o.dataType = 'script';
},
success: function(data) {
}
});
beforeSubmit: function(a,f,o) {
o.dataType = 'script';
},
success: function(data) {
}
});