X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/ec04010fbdf38929ffccbf40853aadba5add81b2..661a128f3a3f7bcaac5a33c7f00eb7e790f469d5:/platforma/static/js/main.js?ds=inline
diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index 739808df..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();
@@ -371,6 +369,85 @@ function html(element) {
})
}
+ function addTheme()
+ {
+ var selection = window.getSelection();
+ var n = selection.rangeCount;
+
+ console.log("Range count:", n);
+ if(n == 0) {
+ window.alert("Nie zaznaczono żadnego obszaru");
+ return false;
+ }
+
+ // for now allow only 1 range
+ if(n > 1) {
+ window.alert("Zaznacz jeden obszar");
+ return false;
+ }
+
+ // remember the selected range
+ var range = selection.getRangeAt(0);
+ console.log(range.startContainer, range.startOffset, range.endContainer, range.endOffset);
+
+ // verify if the start/end points make even sense -
+ // they must be inside a x-node (otherwise they will be discarded)
+ // and the x-node must be a main text
+ if (!verifyTagInsertPoint(range.startContainer)) {
+ window.alert("Motyw nie może siÄ zaczynaÄ w tym miejscu.");
+ return false;
+ }
+
+ if (!verifyTagInsertPoint(range.endContainer)) {
+ window.alert("Motyw nie może siÄ koÅczyÄ w tym miejscu.");
+ return false;
+ }
+
+ var date = (new Date()).getTime();
+ var random = Math.floor(4000000000*Math.random());
+ var id = (''+date) + '-' + (''+random);
+
+ var spoint = document.createRange();
+ var epoint = document.createRange();
+
+ spoint.setStart(range.startContainer, range.startOffset);
+ epoint.setStart(range.endContainer, range.endOffset);
+
+ console.log('spoint', spoint.startContainer, spoint.startOffset, spoint.endContainer, spoint.endOffset);
+ console.log('epoint', epoint.startContainer, epoint.startOffset, epoint.endContainer, epoint.endOffset);
+
+ var mtag, btag, etag, errors;
+
+ // insert theme-ref
+
+ xml2html({
+ xml: '',
+ success: function(text) {
+ etag = $('');
+ epoint.insertNode(etag[0]);
+ etag.replaceWith(text);
+ xml2html({
+ xml: 'motyw',
+ success: function(text) {
+ mtag = $('');
+ spoint.insertNode(mtag[0]);
+ mtag.replaceWith(text);
+ xml2html({
+ xml: '',
+ success: function(text) {
+ btag = $('');
+ spoint.insertNode(btag[0])
+ btag.replaceWith(text);
+ selection.removeAllRanges();
+ openForEdit($('.motyw[theme-class=' + id + ']'));
+ }
+ });
+ }
+ });
+ }
+ });
+ }
+
function openForEdit($origin)
{
var $box = null
@@ -388,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
@@ -397,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();
@@ -414,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';
@@ -458,6 +539,11 @@ function html(element) {
addAnnotation();
return false;
});
+
+ $('#insert-theme-button').click(function() {
+ addTheme();
+ return false;
+ });
}