Merge pull request #593 from fermionic/20130127-tinymce-update-and-fixes

[friendica.git] / view / theme / frost / js / main.js

diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js
index 03ffd0381e914fb1b6aaf58fcae502774eaceb90..1c865ac3ae7c64d60dcaeedf4695d3f28e15301a 100644 (file)
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@@ -1,20 +1,32 @@
 
-  function openClose(theID) {
-    if(document.getElementById(theID).style.display == "block") { 
-      document.getElementById(theID).style.display = "none" 
-    }
-    else { 
-      document.getElementById(theID).style.display = "block" 
-    } 
-  }
+       function openClose(listID) {
+/*             if(document.getElementById(theID).style.display == "block") { 
+                       document.getElementById(theID).style.display = "none" 
+               }
+               else { 
+                       document.getElementById(theID).style.display = "block" 
+               }*/
+               listID = "#" + listID.replace(/:/g, "\\:");
+               listID = listID.replace(/\./g, "\\.");
+               listID = listID.replace(/@/g, "\\@");
+
+               if($j(listID).is(":visible")) {
+                       $j(listID).hide();
+                       $j(listID+"-wrapper").show();
+               }
+               else {
+                       $j(listID).show();
+                       $j(listID+"-wrapper").hide();
+               }
+       }
 
-  function openMenu(theID) {
-      document.getElementById(theID).style.display = "block" 
-  }
+       function openMenu(theID) {
+               document.getElementById(theID).style.display = "block" 
+       }
 
-  function closeMenu(theID) {
-      document.getElementById(theID).style.display = "none" 
-  }
+       function closeMenu(theID) {
+               document.getElementById(theID).style.display = "none" 
+       }
 
 
 
@@ -167,6 +179,11 @@
                                        html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
                                        nnm.append(html);
                                });
+
+                               $j("img[data-src]", nnm).each(function(i, el){
+                                       // Add src attribute for images with a data-src attribute
+                                       $j(el).attr('src', $j(el).data("src"));
+                               });
                        }
                        notif = eNotif.attr('count');
                        if (notif>0){
@@ -665,9 +682,9 @@ function setupFieldRichtext(){
                entity_encoding : "raw",
                add_unload_trigger : false,
                remove_linebreaks : false,
-               force_p_newlines : false,
-               force_br_newlines : true,
-               forced_root_block : '',
+               //force_p_newlines : false,
+               //force_br_newlines : true,
+               forced_root_block : 'div',
                convert_urls: false,
                content_css: baseurl+"/view/custom_tinymce.css",
                theme_advanced_path : false,