X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/75b7209eaa096a8d3bff42fa83eec838791b6f3a..ec04010fbdf38929ffccbf40853aadba5add81b2:/platforma/static/js/main.js?ds=sidebyside
diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index de848350..739808df 100644
--- a/platforma/static/js/main.js
+++ b/platforma/static/js/main.js
@@ -253,7 +253,7 @@ function transform(editor) {
};
-function reverseTransform(editor) {
+function reverseTransform(editor, cont) {
var serializer = new XMLSerializer();
if ($('#html-view .error').length > 0) {
return;
@@ -265,6 +265,9 @@ function reverseTransform(editor) {
success: function(text) {
editor.setCode(text);
$.unblockUI();
+ if (cont) {
+ cont();
+ }
}, error: function(text) {
$('#source-editor').html('
WystÄ
piÅ bÅÄ
d:
' + text + '
');
$.unblockUI();
@@ -296,13 +299,80 @@ function html(element) {
}
};
+ function verifyTagInsertPoint(node) {
+ if(node.nodeType == 3) { // Text Node
+ node = node.parentNode;
+ }
+
+ if (node.nodeType != 1) {
+ return false;
+ }
+
+ console.log('Selection point:', node);
+
+ node = $(node);
+ var xtype = node.attr('x-node');
+
+ if (!xtype || (xtype.search(':') >= 0) ||
+ 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] *') )
+ return false;
+
+ return true;
+ }
+
+ function addAnnotation()
+ {
+ 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);
+
+ if (!verifyTagInsertPoint(range.endContainer)) {
+ window.alert("Nie można wstawiÄ w to miejsce przypisu.");
+ return false;
+ }
+
+ var text = range.toString();
+ var tag = $('');
+ range.collapse(false);
+ range.insertNode(tag[0]);
+
+ xml2html({
+ xml: ''+text+'',
+ success: function(text) {
+ tag.replaceWith(text);
+ },
+ error: function() {
+ tag.remove();
+ alert('BÅÄ
d przy dodawaniu przypisu:' + errors);
+ }
+ })
+ }
function openForEdit($origin)
{
- // if(this.currentOpen && this.currentOpen != $origin) {
- // this.closeWithSave(this.currentOpen);
- // }
-
var $box = null
// annotations overlay their sub box - not their own box //
@@ -383,6 +453,11 @@ function html(element) {
$('.motyw').live('click', function() {
selectTheme($(this).attr('theme-class'));
});
+
+ $('#insert-annotation-button').click(function() {
+ addAnnotation();
+ return false;
+ });
}
@@ -410,41 +485,49 @@ $(function() {
$('#save-ok').click(function() {
$.blockUI({message: 'Zapisywanie...'});
- var metaComment = ''
-
- var data = {
- name: $('#document-name').html(),
- text: metaComment + editor.getCode(),
- revision: $('#document-revision').html(),
- author: 'annonymous',
- comment: $('#komentarz').val()
- };
-
- console.log(data);
+ function doSave (argument) {
+ var metaComment = ''
+
+ var data = {
+ name: $('#document-name').html(),
+ text: metaComment + editor.getCode(),
+ revision: $('#document-revision').html(),
+ author: 'annonymous',
+ comment: $('#komentarz').val()
+ };
+
+ console.log(data);
+
+ $.ajax({
+ url: document.location.href,
+ type: "POST",
+ dataType: "json",
+ data: data,
+ success: function(data) {
+ if (data.text) {
+ editor.setCode(data.text);
+ $('#document-revision').html(data.revision);
+ } else {
+ console.log(data.errors);
+ alert(data.errors);
+ }
+ $.unblockUI();
+ },
+ error: function(xhr, textStatus, errorThrown) {
+ alert('error: ' + textStatus + ' ' + errorThrown);
+ },
+ })
+ }
- $.ajax({
- url: document.location.href,
- type: "POST",
- dataType: "json",
- data: data,
- success: function(data) {
- if (data.text) {
- editor.setCode(data.text);
- $('#document-revision').html(data.revision);
- } else {
- console.log(data.errors);
- alert(data.errors);
- }
- $.unblockUI();
- },
- error: function(xhr, textStatus, errorThrown) {
- alert('error: ' + textStatus + ' ' + errorThrown);
- },
- })
+ if ('#simple-view-tab.active') {
+ reverseTransform(editor, doSave);
+ } else {
+ doSave();
+ }
});
$('#save-cancel').click(function() {