X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/21b40c7f537d93bb2b9f30579a8accd969dd07bf..f4ef2a001a939444826ad0df962a814ba97e9185:/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 080b5a74..cb7c40f8 100644
--- a/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -196,13 +196,14 @@
function addSymbol() {
if($('div.html-editarea textarea')[0]) {
var specialCharsContainer = $("
");
+
var specialChars = ['Ä','Ä
','Ä','Ä','Ä','Ä','Å','Å','Å','Å','Ã','ó','Å','Å','Å»','ż','Ź','ź','Ã','á','Ã','à ',
'Ã','â','Ã','ä','Ã
','Ã¥','Ä','Ä','Ä','Ä','Ã','ã',
'Ã','æ','Ã','ç','Ä','Ä','Ä','Ä','Ä','Ä','Ã','é','Ã','è',
'Ã','ê','Ã','ë','Ä','Ä','Ä','Ä','Ä ','Ä¡','Ħ','ħ','Ã','Ã','Ã','î',
'Ī','Ä«','Ĭ','Ä','Ľ','ľ','Ã','ñ','Å','Å','Ã','ó','Ã','ö',
'Ã','ô','Å','Å','Ç','Ç','Å','Å','Ã','ø','Å','Å','Å ',
- 'Å¡','Å','Å','Ť','Å¥','Å¢','Å£','Å°','ű','Ã','ú',
+ 'Å¡','Å','Å','Ť','Å¥','Å¢','Å£','Å°','ű','Ã','ú','Ã','ù',
'Ã','ü','Å®','ů','Ū','Å«','Ã','û','Ŭ','Å',
'Ã','ý','Ž','ž','Ã','Ã','ð','Ã','þ','Ð','а','Ð',
'б','Ð','в','Ð','г','Ð','д','Ð','е','Ð','Ñ','Ð',
@@ -217,7 +218,7 @@
'Τ','Ï','Î¥','Ï
','Φ','Ï','Χ','Ï','Ψ','Ï','Ω','Ï','â',
'â','¡','¿','$','¢','£','â¬','©','®','°','¹','²','³',
'¼','½','¾','â ','§','â°','â¢','â','â','â','â',
- 'â','â','ââ','«','»','«»','â','[',']','~','|','â','·',
+ 'â','â','ââ','«','»','«»','»«','â','[',']','~','|','â','·',
'Ã','÷','â','â ','±','â¤','â¥','â'];
var tableContent = "";
@@ -230,6 +231,21 @@
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 */
@@ -241,7 +257,7 @@
// if we want to surround text with quotes
// not sure if just check if value has length == 2
- if(insertVal == 'ââ' || insertVal == '«»'){
+ if (insertVal.length == 2) {
var startTag = insertVal[0];
var endTag = insertVal[1];
var textAreaOpened = editArea;
@@ -263,6 +279,34 @@
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(){
@@ -304,6 +348,33 @@
txtarea.scrollTop = scrollPos;
}
+ function getXNodeAttributes(node) {
+ var m = {}
+ $.map(node.attributes, function(attrNode) {
+ if (attrNode.nodeName.indexOf('data-wlf-') === 0) {
+ var n = attrNode.nodeName.substr(9);
+ var v = attrNode.nodeValue;
+ m[n] = v;
+ };
+ });
+ return m;
+ }
+
+ function setXNodeAttributes(node, attrs) {
+ $.map(node.attributes, function(attrNode) {
+ var xName = attrNode.nodeName.substr(9);
+ if (attrNode.nodeName.indexOf('data-wlf-') === 0
+ && xName in attrs) {
+ attrNode.nodeValue = attrs[xName];
+ }
+ if (attrNode.nodeName.indexOf('x-attr-name-') === 0
+ && attrNode.nodeValue in attrs) {
+ node.setAttribute('x-attr-value-' + attrNode.nodeName.substr("x-attr-name-".length),
+ attrs[attrNode.nodeValue]);
+ }
+ });
+ }
+
/* open edition window for selected fragment */
function openForEdit($origin){
var $box = null
@@ -332,7 +403,17 @@
}
// start edition on this node
- var $overlay = $('').css({
+ var $overlay = $('');
+
+ $attributes = $('')
+
+ $.map(getXNodeAttributes($origin.get(0)),
+ function(v, n) {
+ $attributes.append('');
+ });
+ $overlay.append($attributes);
+
+ $overlay.css({
position: 'absolute',
height: h,
left: x,
@@ -415,6 +496,14 @@
else {
$origin.html($(element).html());
}
+ /* Set attributres back to the node */
+ var attrs = {};
+ $(".html-editarea-attributes [name]")
+ .each(function(i, textField) {
+ attrs[textField.name] = textField.value;
+ });
+ setXNodeAttributes($origin.get(0), attrs);
+
$overlay.remove();
},
error: function(text){
@@ -423,12 +512,10 @@
}
})
- var msg = $("Twoje zmiany zostaÅy naniesione na tekst źródÅowy. PamiÄtaj, że aby zmiany zostaÅy utrwalone należy je zapisaÄ!
Ta wiadomoÅÄ zostanie automatycznie zamkniÄta za 6 sekund.
");
+ var msg = $("PamiÄtaj, żeby zapisaÄ swoje zmiany.
");
$("#base").prepend(msg);
- $("#save-button").css({border: '2px solid #801000', backgroundColor: '#E1C1C1'});
- $('#base .saveNotify').fadeOut(7000, function(){
+ $('#base .saveNotify').fadeOut(3000, function(){
$(this).remove();
- $("#save-button").css({border: '1px solid black'});
});
}
@@ -450,6 +537,12 @@
} else if(buttonName == "znak spec."){
addSymbol();
return false;
+ } else if (buttonName == "luka") {
+ startTag = "";
+ endTag = "";
+ } else if (buttonName == "zastÄ
p") {
+ startTag = "";
+ endTag = "";
}
var myField = textAreaOpened;
@@ -595,7 +688,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);