hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
Romain Neutron
2012-01-16 20:19:20 +01:00
parent b37703b506 b24c6bab43
commit af860e2fa6
26 changed files with 661 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
www/prod/jquery.edit.js
View File

@@ -1796,14 +1796,15 @@ function preset_delete(preset_id, li)
"act":"DELETE",
"presetid":preset_id
};
$.getJSON(
"/xmlhttp/editing_presets.j.php",
p,
function(data, textStatus)
{
li.remove();
$.ajax({
type: 'POST',
url: "/xmlhttp/editing_presets.j.php",
data: p,
dataType: 'json',
success: function(data, textStatus){
li.remove();
}
);
});
}
function preset_load(preset_id)
@@ -1812,6 +1813,7 @@ function preset_load(preset_id)
"act":"LOAD",
"presetid":preset_id
};
$.getJSON(
"/xmlhttp/editing_presets.j.php",
p,
@@ -2224,15 +2226,17 @@ function startThisEditing(sbas_id,what,regbasprid,ssel)
x += "</fields>";
p["f"] = x;
$.getJSON(
"/xmlhttp/editing_presets.j.php",
p,
function(data, textStatus)
$.ajax({
type: 'POST',
url: "/xmlhttp/editing_presets.j.php",
data: p,
dataType: 'json',
success: function(data, textStatus)
{
preset_paint(data);
$("#Edit_copyPreset_dlg").dialog("close");
}
);
});
};
buttons[language.annuler] = function()
{