From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Mon, 24 Aug 2009 15:59:05 +0000 (+0200)
Subject: Merge branch 'master' of git@stigma:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/b157bbf02932396c65c0aca9638c96200c4665df?ds=inline;hp=--cc

Merge branch 'master' of git@stigma:platforma

Conflicts:

	project/static/js/jquery.hpanel.js
	project/static/js/panels.js
	project/templates/explorer/panels/xmleditor.html
---

b157bbf02932396c65c0aca9638c96200c4665df
diff --cc project/static/js/panels.js
index d5fc757d,1317d9e4..c53d1354
--- a/project/static/js/panels.js
+++ b/project/static/js/panels.js
@@@ -1,18 -1,15 +1,16 @@@
  function loadPanel(target, url) {
 +    $.log('ajax', url, 'into', target);
+     $('.change-notification', $(target).parent()).fadeOut();
      $(document).trigger('panel:unload', target);
      $.ajax({
          url: url,
          dataType: 'html',
          success: function(data, textStatus) {
-             $.log(target, 'ajax success');
              $(target).html(data);
-             $.log(target, 'triggering panel:load');
              $(document).trigger('panel:load', target);
-             // panel(target);
          },
          error: function(request, textStatus, errorThrown) {
 -            console.log('ajax', url, target, 'error:', textStatus, errorThrown);
 +            $.log('ajax', url, target, 'error:', textStatus, errorThrown);
          }
      });
  }