Merge pull request #16 from JarvusInnovations/develop

emergence-skeleton-v2 v2.0.2
JarvusInnovations · Apr 7, 2018 · 3cd4067 · 3cd4067
2 parents 4421e05 + 87f5fba
commit 3cd4067
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/html-templates/includes/site.header-bottom.tpl b/html-templates/includes/site.header-bottom.tpl
@@ -1,6 +1,6 @@
 <div class="mobile-only nav-link-ct"><a href="#nav">Menu</a></div>
 {include includes/site.nav.tpl mobileHidden=true}
 
-<form class="search-form site-search mobile-hidden" action="/search">
+<form class="search-form site-search js-site-search mobile-hidden" action="/search">
     <input class="search-field" name="q" type="search" placeholder="Search This Site" required>
 </form>
diff --git a/php-classes/Emergence/People/RegistrationRequestHandler.php b/php-classes/Emergence/People/RegistrationRequestHandler.php
@@ -41,7 +41,7 @@ public static function handleRequest()
             case false:
                 return static::handleRegistrationRequest();
             default:
-                return static::throwNotFoundException();
+                return static::throwNotFoundError();
         }
     }
 

diff --git a/sencha-workspace/pages/src/Common.js b/sencha-workspace/pages/src/Common.js
@@ -19,7 +19,7 @@ Ext.define('Site.Common', {
 
         // site search
         me.siteSearch = Ext.create('Site.widget.Search', {
-            searchForm: body.down('.search-form.site-search')
+            searchForm: body.down('.js-site-search')
         });
     }
 });
diff --git a/sencha-workspace/pages/src/widget/Search.js b/sencha-workspace/pages/src/widget/Search.js
@@ -172,7 +172,7 @@ Ext.define('Site.widget.Search', {
         me.lastTypedQuery = query;
 
         if (t.value.length >= me.getMinChars()) {
-            me.getSearchForm().addCls('waiting');
+            me.getSearchForm().addCls('is-waiting');
             resultsCt.show();
             me.searchTask.delay(me.getSearchDelay());
         } else {
@@ -202,7 +202,7 @@ Ext.define('Site.widget.Search', {
             resultsTpl = me.getResultsTpl(),
             searchForm = me.getSearchForm();
 
-        searchForm.removeCls('loading');
+        searchForm.removeCls('is-loading');
 
         if (responseData.totalResults) {
             searchForm.removeCls(noResultsCls);
@@ -223,7 +223,7 @@ Ext.define('Site.widget.Search', {
             searchForm = me.getSearchForm(),
             query = fieldEl && fieldEl.getValue();
 
-        searchForm.removeCls('waiting');
+        searchForm.removeCls('is-waiting');
 
         // abort any existing search
         me.searchConnection.abort();
@@ -232,7 +232,7 @@ Ext.define('Site.widget.Search', {
             return;
         }
 
-        searchForm.addCls('loading');
+        searchForm.addCls('is-loading');
         me.searchConnection.request({
             params: {
                 q: query

diff --git a/site-root/sass/skeleton/modules/_search.scss b/site-root/sass/skeleton/modules/_search.scss
@@ -38,13 +38,13 @@
         }
     }
 
-    &.waiting {
+    &.is-waiting {
         .results-group {
             opacity: .5;
         }
     }
 
-    &.loading {
+    &.is-loading {
         .search-results {
             background-image: image-url('loaders/spinner.gif');
             background-position: center .75em;