You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2019/11/17 15:06:44 UTC

[sling-org-apache-sling-app-cms] branch master updated (8bb7c77 -> fe0e740)

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.


    from 8bb7c77  Fixing search alignment issues for SLING-8836
     new 237e978  Fixing the loading of OpenSans after refactoring the gulp process
     new fe0e740  Only support search if available

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ui/gulpfile.js                     | 2 +-
 ui/src/main/frontend/js/cms.nav.js | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)


[sling-org-apache-sling-app-cms] 02/02: Only support search if available

Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit fe0e74027b9a5c4295b704bd589edeb753a49215
Author: Dan Klco <dk...@apache.org>
AuthorDate: Sun Nov 17 10:06:25 2019 -0500

    Only support search if available
---
 ui/src/main/frontend/js/cms.nav.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/src/main/frontend/js/cms.nav.js b/ui/src/main/frontend/js/cms.nav.js
index 461531f..743db79 100644
--- a/ui/src/main/frontend/js/cms.nav.js
+++ b/ui/src/main/frontend/js/cms.nav.js
@@ -59,9 +59,10 @@
                             }
                         });
                     };
-                search.addEventListener('keyup', filter);
-                search.addEventListener('change', filter);
-                
+                if(search){
+                    search.addEventListener('keyup', filter);
+                    search.addEventListener('change', filter);
+                }
                 if (resourceParam) {
                     cnav.querySelectorAll('.contentnav__item').forEach(function (item) {
                         if (item.querySelector('*[data-value="' + resourceParam + '"]')) {


[sling-org-apache-sling-app-cms] 01/02: Fixing the loading of OpenSans after refactoring the gulp process

Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit 237e9785f55a7030d265a116f6c4d023a68e0289
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Nov 15 09:02:56 2019 -0500

    Fixing the loading of OpenSans after refactoring the gulp process
---
 ui/gulpfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/gulpfile.js b/ui/gulpfile.js
index fc6ec3b..facd7a6 100755
--- a/ui/gulpfile.js
+++ b/ui/gulpfile.js
@@ -74,7 +74,7 @@ gulp.task('cms-assets', function() {
 });
 
 gulp.task('cms-fonts', function() {
-    return gulp.src(['./node_modules/jam-icons/fonts/*','./src/fonts/*'])
+    return gulp.src(['./node_modules/jam-icons/fonts/*',srcDir('fonts/*')])
         .pipe(gulp.dest(distDir('jcr_root/static/clientlibs/sling-cms/fonts')));
 });