X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/cf891d5c934a7d112f3c36ad82b256917a096fca..661a128f3a3f7bcaac5a33c7f00eb7e790f469d5:/platforma/static/js/main.js
diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index 1a281c40..9262c187 100644
--- a/platforma/static/js/main.js
+++ b/platforma/static/js/main.js
@@ -317,10 +317,6 @@ function html(element) {
xtype == 'motyw' || xtype == 'begin' || xtype == 'end') {
return false;
}
-
- // this is hopefully redundant
- //if(! node.is('*.utwor *') )
- // return false;
// don't allow themes inside annotations
if( node.is('*[x-annotation-box] *') )
@@ -360,9 +356,11 @@ function html(element) {
range.insertNode(tag[0]);
xml2html({
- xml: ''+text+'',
+ xml: ''+text+' --- ',
success: function(text) {
- tag.replaceWith(text);
+ var t = $(text);
+ tag.replaceWith(t);
+ openForEdit(t);
},
error: function() {
tag.remove();
@@ -370,7 +368,7 @@ function html(element) {
}
})
}
-
+
function addTheme()
{
var selection = window.getSelection();
@@ -441,6 +439,7 @@ function html(element) {
spoint.insertNode(btag[0])
btag.replaceWith(text);
selection.removeAllRanges();
+ openForEdit($('.motyw[theme-class=' + id + ']'));
}
});
}
@@ -466,6 +465,11 @@ function html(element) {
var w = $box.outerWidth();
var h = $box.innerHeight();
+ if ($origin.is(".annotation-inline-box")) {
+ w = Math.max(w, 400);
+ h = Math.max(h, 60);
+ }
+
console.log('width:', w, 'height:', h);
// start edition on this node
@@ -475,10 +479,9 @@ function html(element) {
left: x,
top: y,
width: w
- // right: 0
- }).appendTo($box[0].offsetParent || element).show();
+ }).appendTo($box[0].offsetParent || $box.parent()).show();
- console.log($overlay, $box[0].offsetParent || element);
+ console.log($overlay, $box[0].offsetParent || $box.parent());
var serializer = new XMLSerializer();
@@ -492,7 +495,7 @@ function html(element) {
setTimeout(function() {
$('textarea', $overlay).focus();
- }, 100);
+ }, 50);
$('textarea', $overlay).one('blur', function(event) {
var nodeName = $box.attr('x-node') || 'pe';