fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dodanie automatycznego rozszerzania się textarea (jquery.elastic.js) i rusztowania...
[redakcja.git]
/
platforma
/
static
/
js
/
main.js
diff --git
a/platforma/static/js/main.js
b/platforma/static/js/main.js
index
597e33f
..
89ffeaf
100644
(file)
--- a/
platforma/static/js/main.js
+++ b/
platforma/static/js/main.js
@@
-308,8
+308,6
@@
function html(element) {
return false;
}
return false;
}
- console.log('Selection point:', node);
-
node = $(node);
var xtype = node.attr('x-node');
node = $(node);
var xtype = node.attr('x-node');
@@
-330,7
+328,6
@@
function html(element) {
var selection = window.getSelection();
var n = selection.rangeCount;
var selection = window.getSelection();
var n = selection.rangeCount;
- console.log("Range count:", n);
if (n == 0) {
window.alert("Nie zaznaczono żadnego obszaru");
return false;
if (n == 0) {
window.alert("Nie zaznaczono żadnego obszaru");
return false;
@@
-374,7
+371,6
@@
function html(element) {
var selection = window.getSelection();
var n = selection.rangeCount;
var selection = window.getSelection();
var n = selection.rangeCount;
- console.log("Range count:", n);
if(n == 0) {
window.alert("Nie zaznaczono żadnego obszaru");
return false;
if(n == 0) {
window.alert("Nie zaznaczono żadnego obszaru");
return false;
@@
-388,7
+384,6
@@
function html(element) {
// remember the selected range
var range = selection.getRangeAt(0);
// 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)
// verify if the start/end points make even sense -
// they must be inside a x-node (otherwise they will be discarded)
@@
-413,9
+408,6
@@
function html(element) {
spoint.setStart(range.startContainer, range.startOffset);
epoint.setStart(range.endContainer, range.endOffset);
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
var mtag, btag, etag, errors;
// insert theme-ref
@@
-459,7
+451,6
@@
function html(element) {
// annotations overlay their sub box - not their own box //
if($origin.is(".annotation-inline-box")) {
$box = $("*[x-annotation-box]", $origin);
// annotations overlay their sub box - not their own box //
if($origin.is(".annotation-inline-box")) {
$box = $("*[x-annotation-box]", $origin);
- console.log('annotation!', $box);
} else {
$box = $origin;
}
} else {
$box = $origin;
}
@@
-474,8
+465,6
@@
function html(element) {
h = Math.max(h, 60);
}
h = Math.max(h, 60);
}
- console.log('width:', w, 'height:', h);
-
// start edition on this node
var $overlay = $('<div class="html-editarea"><button class="accept-button">Zapisz</button><button class="delete-button">Usuń</button><textarea></textarea></div>').css({
position: 'absolute',
// start edition on this node
var $overlay = $('<div class="html-editarea"><button class="accept-button">Zapisz</button><button class="delete-button">Usuń</button><textarea></textarea></div>').css({
position: 'absolute',
@@
-485,6
+474,14
@@
function html(element) {
width: w
}).appendTo($box[0].offsetParent || $box.parent()).show();
width: w
}).appendTo($box[0].offsetParent || $box.parent()).show();
+ if ($origin.is('.motyw')) {
+ $('textarea', $overlay).autocomplete(['Ala ma kota', 'Kot ma Alę', 'HIV', 'motyw'], {
+ autoFill: true,
+ multiple: true,
+ selectFirst: true
+ });
+ }
+
$('.delete-button', $overlay).click(function() {
if ($origin.is('.motyw')) {
$('[theme-class=' + $origin.attr('theme-class') + ']').remove();
$('.delete-button', $overlay).click(function() {
if ($origin.is('.motyw')) {
$('[theme-class=' + $origin.attr('theme-class') + ']').remove();
@@
-496,20
+493,17
@@
function html(element) {
return false;
})
return false;
})
- console.log($overlay, $box[0].offsetParent || $box.parent());
var serializer = new XMLSerializer();
var serializer = new XMLSerializer();
-
- console.log($box.html());
+
html2xml({
xml: serializer.serializeToString($box[0]),
inner: true,
success: function(text) {
$('textarea', $overlay).val($.trim(text));
html2xml({
xml: serializer.serializeToString($box[0]),
inner: true,
success: function(text) {
$('textarea', $overlay).val($.trim(text));
- console.log($.trim(text));
setTimeout(function() {
setTimeout(function() {
- $('textarea', $overlay).focus();
+ $('textarea', $overlay).
elastic().
focus();
}, 50);
function save(argument) {
}, 50);
function save(argument) {
@@
-631,8
+625,6
@@
$(function() {
comment: $('#komentarz').val()
};
comment: $('#komentarz').val()
};
- console.log(data);
-
$.ajax({
url: document.location.href,
type: "POST",
$.ajax({
url: document.location.href,
type: "POST",
@@
-643,7
+635,6
@@
$(function() {
editor.setCode(data.text);
$('#document-revision').html(data.revision);
} else {
editor.setCode(data.text);
$('#document-revision').html(data.revision);
} else {
- console.log(data.errors);
alert(data.errors);
}
$.unblockUI();
alert(data.errors);
}
$.unblockUI();