build 930: fixed listPages filter

Signed-off-by: Fabian Vogelsteller <fabian@frozeman.de>
frozeman · Jun 14, 2012 · 2bb7c0b · 2bb7c0b
1 parent f6b369f
commit 2bb7c0b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,7 +1,7 @@
 feindura - Flat File Content Management System
 Version
 2.0
-Build 930
+Build 931
 ==================================================
 Copyright (C) Fabian Vogelsteller [frozeman.de]
 published under the GNU General Public License version 3
@@ -24,6 +24,7 @@ ChangeLog:
 
 2.0
 
+  build 930: fixed listPages filter
   build 930: fixed frontendEditing styles and frontendEditing replaceContent function
   build 929: small fix when no configs exist
   build 928: fixes and add new CKEditor version

diff --git a/library/javascripts/content.js b/library/javascripts/content.js
@@ -797,11 +797,11 @@ window.addEvent('domready', function() {
       if(filter) {
 
         $$('div.block.listPages li').each(function(page) {
-          if(page.getChildren('div.name a')[0] !== null && !page.getChildren('div.name a')[0].get('text').toLowerCase().contains(filter.toLowerCase()))
-            page.setStyle('display','none');
-          else {
+          if(typeOf(page.getChildren('div.name a')[0]) !== 'null' && page.getChildren('div.name a')[0].get('text').toLowerCase().contains(filter.toLowerCase())) {
             page.setStyle('display','block');
             filteredPages.push(page);
+          } else {
+            page.setStyle('display','none');
           }
         });
 
@@ -810,7 +810,7 @@ window.addEvent('domready', function() {
           var isEmpty = true;
 
           block.getElements('li').each(function(li){
-            if(li.getStyle('display') == 'block')
+            if(li.getStyle('display') == 'block' && typeOf(li.getChildren('div.emptyList')[0]) == 'null')
               isEmpty = false;
           });
 

diff --git a/library/views/listPages.php b/library/views/listPages.php
@@ -220,7 +220,7 @@
         : '';
 
       // -> generate pageDate for toolTip
-      $pageTitle_pageDate = showPageDate($pageContent);
+      $pageTitle_pageDate = showPageDate($pageContent).'[br]';
 
       // -> generate tags for toolTip
       $localizedTags = GeneralFunctions::getLocalized($pageContent,'tags');