Merge branch 'master' of github.com:javve/list.js

docs/_includes/carbon.html

@@ -1,4 +1 @@
-<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div></div></div>
-<script type="text/javascript">
-  var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/51496/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);
-</script>
+<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=listjscom" id="_carbonads_js"></script>

docs/_sass/_carbonads.scss

@@ -1,5 +1,5 @@
 @keyframes fadein {
-  from { 
+  from {
     transform: translateY(100%);
     opacity: 0;
   }
@@ -9,7 +9,7 @@
   }
 }
 @-moz-keyframes fadein {
-  from { 
+  from {
     transform: translateY(100%);
     opacity: 0;
   }
@@ -19,7 +19,7 @@
   }
 }
 @-webkit-keyframes fadein {
-  from { 
+  from {
     transform: translateY(100%);
     opacity: 0;
   }
@@ -29,7 +29,7 @@
   }
 }
 @-ms-keyframes fadein {
-  from { 
+  from {
     transform: translateY(100%);
     opacity: 0;
   }
@@ -39,7 +39,7 @@
   }
 }
 @-o-keyframes fadein {
-  from { 
+  from {
     transform: translateY(100%);
     opacity: 0;
   }
@@ -49,23 +49,66 @@
   }
 }
 
-#carbonads-container {
+#carbonads {
   position: fixed;
   z-index: 10000;
-  right:0;
-  bottom:0;
-  opacity:0;
+  right: 0;
+  bottom: 0;
+  opacity: 0;
   transform: translateY(100%);
   -webkit-animation: fadein 1s 2s forwards;
-   -moz-animation: fadein 1s 2s forwards;
-    -ms-animation: fadein 1s 2s forwards;
-     -o-animation: fadein 1s 2s forwards;
-        animation: fadein 1s 2s forwards
+  -moz-animation: fadein 1s 2s forwards;
+  -ms-animation: fadein 1s 2s forwards;
+  -o-animation: fadein 1s 2s forwards;
+  animation: fadein 1s 2s forwards
 }
 
-.carbonad {
-  background-image:none !important;
-  background-color:rgba(253, 253, 253, 0.88) !important;
-  border:none !important;
-  border-top-left-radius: 5px !important;
+#carbonads {
+  display: block;
+  overflow: hidden;
+  padding: 1em;
+  background-color: hsla(0, 0%, 100%, .88);
+  max-width: 330px;
+  box-shadow: 0 0 1px 0 hsla(0, 0%, 0%, .6);
+  font-size: 14px;
+  border-top-left-radius: 4px;
+  line-height: 1.5;
+}
+
+#carbonads a {
+  text-decoration: none;
+}
+
+#carbonads span {
+  position: relative;
+  display: block;
+  overflow: hidden;
+}
+
+.carbon-img {
+  float: left;
+  margin-right: 1em;
+}
+
+.carbon-img img {
+  display: block;
+}
+
+.carbon-text {
+  display: block;
+  float: left;
+  max-width: calc(100% - 130px - 1em);
+  text-align: left;
+}
+
+.carbon-poweredby {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  display: block;
+  font-size: 10px;
+  color: hsl(0, 0%, 60%);
+  text-transform: uppercase;
+  line-height: 1;
+  letter-spacing: 1px;
 }

docs/docs/plugins/fuzzysearch.html

@@ -53,7 +53,7 @@ <h3>Implementation</h3>
 var options = {
   valueNames: [ 'name', 'category' ],
   plugins: [
-    ListFuzzySearch()
+    ListFuzzySearch(fuzzyOptions)
   ]
 };
 

src/pagination.js

@@ -82,7 +82,7 @@ module.exports = function(list) {
   return function(options) {
     var pagingList = new List(list.listContainer.id, {
       listClass: options.paginationClass || 'pagination',
-      item: "<li><a class='page' href='javascript:function Z(){Z=\"\"}Z()'></a></li>",
+      item: "<li><a class='page' href='#'></a></li>",
       valueNames: ['page', 'dotted'],
       searchClass: 'pagination-search-that-is-not-supposed-to-exist',
       sortClass: 'pagination-sort-that-is-not-supposed-to-exist'
@@ -92,7 +92,9 @@ module.exports = function(list) {
       var target = e.target || e.srcElement
         , page = list.utils.getAttribute(target, 'data-page')
         , i = list.utils.getAttribute(target, 'data-i');
-      list.show((i-1)*page + 1, page);
+      if(i){      
+        list.show((i-1)*page + 1, page);
+      }
     });
 
     list.on('updated', function() {