X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/be9879c2a845b9d54ddb2aa61f970cffcde01ace..28228fc438edfd3275ce50a90bd3f87180344036:/redakcja/static/js/wiki/view_editor_wysiwyg.js?ds=inline
diff --git a/redakcja/static/js/wiki/view_editor_wysiwyg.js b/redakcja/static/js/wiki/view_editor_wysiwyg.js
index 37e86139..01deb58f 100644
--- a/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -37,7 +37,7 @@
}
// don't allow themes inside annotations
- if (node.is('*[x-annotation-box] *'))
+ if (node.closest('[x-node="pe"]').length > 0)
return false;
return true;
@@ -155,12 +155,21 @@
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);
-
+ var createPoint = function(container, offset) {
+ var offsetBetweenCommas = function(text, offset) {
+ if(text.length < 2 || offset < 1 || offset > text.length)
+ return false;
+ return text[offset-1] === ',' && text[offset] === ',';
+ }
+ var point = document.createRange();
+ offset = offsetBetweenCommas(container.textContent, offset) ? offset - 1 : offset;
+ point.setStart(container, offset);
+ return point;
+ }
+
+ var spoint = createPoint(range.startContainer, range.startOffset);
+ var epoint = createPoint(range.endContainer, range.endOffset);
+
var mtag, btag, etag, errors;
// insert theme-ref
@@ -196,13 +205,14 @@
function addSymbol() {
if($('div.html-editarea textarea')[0]) {
var specialCharsContainer = $("
");
+
var specialChars = ['Ä','Ä
','Ä','Ä','Ä','Ä','Å','Å','Å','Å','Ã','ó','Å','Å','Å»','ż','Ź','ź','Ã','á','Ã','à ',
'Ã','â','Ã','ä','Ã
','Ã¥','Ä','Ä','Ä','Ä','Ã','ã',
'Ã','æ','Ã','ç','Ä','Ä','Ä','Ä','Ä','Ä','Ã','é','Ã','è',
'Ã','ê','Ã','ë','Ä','Ä','Ä','Ä','Ä ','Ä¡','Ħ','ħ','Ã','Ã','Ã','î',
'Ī','Ä«','Ĭ','Ä','Ľ','ľ','Ã','ñ','Å','Å','Ã','ó','Ã','ö',
'Ã','ô','Å','Å','Ç','Ç','Å','Å','Ã','ø','Å','Å','Å ',
- 'Å¡','Å','Å','Ť','Å¥','Å¢','Å£','Å°','ű','Ã','ú',
+ 'Å¡','Å','Å','Ť','Å¥','Å¢','Å£','Å°','ű','Ã','ú','Ã','ù',
'Ã','ü','Å®','ů','Ū','Å«','Ã','û','Ŭ','Å',
'Ã','ý','Ž','ž','Ã','Ã','ð','Ã','þ','Ð','а','Ð',
'б','Ð','в','Ð','г','Ð','д','Ð','е','Ð','Ñ','Ð',
@@ -217,7 +227,7 @@
'Τ','Ï','Î¥','Ï
','Φ','Ï','Χ','Ï','Ψ','Ï','Ω','Ï','â',
'â','¡','¿','$','¢','£','â¬','©','®','°','¹','²','³',
'¼','½','¾','â ','§','â°','â¢','â','â','â','â',
- 'ââ','«»','â','[',']','[','~','|','â','·',
+ 'â','â','ââ','«','»','«»','»«','â','[',']','~','|','â','·',
'Ã','÷','â','â ','±','â¤','â¥','â'];
var tableContent = "";
@@ -230,12 +240,81 @@
tableContent += "
";
$("#content").append(specialCharsContainer);
+
+
+ // localStorage for recently used characters - reading
+ if (typeof(localStorage) != 'undefined') {
+ if (localStorage.getItem("recentSymbols")) {
+ var recent = localStorage.getItem("recentSymbols");
+ var recentArray = recent.split(";");
+ var recentRow = "";
+ for(var i in recentArray.reverse()) {
+ recentRow += " | ";
+ }
+ recentRow = "" + recentRow + "
";
+ }
+ }
+ $("#tableSpecialChars").append(recentRow);
$("#tableSpecialChars").append(tableContent);
/* events */
$('.specialBtn').click(function(){
- insertAtCaret($('div.html-editarea textarea')[0], $(this).val());
+ var editArea = $('div.html-editarea textarea')[0];
+ var insertVal = $(this).val();
+
+ // if we want to surround text with quotes
+ // not sure if just check if value has length == 2
+
+ if (insertVal.length == 2) {
+ var startTag = insertVal[0];
+ var endTag = insertVal[1];
+ var textAreaOpened = editArea;
+ //IE support
+ if (document.selection) {
+ textAreaOpened.focus();
+ sel = document.selection.createRange();
+ sel.text = startTag + sel.text + endTag;
+ }
+ //MOZILLA/NETSCAPE support
+ else if (textAreaOpened.selectionStart || textAreaOpened.selectionStart == '0') {
+ var startPos = textAreaOpened.selectionStart;
+ var endPos = textAreaOpened.selectionEnd;
+ textAreaOpened.value = textAreaOpened.value.substring(0, startPos)
+ + startTag + textAreaOpened.value.substring(startPos, endPos) + endTag + textAreaOpened.value.substring(endPos, textAreaOpened.value.length);
+ }
+ } else {
+ // if we just want to insert single symbol
+ insertAtCaret(editArea, insertVal);
+ }
+
+ // localStorage for recently used characters - saving
+ if (typeof(localStorage) != 'undefined') {
+ if (localStorage.getItem("recentSymbols")) {
+ var recent = localStorage.getItem("recentSymbols");
+ var recentArray = recent.split(";");
+ var valIndex = $.inArray(insertVal, recentArray);
+ //alert(valIndex);
+ if(valIndex == -1) {
+ // value not present in array yet
+ if(recentArray.length > 13){
+ recentArray.shift();
+ recentArray.push(insertVal);
+ } else {
+ recentArray.push(insertVal);
+ }
+ } else {
+ // value already in the array
+ for(var i = valIndex; i < recentArray.length; i++){
+ recentArray[i] = recentArray[i+1];
+ }
+ recentArray[recentArray.length-1] = insertVal;
+ }
+ localStorage.setItem("recentSymbols", recentArray.join(";"));
+ } else {
+ localStorage.setItem("recentSymbols", insertVal);
+ }
+ }
$(specialCharsContainer).remove();
});
$('#specialCharsClose').click(function(){
@@ -251,15 +330,19 @@
/* http://www.scottklarr.com/topic/425/how-to-insert-text-into-a-textarea-where-the-cursor-is/ */
var scrollPos = txtarea.scrollTop;
var strPos = 0;
+ var backStart = 0;
var br = ((txtarea.selectionStart || txtarea.selectionStart == '0') ? "ff" : (document.selection ? "ie" : false ) );
if (br == "ie") {
txtarea.focus();
var range = document.selection.createRange();
range.moveStart ('character', -txtarea.value.length);
- strPos = range.text.length;
- } else if (br == "ff") strPos = txtarea.selectionStart;
+ strPos = backStart = range.text.length;
+ } else if (br == "ff") {
+ strPos = txtarea.selectionStart;
+ backStart = txtarea.selectionEnd;
+ }
var front = (txtarea.value).substring(0,strPos);
- var back = (txtarea.value).substring(strPos,txtarea.value.length);
+ var back = (txtarea.value).substring(backStart,txtarea.value.length);
txtarea.value=front+text+back;
strPos = strPos + text.length;
if (br == "ie") {
@@ -288,11 +371,8 @@
else {
$box = $origin;
}
-
- /* check sidebar width and display textarea on the right but avoiding interfering with gallery */
- var x = $(document).width() - $("#sidebar").width() - 576 - 100; // and little margin here: 100px
- var y = $origin.offset().top + $("#html-view").scrollTop();
-
+ var x = $box[0].offsetLeft;
+ var y = $box[0].offsetTop;
var w = $box.outerWidth();
var h = $box.innerHeight();
@@ -300,19 +380,25 @@
if ($origin.is(".annotation-inline-box")) {
w = Math.max(w, 400);
h = Math.max(h, 60);
+ if($('.htmlview div').offset().left + $('.htmlview div').width() > ($('.vsplitbar').offset().left - 480)){
+ x = -(Math.max($origin.offset().left, $origin.width()));
+ } else {
+ x = 100;
+ }
}
// start edition on this node
- var $overlay = $('').css({
+ var $overlay = $('').css({
position: 'absolute',
height: h,
left: x,
top: y,
width: w
- }).appendTo($('#html-view')).show(); /* appending outside of the document structure */
+ }).appendTo($box[0].offsetParent || $box.parent()).show();
if ($origin.is('.motyw')) {
+ $('.akap-edit-button').remove();
withThemes(function(canonThemes){
$('textarea', $overlay).autocomplete(canonThemes, {
autoFill: true,
@@ -344,7 +430,14 @@
});
}
else {
- $('.delete-button', $overlay).hide();
+ $('.delete-button', $overlay).html("Anuluj");
+ $('.delete-button', $overlay).click(function(){
+ if (window.confirm("Czy jesteÅ pewien, że chcesz anulowaÄ zmiany?")) {
+ $overlay.remove();
+ $(document).unbind('click.blur-overlay');
+ return false;
+ };
+ });
}
@@ -371,26 +464,73 @@
xml2html({
xml: '<' + nodeName + '>' + insertedText + '' + nodeName + '>',
success: function(element){
- $origin.html($(element).html());
+ if (nodeName == 'out-of-flow-text') {
+ $(element).children().insertAfter($origin);
+ $origin.remove()
+ }
+ else {
+ $origin.html($(element).html());
+ }
$overlay.remove();
},
error: function(text){
- $overlay.remove();
alert('BÅÄ
d! ' + text);
}
})
+
+ var msg = $("PamiÄtaj, żeby zapisaÄ swoje zmiany.
");
+ $("#base").prepend(msg);
+ $('#base .saveNotify').fadeOut(3000, function(){
+ $(this).remove();
+ });
}
+ $('.akap-edit-button', $overlay).click(function(){
+ var textAreaOpened = $('textarea', $overlay)[0];
+ var startTag = "";
+ var endTag = "";
+ var buttonName = this.innerHTML;
+
+ if(buttonName == "sÅowo obce") {
+ startTag = "";
+ endTag = "";
+ } else if (buttonName == "wyróżnienie") {
+ startTag = "";
+ endTag = "";
+ } else if (buttonName == "tytuÅ dzieÅa") {
+ startTag = "";
+ endTag = "";
+ } else if(buttonName == "znak spec."){
+ addSymbol();
+ return false;
+ }
+
+ var myField = textAreaOpened;
+
+ //IE support
+ if (document.selection) {
+ textAreaOpened.focus();
+ sel = document.selection.createRange();
+ sel.text = startTag + sel.text + endTag;
+ }
+ //MOZILLA/NETSCAPE support
+ else if (textAreaOpened.selectionStart || textAreaOpened.selectionStart == '0') {
+ var startPos = textAreaOpened.selectionStart;
+ var endPos = textAreaOpened.selectionEnd;
+ textAreaOpened.value = textAreaOpened.value.substring(0, startPos)
+ + startTag + textAreaOpened.value.substring(startPos, endPos) + endTag + textAreaOpened.value.substring(endPos, textAreaOpened.value.length);
+ }
+ });
+
$('.accept-button', $overlay).click(function(){
save();
});
$(document).bind('click.blur-overlay', function(event){
- if ($(event.target).parents('.html-editarea').length > 0) {
+ if ($(event.target).closest('.html-editarea, #specialCharsContainer').length > 0) {
return;
}
save();
-
$(document).unbind('click.blur-overlay');
});
@@ -437,12 +577,7 @@
$('#insert-theme-button').click(function(){
addTheme();
return false;
- });
-
- $('#insert-symbol-button').click(function(){
- addSymbol();
- return false;
- });
+ });
$('.edit-button').live('click', function(event){
event.preventDefault();
@@ -487,7 +622,10 @@
_finalize(success);
},
error: function(text, source){
- $('#html-view').html('WystÄ
piÅ bÅÄ
d:
'+text+'
'+source.replace(/&/g, '&').replace(/');
+ err = 'WystÄ
piÅ bÅÄ
d:
'+text+'
';
+ if (source)
+ err += ''+source.replace(/&/g, '&').replace(/'
+ $('#html-view').html(err);
_finalize(failure);
}
});
@@ -510,7 +648,8 @@
return _finalize(failure);
html2text({
- element: $('#html-view div').get(0),
+ element: $('#html-view').get(0),
+ stripOuter: true,
success: function(text){
self.doc.setText(text);
_finalize(success);