From: zuber <marek@stepniowski.com>
Date: Wed, 16 Sep 2009 13:08:14 +0000 (+0200)
Subject: Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/8d62c0c82718b59c077b611fca1cd9f8054a8c41?ds=sidebyside;hp=--cc

Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
---

8d62c0c82718b59c077b611fca1cd9f8054a8c41
diff --cc project/static/js/editor.js
index fa796dba,4150043f..7951ee74
--- a/project/static/js/editor.js
+++ b/project/static/js/editor.js
@@@ -378,9 -347,9 +378,9 @@@ Editor.prototype.saveToBranch = functio
      var self = this;
      $.log('Saving to local branch - panel:', changed_panel);
  
-     if(!msg) msg = "Zapis z edytora platformy.";
+     if(!msg) msg = "Szybki zapis z edytora platformy.";
  
 -    if( changed_panel.length == 0) {
 +    if( changed_panel.length === 0) {
          $.log('Nothing to save.');
          return true; /* no changes */
      }
@@@ -488,16 -453,14 +487,15 @@@ Editor.prototype.updateUserBranch = fun
          type: 'POST',
          data: {}
      });
 -}
 +};
  
  Editor.prototype.sendMergeRequest = function (message) {
 -    if( $('.panel-wrap.changed').length != 0)        
 +    if( $('.panel-wrap.changed').length !== 0) {
          alert("There are unsaved changes - can't commit.");
 +    }
  
-     var self =  this;
-     $.log('URL !: ', $('#commit-dialog form').attr('action'));
-     
+     var self =  this;    
+         
      $.ajax({        
          url: $('#commit-dialog form').attr('action'),
          dataType: 'json',