Merge remote-tracking branch 'remotes/angular-ui/master'

Author: wuliupo

Diff for: src/sortable.js

@@ -23,8 +23,8 @@ angular.module('ui.sortable', [])
           var savedNodes;
 
           function combineCallbacks(first, second){
-            var firstIsFunc = first && (typeof first === 'function');
-            var secondIsFunc = second && (typeof second === 'function');
+            var firstIsFunc = typeof first === 'function';
+            var secondIsFunc = typeof second === 'function';
             if(firstIsFunc && secondIsFunc) {
               return function() {
                 first.apply(this, arguments);
@@ -62,12 +62,8 @@ angular.module('ui.sortable', [])
             }
 
             // patch the options that need to have values set
-            if (!value) {
-              if (key === 'items') {
-                value = uiSortableConfig.items;
-              } else if (key === 'ui-model-items') {
-                value = uiSortableConfig.items;
-              }
+            if (!value && (key === 'items' || key === 'ui-model-items')) {
+              value = uiSortableConfig.items;
             }
 
             return value;