promethee 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 804cc3bc455b4945ced5e6151f14771df7a7399e
-  data.tar.gz: aee3f2d4c2a868c036be9fbdbfa08802274c30f5
+  metadata.gz: 344cfab642c4920d60f0c4f01ebc2c458d8c4315
+  data.tar.gz: c318a24462dad5f1d862d67da7eed55993619179
 SHA512:
-  metadata.gz: 2a8c2d082a13d2a82579f1be69bf8cc6184c4bc0b0e741235d797c57dfc26a99867e313c047efff02d52a50d901b46e2c775f3a92d5ce050c76f699c06c655fa
-  data.tar.gz: 2ac382cf161657f6329663edbff188c389fe0ff74d99262c4275edf17ac6d414746c3fea4240b74e1bd13d4c5b5ec8e6fb39345677c11dd5a1d9863d6153b416
+  metadata.gz: 3915d82040366a905af0e492163dfd4e383345dd652863ac6c83052208ddf029a6c1310085f21099851a136c5a6230d02ff4f8f6406043a9bc78c935a1946981
+  data.tar.gz: 064c728027dfd29262cda10402799cabb1db98de24dc3df8e1b28555f81b05a3dc92207393277671394200179a1f96b62337b4a6aaf32b30c536d6296a3d4f67

data/app/views/promethee/_edit.html.erb

@@ -143,7 +143,7 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
 
 <div class="promethee-loader">
   <div class="promethee-loader__inner">
-    <%= image_tag('loader.gif') %>
+    <%= image_tag 'loader.gif' %>
     Loading...
   </div>
 </div>

data/app/views/promethee/_localize.html.erb

@@ -25,6 +25,16 @@ promethee_data = Promethee::Data.new master_data, localization_data: localizatio
 
     $scope.summernoteConfig = summernoteConfig;
 
+    $scope.concatenateSearch = function() {
+      var search =  ''
+      angular.forEach($scope.component.children, function(child) {
+        if (child.type !== 'page' && child.attributes && child.attributes.search) {
+          search += child.attributes.search + ' ';
+        }
+      });
+      return search;
+    }
+
   }]);
 </script>
 

data/app/views/promethee/components/aside/_localize.html.erb

@@ -26,4 +26,6 @@
       </div>
     </div>
   </div>
+  
+  <pre class="hidden">{{component.attributes.search = ((component.attributes.visible_content | textContentFromHTML) + ' ' + (component.attributes.collapsed_content | textContentFromHTML))}}</pre>
 </script>

data/app/views/promethee/components/cover/_localize.html.erb

@@ -47,4 +47,7 @@
       </div>
     </div>
   </div>
+
+  <pre class="hidden">{{component.attributes.search = (component.attributes.title + ' ' + component.attributes.surtitle + ' ' + component.attributes.subtitle)}}</pre>
+
 </script>

data/app/views/promethee/components/image/_localize.html.erb

@@ -34,4 +34,6 @@
       </div>
     </div>
   </div>
+
+  <pre class="hidden">{{component.attributes.search = (component.attributes.caption + ' ' + component.attributes.alt)}}</pre>
 </script>

data/app/views/promethee/components/page/_localize.html.erb

@@ -28,4 +28,7 @@
       </div>
     </div>
   </div>
+
+  <pre class="hidden">{{component.attributes.search = concatenateSearch()}}</pre>
+
 </script>

data/app/views/promethee/components/text/_localize.html.erb

@@ -10,6 +10,7 @@
       <div class="col-md-6">
         <b>Text</b>
         <summernote config="summernoteConfig" ng-model="component.attributes.body"></summernote>
+        <pre class="hidden">{{component.attributes.search = (component.attributes.body | textContentFromHTML)}}</pre>
       </div>
     </div>
   </div>

data/app/views/promethee/utils/_text-content-from-html.html.erb

@@ -1,9 +1,17 @@
 <script>
   promethee.filter('textContentFromHTML', function() {
     return function(val) {
+      // Inner text has a problem with some whitespace/linebreak missing (at least h1, h2...)
+      // We fix it by adding whitespaces before each closing tag.
+      var valWithSpaces = val.split('</').join(' </');
+      // Create a blank div (supposed to be garbage collected afterwards)
       var element = document.createElement('div');
-      element.innerHTML = val;
-      return element.innerText;
+      // Add value as html
+      element.innerHTML = valWithSpaces;
+      // Use textContent or innerText to convert to plain text
+      // http://perfectionkills.com/the-poor-misunderstood-innerText/
+      var text = element.textContent || element.innerText
+      return text;
     }
   });
 </script>

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.5.3'
+    VERSION = '1.5.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Julien Dargelos
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -359,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Bring fire to your page