Poprawki stylu pokazywania przypisów.

[redakcja.git] / platforma / static / js / main.js

diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index 56160ee..0f227b4 100644 (file)
--- a/platforma/static/js/main.js
+++ b/platforma/static/js/main.js
@@ -94,7 +94,7 @@ function gallery(element, url) {
     element.data('images', []);
     
     function changePage(pageNumber) {        
     element.data('images', []);
     
     function changePage(pageNumber) {        

-        $('img', element).attr('src', element.data('images')[pageNumber - 1]);
+        $('.gallery-image img', element).attr('src', element.data('images')[pageNumber - 1]);

     }
     
     function normalizeNumber(pageNumber) {
     }
     
     function normalizeNumber(pageNumber) {


@@ -130,7 +130,7 @@ function gallery(element, url) {
     });
     
     
     });
     
     

-    var image = $('img', element).attr('unselectable', 'on');
+    var image = $('.gallery-image img', element).attr('unselectable', 'on');

     var origin = {};
     var imageOrigin = {};
     var zoomFactor = 1;
     var origin = {};
     var imageOrigin = {};
     var zoomFactor = 1;


@@ -145,7 +145,7 @@ function gallery(element, url) {
     });
     $('.change-gallery', element).click(function() {
         $('.chosen-gallery').val($('#document-meta .gallery').html() || '/platforma/gallery/');
     });
     $('.change-gallery', element).click(function() {
         $('.chosen-gallery').val($('#document-meta .gallery').html() || '/platforma/gallery/');

-        $('.gallery-image').animate({top: 53}, 200);
+        $('.gallery-image').animate({top: 60}, 200);

         $('.chosen-gallery').focus();
     });
     $('.change-gallery-ok', element).click(function() {
         $('.chosen-gallery').focus();
     });
     $('.change-gallery-ok', element).click(function() {


@@ -154,13 +154,13 @@ function gallery(element, url) {
         }
         $('#document-meta .gallery').html($('.chosen-gallery').val());
         updateGallery($('.chosen-gallery').val());
         }
         $('#document-meta .gallery').html($('.chosen-gallery').val());
         updateGallery($('.chosen-gallery').val());

-        $('.gallery-image').animate({top: 27}, 200);
+        $('.gallery-image').animate({top: 30}, 200);

     });
     $('.change-gallery-cancel', element).click(function() {
     });
     $('.change-gallery-cancel', element).click(function() {

-        $('.gallery-image').animate({top: 27}, 200);
+        $('.gallery-image').animate({top: 30}, 200);

     });
     
     });
     

-    $('img', element).load(function() {
+    $('.gallery-image img', element).load(function() {

         image.css({width: null, height: null});
         imageDimensions = {
             width: $(this).width() * zoomFactor,
         image.css({width: null, height: null});
         imageDimensions = {
             width: $(this).width() * zoomFactor,


@@ -172,7 +172,7 @@ function gallery(element, url) {
         };
         
         if (!(imageDimensions.width && imageDimensions.height)) {
         };
         
         if (!(imageDimensions.width && imageDimensions.height)) {

-            setTimeout(function() { $('img', element).load(); }, 100);
+            setTimeout(function() { $('.gallery-image img', element).load(); }, 100);

         }        
         var position = normalizePosition(
             image.position().left,
         }        
         var position = normalizePosition(
             image.position().left,


@@ -269,14 +269,14 @@ function gallery(element, url) {
                 element.data('images', data);
                 pn.val(1);
                 pn.change();
                 element.data('images', data);
                 pn.val(1);
                 pn.change();

-                $('img', element).show();
+                $('.gallery-image img', element).show();

             },
             
             error: function(data) {
                 element.data('images', []);
                 pn.val(1);
                 pn.change();
             },
             
             error: function(data) {
                 element.data('images', []);
                 pn.val(1);
                 pn.change();

-                $('img', element).hide();
+                $('.gallery-image img', element).hide();

             }
         });
     }
             }
         });
     }


