Merge branch 'feature/remove_mootols' of bitbucket.org:wisemapping/wisemapping-open-source into feature/remove_mootols

Conflicts:
	mindplot/src/main/javascript/LinkIcon.js
This commit is contained in:
Mariela Michalek
2014-08-24 16:46:43 -03:00
9 changed files with 157 additions and 44 deletions

View File

@@ -42,7 +42,7 @@ mindplot.PersistenceManager = new Class({
var domMap = serializer.toXML(mindmap);
var mapXml = core.Utils.innerXML(domMap);
var pref = (editorProperties);
var pref = JSON.stringify(editorProperties);
try {
this.saveMapXml(mapId, mapXml, pref, saveHistory, events, sync);
} catch (e) {

View File

@@ -57,11 +57,11 @@ mindplot.RESTPersistenceManager = new Class({
$.ajax({
url: this.documentUrl.replace("{id}", mapId) + "?" + query,
headers:{"Content-Type":"application/json; charset=utf-8", "Accept":"application/json"},
method:'put',
type:'put',
dataType:"json",
data: JSON.stringify(data),
contentType:"application/json; charset=utf-8",
async:!sync,
dataType: "json",
data: data,
success: function (data, textStatus, jqXHRresponseText) {
persistence.timestamp = jqXHRresponseText;

File diff suppressed because one or more lines are too long