From: Ɓukasz Rekucki Date: Tue, 29 Sep 2009 18:07:06 +0000 (+0200) Subject: Merge branch 'master' of stigma:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/5ffbe263839acf003494225f41a3f3c95af797b7?hp=2384208b1967f12992caf087dca475d70fa765a3 Merge branch 'master' of stigma:platforma --- diff --git a/project/static/js/models.js b/project/static/js/models.js index 5d3fac49..b5b9c541 100644 --- a/project/static/js/models.js +++ b/project/static/js/models.js @@ -82,7 +82,7 @@ Editor.XMLModel = Editor.Model.extend({ $.ajax({ url: this.serverURL, - type: 'put', + type: 'post', dataType: 'json', data: payload, success: this.updatingSucceeded.bind(this), @@ -209,12 +209,12 @@ Editor.ImageGalleryModel = Editor.Model.extend({ alert('erroneous state:', this.get('state')); } - $.log('galleries:', data); + console.log('galleries:', data); - if (data.length == 0) + if (data.length === 0) { this.set('data', []); - else { - $.log('dupa'); + } else { + console.log('dupa'); this.set('data', data[0].pages); } @@ -319,7 +319,7 @@ Editor.DocumentModel = Editor.Model.extend({ this.contentModels[key].set('revision', this.data.user_revision); this.contentModels[key].set('state', 'empty'); } - } else if (xhr.status == 202) { // Wygenerowano PullRequest + } else if (xhr.status == 202) { // Wygenerowano PullRequest (tutaj?) } else if (xhr.status == 204) { // Nic nie zmieniono } else if (xhr.status == 409) { // Konflikt podczas operacji } @@ -351,7 +351,7 @@ Editor.DocumentModel = Editor.Model.extend({ this.contentModels[key].set('revision', this.data.user_revision); this.contentModels[key].set('state', 'empty'); } - } else if (xhr.status == 202) { // Wygenerowano PullRequest (tutaj?) + } else if (xhr.status == 202) { // Wygenerowano PullRequest } else if (xhr.status == 204) { // Nic nie zmieniono } else if (xhr.status == 409) { // Konflikt podczas operacji }