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

fix for json and some other bugs

This commit is contained in:
Harry Bomrah 2012-11-22 16:31:37 +08:00 committed by chris
parent e29583ed1f
commit 868d1c2201
3 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/desktop/journal_pages.js.erb
View File

@ -1,5 +1,6 @@
orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // this init journal papers orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // this init journal papers
this.initializeJournalPapers.formCallback = function(data){ this.initializeJournalPapers.formCallback = function(data){
if(data.success){
o.notify(data.msg,"success"); o.notify(data.msg,"success");
o.sub_menu_item($("div[content-type=menu] a").eq(0)); o.sub_menu_item($("div[content-type=menu] a").eq(0));
}else{ }else{

57
app/assets/javascripts/orbitdesktop.js
View File

@ -2,8 +2,10 @@
//harry //harry
//Inititialize function will initialize desktop //Inititialize function will initialize desktop
//callback-method will be called after desktop controlled ajax call; //callback-method will be called after desktop controlled ajax call
//container=true is the area where the view will be loaded //container=true is the area where the view will be loaded
//load = true is used to load the list element by default
//response-type = "json"|"script"|"xml|html" default is json
$.extend($.expr[':'], { $.extend($.expr[':'], {
@ -88,30 +90,30 @@ var orbitDesktop = function(dom){
o.data_method = $(this).attr("callback-method"); o.data_method = $(this).attr("callback-method");
if(o.currenthtml!=target){ if(o.currenthtml!=target){
if(o.desktopData[o.currentface] == "undefined") if(o.desktopData[o.currentface] == "undefined")
o.desktopData[o.currentface] = ""; o.desktopData[o.currentface] = "";
o.desktopData[o.currentface] = $(o.contentHolder).html(); o.desktopData[o.currentface] = $(o.contentHolder).html();
$("#content").hide("drop",o.transitionTime,function(){ $("#content").hide("drop",o.transitionTime,function(){
o.currenthtml = target; o.currenthtml = target;
o.currentface = target; o.currentface = target;
var cache = false; var cache = false;
if(!o.desktopData[o.currentface]){ if(!o.desktopData[o.currentface]){
$(o.contentHolder).empty().load(url,function(){ $(o.contentHolder).empty().load(url,function(){
if(typeof o.data_method != "undefined"){ if(typeof o.data_method != "undefined"){
if(o.data_method != "") if(o.data_method != "")
window.o[o.data_method](target,url,cache); window.o[o.data_method](target,url,cache);
}
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"));
})
}else{
$(o.contentHolder).html(o.desktopData[o.currentface]);
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"));
cache = true;
if(typeof o.data_method != "undefined"){
if(o.data_method != "")
window.o[o.data_method](target,url,cache);
}
} }
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"));
}); });
}else{
$(o.contentHolder).html(o.desktopData[o.currentface]);
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]").trigger("click"));
cache = true;
if(typeof o.data_method != "undefined"){
if(o.data_method != "")
window.o[o.data_method](target,url,cache);
}
}
});
} }
return false; return false;
}) })
@ -135,13 +137,22 @@ var orbitDesktop = function(dom){
$("body").on("submit","form[form-type=ajax_form]",function(){ $("body").on("submit","form[form-type=ajax_form]",function(){
var callback_method = $(this).attr("callback-method"); var callback_method = $(this).attr("callback-method");
var dt = null;
dt = $(this).attr("response-type");
if(dt == null){
dt = "json";
}
var options = { var options = {
dataType : dt,
success:function(responseText, statusText, xhr, $form){ success:function(responseText, statusText, xhr, $form){
if(typeof callback_method != "undefined"){ if(typeof callback_method != "undefined"){
if(callback_method != ""){ if(callback_method != ""){
window.o[o.data_method][callback_method](responseText,statusText,xhr,$form); window.o[o.data_method][callback_method](responseText,statusText,xhr,$form);
} }
} }
},
error:function(){
o.notify("Please try again later!","imp");
} }
} }
$(this).ajaxSubmit(options); $(this).ajaxSubmit(options);

2
config/mongoid.yml
View File

@ -2,7 +2,7 @@ defaults: &defaults
host: localhost host: localhost
# slaves: # slaves:
# - host: slave1.local # - host: slave1.local
port: 37017 port: 27017
# - host: slave2.local # - host: slave2.local
# port: 27019 # port: 27019