@@ -301,7 +301,11 @@ function transform(editor, callback) {
                     callback();
                 }
             }, error: function(text) {
                     callback();
                 }
             }, error: function(text) {

-                $('#html-view').html('<p class="error">Wystąpił błąd:</p><pre>' + text + '</pre>');
+                               var message = $('<pre></pre>');
+                               message.text(text);
+                $('#html-view').html('<p class="error">Wystąpił błąd:</p><pre>' + 
+                                   message.html() + '</pre>');
+                                       

                 $.unblockUI();
                 if (callback) {
                     callback();
                 $.unblockUI();
                 if (callback) {
                     callback();


@@ -393,6 +397,23 @@ function html(element) {
 
         return true;
     }
 
         return true;
     }

+       
+       var ANNOT_ALLOWED = ['wyroznienie'];
+       
+       function html2plainText(fragment) {
+               var text = "";
+               
+               $(fragment.childNodes).each(function() {
+                       if(this.nodeType == 3) // textNode
+                           text += this.nodeValue;
+                       else if (this.nodeType == 1 
+                           && $.inArray($(this).attr('x-node'), ANNOT_ALLOWED) != -1 ){
+                               text += html2plainText(this);                           
+                       }                       
+               });
+               
+               return text;            
+       }

     
     function addAnnotation()
     {
     
     function addAnnotation()
     {


@@ -418,7 +439,10 @@ function html(element) {
             return false;
         }
 
             return false;
         }
 

-        var text = range.toString();
+               // BUG #273 - selected text can contain themes, which should be omited from
+               // defining term
+        var text = html2plainText( range.cloneContents() ); 
+               

         var tag = $('<span></span>');
         range.collapse(false);
         range.insertNode(tag[0]);
         var tag = $('<span></span>');
         range.collapse(false);
         range.insertNode(tag[0]);


@@ -449,12 +473,20 @@ function html(element) {
 
         // for now allow only 1 range
         if(n > 1) {
 
         // for now allow only 1 range
         if(n > 1) {

-            window.alert("Zaznacz jeden obszar");
+            window.alert("Zaznacz jeden obszar.");

             return false;
         }
             return false;
         }

+                

 
         // remember the selected range
         var range = selection.getRangeAt(0);
 
         // remember the selected range
         var range = selection.getRangeAt(0);

+               
+               
+               if( $(range.startContainer).is('.html-editarea') 
+                || $(range.endContainer).is('.html-editarea') ) {
+                       window.alert("Motywy można oznaczać tylko na tekście nie otwartym do edycji. \n Zamknij edytowany fragment i spróbuj ponownie.");
+            return false;
+                }               

 
         // 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)


@@ -491,7 +523,7 @@ function html(element) {
                 etag.replaceWith(text);
                 xml2html({
                     xml: '<motyw id="m'+id+'"></motyw>',
                 etag.replaceWith(text);
                 xml2html({
                     xml: '<motyw id="m'+id+'"></motyw>',

-                    success: function(text) {
+                    success: function(text) {                                          

                         mtag = $('<span></span>');
                         spoint.insertNode(mtag[0]);
                         mtag.replaceWith(text);
                         mtag = $('<span></span>');
                         spoint.insertNode(mtag[0]);
                         mtag.replaceWith(text);


@@ -575,8 +607,14 @@ function html(element) {
                 
                 function save(argument) {
                     var nodeName = $box.attr('x-node') || 'pe';
                 
                 function save(argument) {
                     var nodeName = $box.attr('x-node') || 'pe';

+                                       var insertedText = $('textarea', $overlay).val();
+                                       
+                                       if ($origin.is('.motyw')) {
+                                               insertedText = insertedText.replace(/,\s*$/, '');
+                                       }
+                                       

                     xml2html({
                     xml2html({

-                        xml: '<' + nodeName + '>' + $('textarea', $overlay).val() + '</' + nodeName + '>',
+                        xml: '<' + nodeName + '>' + insertedText + '</' + nodeName + '>',

                         success: function(element) {
                             $box.html($(element).html());
                             $overlay.remove();
                         success: function(element) {
                             $box.html($(element).html());
                             $overlay.remove();


@@ -621,6 +659,13 @@ function html(element) {
         if (!editable.hasClass('active')) {
             editable.addClass('active').append(button);
         }
         if (!editable.hasClass('active')) {
             editable.addClass('active').append(button);
         }

+        if (editable.is('.annotation-inline-box')) {
+            $('*[x-annotation-box]', editable)
+                .css({width: 300, position: 'absolute', left: event.clientX - editable.offset().left + 5, top: event.clientY - editable.offset().top + 5})
+                .show();
+        } else {
+            $('*[x-annotation-box]').hide();
+        }

     });
 
     $('.motyw').live('click', function() {
     });
 
     $('.motyw').live('click', function() {


@@ -652,6 +697,7 @@ $(function() {
         },
         iframeClass: 'xml-iframe',
         textWrapping: true,
         },
         iframeClass: 'xml-iframe',
         textWrapping: true,

+               lineNumbers: true,

         tabMode: 'spaces',
         indentUnit: 0,
         initCallback: function(editor) {
         tabMode: 'spaces',
         indentUnit: 0,
         initCallback: function(editor) {


@@ -736,7 +782,7 @@ $(function() {
                 event.preventDefault();
                 var params = eval("(" + $(this).attr('ui:action-params') + ")");
                 scriptletCenter.scriptlets[$(this).attr('ui:action')](editor, params);
                 event.preventDefault();
                 var params = eval("(" + $(this).attr('ui:action-params') + ")");
                 scriptletCenter.scriptlets[$(this).attr('ui:action')](editor, params);

-            });
+            });                        

 
             $('.toolbar select').change(function() {
                 var slug = $(this).val();
 
             $('.toolbar select').change(function() {
                 var slug = $(this).val();