fixes

[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 571dac0..63dd39d 100644 (file)
--- a/src/redakcja/static/js/wiki/view_properties.js
+++ b/src/redakcja/static/js/wiki/view_properties.js
@@ -13,6 +13,19 @@
                     "name": "alt",
                     "type": "text",
                 },
                     "name": "alt",
                     "type": "text",
                 },

+                {
+                    "name": "szer",
+                    "type": "percent",
+                },
+                {
+                    "name": "wyrownanie",
+                    "type": "select",
+                    "options": ["lewo", "srodek", "prawo"],
+                },
+                {
+                    "name": "oblew",
+                    "type": "bool",
+                },

             ],
         },
         "ref": {
             ],
         },
         "ref": {


@@ -33,20 +46,33 @@
 
             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);
 

+                let inputval;
+                if ($input.attr('type') == 'checkbox') {
+                    inputval = $input.is(':checked');
+                } else {
+                    inputval = $input.val();
+                }
+                

                 if ($input.data("edited")) {
                 if ($input.data("edited")) {

-                    $input.data("edited").text($input.val());
+                    $input.data("edited").text(inputval);

                     return;
                 }
                 
                     return;
                 }
                 


@@ -56,7 +82,8 @@
                         w(222)
                         let $xmlelem = $($.parseXML(xml));
                         w(333, $xmlelem)
                         w(222)
                         let $xmlelem = $($.parseXML(xml));
                         w(333, $xmlelem)

-                        $xmlelem.contents().attr($input.data('property'), $input.val());
+                        w($input.data('property'), $input.val());
+                        $xmlelem.contents().attr($input.data('property'), inputval);

                         w(444, $xmlelem)
                         let newxml = (new XMLSerializer()).serializeToString($xmlelem[0]);
                         w(555, newxml)
                         w(444, $xmlelem)
                         let newxml = (new XMLSerializer()).serializeToString($xmlelem[0]);
                         w(555, newxml)


@@ -74,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);
         };


@@ -88,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);


@@ -104,7 +150,7 @@
         let nodeDef = elementDefs[node];
         if (nodeDef && nodeDef.attributes) {
             $.each(nodeDef.attributes, function(i, a) {
         let nodeDef = elementDefs[node];
         if (nodeDef && nodeDef.attributes) {
             $.each(nodeDef.attributes, function(i, a) {

-                self.addEditField(a.name, a.type, $(element).attr('data-wlf-' + a.name)); // ...
+                self.addEditField(a, $(element).attr('data-wlf-' + a.name)); // ...

             })
         }
 
             })
         }
 


@@ -112,32 +158,59 @@
         // 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(
                 $meta = $(this);
                 self.addEditField(

-                    $meta.attr('x-node'),
-                    null,
+                    {"name": $meta.attr('x-node'),},

                     $meta.text(),
                     $meta,
                 );
             });
         }
                     $meta.text(),
                     $meta,
                 );
             });
         }

+
+
+
+        // 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(name, type, value, elem) {
+
+
+
+    PropertiesPerspective.prototype.addEditField = function(defn, value, elem) {

         let self = this;
         let $form = $("#properties-form", self.$pane);
 
         let $fg = $("<div class='form-group'>");
         let self = this;
         let $form = $("#properties-form", self.$pane);
 
         let $fg = $("<div class='form-group'>");

-        $("<label/>").attr("for", "property-" + name).text(name).appendTo($fg);
+        $("<label/>").attr("for", "property-" + defn.name).text(defn.name).appendTo($fg);

         let $input;
         let $input;

-        if (type == 'text') {
+        switch (defn.type) {
+        case 'text':

             $input = $("<textarea>");
             $input = $("<textarea>");

+            break;
+        case 'select':
+            $input = $("<select>");
+            $.each(defn.options, function(i, e) {
+                $("<option>").text(e).appendTo($input);
+            });
+            break;
+        case 'bool':
+            $input = $("<input type='checkbox'>");
+            break;
+        default:
+            $input = $("<input>");
+        }
+
+        $input.addClass("form-control").attr("id", "property-" + defn.name).data("property", defn.name);
+        if ($input.attr('type') == 'checkbox') {
+            $input.prop('checked', value == 'true');

         } else {
         } else {

-            $input = $("<input>")
+            $input.val(value);

         }
         }

-        // val?
-        $input.addClass("form-control").attr("id", "property-" + name).data("property", name).val(value);
+        

         if (elem) {
             $input.data("edited", elem);
         }
         if (elem) {
             $input.data("edited", elem);
         }


@@ -145,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);