Merge branch 'develop'

Author: cableman

modules/loop_search_node/loop_search_node.module

@@ -21,6 +21,39 @@ function loop_search_node_menu() {
   return $items;
 }
 
+/**
+ * Implements hook_comment_insert().
+ *
+ * Update search index based on comment changes.
+ */
+function loop_search_node_comment_insert($comment) {
+  if ($comment->nid) {
+    search_api_track_item_change('node', array($comment->nid));
+  }
+}
+
+/**
+ * Implements hook_comment_update().
+ *
+ * Update search index based on comment changes.
+ */
+function loop_search_node_comment_update($comment) {
+  if ($comment->nid) {
+    search_api_track_item_change('node', array($comment->nid));
+  }
+}
+
+/**
+ * Implements hook_comment_delete().
+ *
+ * Update search index based on comment changes.
+ */
+function loop_search_node_comment_delete($comment) {
+  if ($comment->nid) {
+    search_api_track_item_change('node', array($comment->nid));
+  }
+}
+
 /**
  * Menu callback that generates post node add form.
  *
@@ -133,7 +166,9 @@ function loop_search_node_js_alter(&$javascript) {
   }
 }
 
-
+/**
+ * Implements hook_local_rebuild_js_alter().
+ */
 function loop_search_node_local_rebuild_js_alter(&$translations, $language) {
   // Construct the array for JavaScript translations.
   // Only add strings with a translation to the translations array.

modules/loop_search_node_settings/loop_search_node_settings.module

@@ -16,6 +16,19 @@ function loop_search_node_settings_search_node_page_configuration_alter(&$conf,
     'field' => 'type',
     'name' => 'Type',
     'type' => 'or',
-    'terms' => array(),
+    'terms' => array(
+      'external_sources' => array(
+        'value' => 'external_sources',
+      ),
+      'loop_documents_document' => array(
+        'value' => 'loop_documents_document',
+      ),
+      'loop_documents_collection' => array(
+        'value' => 'loop_documents_collection',
+      ),
+      'post' => array(
+        'value' => 'post',
+      ),
+    ),
   );
 }

themes/loop/templates/search/angular/pager.html

@@ -4,6 +4,7 @@
        class="pager"
        hide-if-empty="true"
        page="pager.page + 1"
+       page-size="pager.size"
        total="pager.max"
        show-prev-next="true"
        show-first-last="true"