Merge branch 'master' of https://github.com/angular-ui/ui-scroll

Author: dhilt

dist/ui-scroll.js

@@ -1,7 +1,7 @@
 /*!
  * angular-ui-scroll
  * https://github.com/angular-ui/ui-scroll.git
- * Version: 1.5.0 -- 2016-06-19T00:14:16.223Z
+ * Version: 1.5.0 -- 2016-06-19T00:30:40.294Z
  * License: MIT
  */
 
@@ -569,7 +569,7 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
 
   function link($scope, element, $attr, controllers, linker) {
 
-    var match = $attr.uiScroll.match(/^\s*(\w+)\s+in\s+([\w\.]+)\s*$/);
+    var match = $attr.uiScroll.match(/^\s*(\w+)\s+in\s+([(\w|\$)\.]+)\s*$/);
 
     if (!match) throw new Error('Expected uiScroll in form of \'_item_ in _datasource_\' but got \'' + $attr.uiScroll + '\'');