X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/cf891d5c934a7d112f3c36ad82b256917a096fca..22aac0da99594406b261f14c135812c855c196ef:/platforma/static/js/main.js
diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index 1a281c40..597e33f2 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 + ']'));
}
});
}
@@ -449,6 +448,10 @@ function html(element) {
});
}
+ // function removeTheme($origin) {
+ //
+ // }
+
function openForEdit($origin)
{
var $box = null
@@ -466,19 +469,34 @@ 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
- var $overlay = $('
').css({
+ var $overlay = $('').css({
position: 'absolute',
height: h,
left: x,
top: y,
width: w
- // right: 0
- }).appendTo($box[0].offsetParent || element).show();
+ }).appendTo($box[0].offsetParent || $box.parent()).show();
+
+ $('.delete-button', $overlay).click(function() {
+ if ($origin.is('.motyw')) {
+ $('[theme-class=' + $origin.attr('theme-class') + ']').remove();
+ } else {
+ $origin.remove();
+ }
+ $overlay.remove();
+ $(document).unbind('click.blur-overlay');
+ return false;
+ })
- console.log($overlay, $box[0].offsetParent || element);
+ console.log($overlay, $box[0].offsetParent || $box.parent());
var serializer = new XMLSerializer();
@@ -492,9 +510,9 @@ function html(element) {
setTimeout(function() {
$('textarea', $overlay).focus();
- }, 100);
+ }, 50);
- $('textarea', $overlay).one('blur', function(event) {
+ function save(argument) {
var nodeName = $box.attr('x-node') || 'pe';
xml2html({
xml: '<' + nodeName + '>' + $('textarea', $overlay).val() + '' + nodeName + '>',
@@ -507,7 +525,35 @@ function html(element) {
alert('BÅÄ
d! ' + text);
}
})
+ }
+
+ $('.accept-button', $overlay).click(function() {
+ save();
});
+
+ $(document).bind('click.blur-overlay', function(event) {
+ if ($(event.target).parents('.html-editarea').length > 0) {
+ return;
+ }
+ save();
+
+ $(document).unbind('click.blur-overlay');
+ });
+
+ // $('textarea', $overlay).one('blur', function(event) {
+ // var nodeName = $box.attr('x-node') || 'pe';
+ // xml2html({
+ // xml: '<' + nodeName + '>' + $('textarea', $overlay).val() + '' + nodeName + '>',
+ // success: function(element) {
+ // $box.html($(element).html());
+ // $overlay.remove();
+ // },
+ // error: function(text) {
+ // $overlay.remove();
+ // alert('BÅÄ
d! ' + text);
+ // }
+ // })
+ // });
}, error: function(text) {
alert('BÅÄ
d! ' + text);
}
@@ -519,6 +565,8 @@ function html(element) {
openForEdit($(this).parent());
});
+
+
var button = $('');
$(element).bind('mousemove', function(event) {
var editable = $(event.target).closest('*[x-editable]');