merge to trunk all changes from 36817 until 37378 under the packages: polymer,

pkg/template_binding/lib/src/mustache_tokens.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library template_binding.src.mustache_tokens;
 
 import 'package:observe/observe.dart';
 
 // Dart note: this was added to decouple the parse function below from the rest
 // of template_binding. This allows using this code in command-line tools as
@@ skipping 98 matching lines @@
         tokens.add(s.substring(lastIndex)); // TEXT
         break;
       }
 
       if (tokens == null) tokens = [];
       tokens.add(s.substring(lastIndex, startIndex)); // TEXT
       var pathString = s.substring(startIndex + 2, endIndex).trim();
       tokens.add(oneTime); // ONETIME?
       onlyOneTime = onlyOneTime && oneTime;
       var delegateFn = fnFactory == null ? null : fnFactory(pathString);
+      // Don't try to parse the expression if there's a prepareBinding function
       if (delegateFn == null) {
         tokens.add(new PropertyPath(pathString)); // PATH
       } else {
         tokens.add(null);
       }
       tokens.add(delegateFn); // DELEGATE_FN
 
       lastIndex = endIndex + 2;
     }
 
@@ skipping 14 matching lines @@
     var newValue = new StringBuffer(getText(0));
     int len = this.length;
     for (var i = 0; i < len; i++) {
       var value = values[i];
       if (value != null) newValue.write(value);
       newValue.write(getText(i + 1));
     }
     return newValue.toString();
   }
 }