From: Library Admin <librarian@szo.nowoczesnapolska.org.pl>
Date: Mon, 9 Sep 2013 14:37:46 +0000 (+0200)
Subject: Merge branch 'img-playground' of ssh://git.nowoczesnapolska.org.pl:2223/~/repo/redakc... 
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/e59fb224da39822620eefe8171d8ecad2c69cda6?hp=587871c59fb79c4c235ba6697174723f26af8aab

Merge branch 'img-playground' of ssh://git.nowoczesnapolska.org.pl:2223/~/repo/redakcja into img-playground
---

diff --git a/lib/librarian b/lib/librarian
index 5b407667..5fed7885 160000
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit 5b407667ca47cf4d9752821fd49e5611737146d2
+Subproject commit 5fed78856949474a36bc5e268517775a9a802e27
diff --git a/redakcja/static/js/lib/jquery/jquery.imgareaselect.js b/redakcja/static/js/lib/jquery/jquery.imgareaselect.js
index d981fdc5..cb31eef9 100644
--- a/redakcja/static/js/lib/jquery/jquery.imgareaselect.js
+++ b/redakcja/static/js/lib/jquery/jquery.imgareaselect.js
@@ -39,13 +39,13 @@ $.imgAreaSelect = function (img, options) {
 
         left, top,
 
-        imgOfs,
+        imgOfs = { left: 0, top: 0 },
 
         imgWidth, imgHeight,
 
         $parent,
 
-        parOfs,
+        parOfs = { left: 0, top: 0 },
 
         zIndex = 0,
 
diff --git a/redakcja/static/js/wiki_img/wikiapi.js b/redakcja/static/js/wiki_img/wikiapi.js
index 219f53ff..81cd3162 100644
--- a/redakcja/static/js/wiki_img/wikiapi.js
+++ b/redakcja/static/js/wiki_img/wikiapi.js
@@ -373,7 +373,7 @@
             $sem.append($div);
             $root.append($sem);
         });
-        self.setText(XML(serializer.serializeToString(doc)).toXMLString());
+        self.setText(serializer.serializeToString(doc));
     }