fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Meta errors in alerts.
[redakcja.git]
/
src
/
redakcja
/
static
/
js
/
wiki
/
view_properties.js
diff --git
a/src/redakcja/static/js/wiki/view_properties.js
b/src/redakcja/static/js/wiki/view_properties.js
index
32a7101
..
63dd39d
100644
(file)
--- a/
src/redakcja/static/js/wiki/view_properties.js
+++ b/
src/redakcja/static/js/wiki/view_properties.js
@@
-46,15
+46,21
@@
self.$pane = $("#side-properties");
self.$pane = $("#side-properties");
- $(document).on('click', '[x-node]', function(e) {
- e.stopPropagation();
- self.edit(this);
+ $("#simple-editor").on('click', '[x-node]', function(e) {
+ if (!e.redakcja_edited) {
+ e.redakcja_edited = true;
+ self.edit(this);
+ }
});
self.$pane.on('click', '#parents li', function(e) {
self.edit($(this).data('node'));
});
});
self.$pane.on('click', '#parents li', function(e) {
self.edit($(this).data('node'));
});
+ $(document).on('click', '#bubbles .badge', function(e) {
+ self.edit($(this).data('node'));
+ });
+
self.$pane.on('change', '.form-control', function() {
let $input = $(this);
self.$pane.on('change', '.form-control', function() {
let $input = $(this);
@@
-95,6
+101,14
@@
});
self.$edited;
});
});
self.$edited;
});
+
+ self.$pane.on('click', '.current-convert', function() {
+ self.convert($(this).attr('data-to'));
+ });
+ self.$pane.on('click', '#current-delete', function() {
+ self.delete();
+ });
+
oldCallback.call(this);
};
oldCallback.call(this);
};
@@
-109,11
+123,22
@@
let $node = $(element);
$("#parents", self.$pane).empty();
let $node = $(element);
$("#parents", self.$pane).empty();
+ $("#bubbles").empty();
+
+ let b = $("<div class='badge badge-primary'></div>").text($node.attr('x-node'));
+ b.data('node', element);
+ $("#bubbles").append(b);
+
$node.parents('[x-node]').each(function() {
let a = $("<li class='breadcrumb-item'>").text($(this).attr('x-node'));
a.data('node', this);
$("#parents", self.$pane).prepend(a)
$node.parents('[x-node]').each(function() {
let a = $("<li class='breadcrumb-item'>").text($(this).attr('x-node'));
a.data('node', this);
$("#parents", self.$pane).prepend(a)
+
+ let b = $("<div class='badge badge-info'></div>").text($(this).attr('x-node'));
+ b.data('node', this);
+ $("#bubbles").append(b);
})
})
+
// It's a tag.
node = $(element).attr('x-node');
$("h1", self.$pane).text(node);
// It's a tag.
node = $(element).attr('x-node');
$("h1", self.$pane).text(node);
@@
-133,7
+158,7
@@
// Only utwor can has matadata now.
if (node == 'utwor') {
// Let's find all the metadata.
// Only utwor can has matadata now.
if (node == 'utwor') {
// Let's find all the metadata.
- $(">
.RDF > .Description
> [x-node]", $node).each(function() {
+ $(">
[x-node='RDF'] > [x-node='Description']
> [x-node]", $node).each(function() {
$meta = $(this);
self.addEditField(
{"name": $meta.attr('x-node'),},
$meta = $(this);
self.addEditField(
{"name": $meta.attr('x-node'),},
@@
-142,8
+167,19
@@
);
});
}
);
});
}
+
+
+
+ // check node type, find relevant tags
+ if ($node[0].nodeName == 'DIV') {
+ $("#current-convert").attr("data-current-type", "div");
+ } else if ($node[0].nodeName == 'EM') {
+ $("#current-convert").attr("data-current-type", "span");
+ }
};
};
-
+
+
+
PropertiesPerspective.prototype.addEditField = function(defn, value, elem) {
let self = this;
let $form = $("#properties-form", self.$pane);
PropertiesPerspective.prototype.addEditField = function(defn, value, elem) {
let self = this;
let $form = $("#properties-form", self.$pane);
@@
-182,7
+218,18
@@
$fg.appendTo($form);
}
$fg.appendTo($form);
}
-
+
+ PropertiesPerspective.prototype.convert = function(newtag) {
+ this.$edited.attr('x-node', newtag);
+ // TODO: take care of attributes?
+ }
+
+ PropertiesPerspective.prototype.delete = function(newtag) {
+ p = this.$edited.parent();
+ this.$edited.remove();
+ this.edit(p);
+ }
+
$.wiki.PropertiesPerspective = PropertiesPerspective;
})(jQuery);
$.wiki.PropertiesPerspective = PropertiesPerspective;
})(jQuery);