Merge branch 'async-resource-fix'

Conflicts:
	dist/select.css
	dist/select.css.min.css
	dist/select.js
	dist/select.js.min.js

Author: tvervest

dist/select.css

@@ -1,7 +1,7 @@
 /*!
  * ui-select
  * http://github.com/angular-ui/ui-select
- * Version: 0.7.0 - 2014-10-06T10:45:08.128Z
+ * Version: 0.7.0 - 2014-10-06T11:45:24.369Z
  * License: MIT
  */
 

dist/select.css.min.css

@@ -1,7 +1,7 @@
 /*!
  * ui-select
  * http://github.com/angular-ui/ui-select
- * Version: 0.7.0 - 2014-10-06T10:45:08.127Z
+ * Version: 0.7.0 - 2014-10-06T11:45:24.366Z
  * License: MIT
  */
 
@@ -271,6 +271,7 @@
         $scope.$watchCollection('$select.selected', function(selectedItems){
           if (!selectedItems) return;
           var data = ctrl.parserResult.source($scope);
+          if (!data) return;
           var filteredItems = data.filter(function(i) {return selectedItems.indexOf(i) < 0;});
           setItemsFn(filteredItems);
         });
@@ -376,7 +377,7 @@
 
     ctrl.getPlaceholder = function(){
       //Refactor single?
-      if(ctrl.multiple && ctrl.selected.length) return;
+      if(ctrl.multiple && (ctrl.selected === undefined || ctrl.selected.length)) return;
       return ctrl.placeholder;
     };
 
@@ -591,11 +592,13 @@
               result;
           if ($select.multiple){
             var resultMultiple = [];
-            for (var j = inputValue.length - 1; j >= 0; j--) {
-              locals = {};
-              locals[$select.parserResult.itemName] = inputValue[j];
-              result = $select.parserResult.modelMapper(scope, locals);
-              resultMultiple.unshift(result);
+            if (inputValue) {
+              for (var j = inputValue.length - 1; j >= 0; j--) {
+                locals = {};
+                locals[$select.parserResult.itemName] = inputValue[j];
+                result = $select.parserResult.modelMapper(scope, locals);
+                resultMultiple.unshift(result);
+              }
             }
             return resultMultiple;
           }else{