Merge branch 'dev'

Author: freearhey

README.md

@@ -17,7 +17,7 @@ Simply include `vue2-filters` after Vue and it will install itself automatically
 
 ```html
 <script src="https://unpkg.com/vue/dist/vue.js"></script>
-<script src="https://cdn.jsdelivr.net/vue2-filters/0.1.7/vue2-filters.min.js"></script>
+<script src="https://cdn.jsdelivr.net/vue2-filters/0.1.8/vue2-filters.min.js"></script>
 ```
 
 ### NPM

dist/vue2-filters.js

@@ -541,7 +541,7 @@ function lowercase (value) {
  */
 
 function placeholder (input, property) {
-  return ( input === undefined || input === '' ) ? property : input;
+  return ( input === undefined || input === '' || input === null ) ? property : input;
 }
 
 /* harmony default export */ exports["a"] = placeholder;

dist/vue2-filters.min.js

@@ -1,6 +1,6 @@
 {
   "name": "vue2-filters",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "The list of standard filters Vue.js 1.* adapted for use in Vue.js 2.*",
   "main": "dist/vue2-filters.js",
   "scripts": {

package.json

@@ -6,7 +6,7 @@
  */
 
 function placeholder (input, property) {
-  return ( input === undefined || input === '' ) ? property : input;
+  return ( input === undefined || input === '' || input === null ) ? property : input;
 }
 
 export default placeholder

src/string/placeholder.js

@@ -26,7 +26,10 @@ describe('Filters', function() {
   it('placeholder', function() {
     var filter = stringFilters.placeholder
     expect(filter('sometext', 'placeholder text')).toBe('sometext')
+    expect(filter(1234, 'placeholder text')).toBe(1234)
     expect(filter('', 'placeholder text')).toBe('placeholder text')
+    expect(filter(undefined, 'placeholder text')).toBe('placeholder text')
+    expect(filter(null, 'placeholder text')).toBe('placeholder text')
   })
 
   it('currency', function() {