This repository was archived by the owner on Apr 12, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +23
-4
lines changed Expand file tree Collapse file tree 2 files changed +23
-4
lines changed Original file line number Diff line number Diff line change @@ -141,10 +141,14 @@ function $RouteProvider() {
141141 * Adds a new route definition to the `$route` service.
142142 */
143143 this . when = function ( path , route ) {
144+ //copy original route object to preserve params inherited from proto chain
145+ var routeCopy = angular . copy ( route ) ;
146+ if ( angular . isUndefined ( routeCopy . reloadOnSearch ) ) {
147+ routeCopy . reloadOnSearch = true ;
148+ }
144149 routes [ path ] = angular . extend (
145- { reloadOnSearch : true } ,
146- route ,
147- path && pathRegExp ( path , route )
150+ routeCopy ,
151+ path && pathRegExp ( path , routeCopy )
148152 ) ;
149153
150154 // create redirection for trailing slashes
@@ -155,7 +159,7 @@ function $RouteProvider() {
155159
156160 routes [ redirectPath ] = angular . extend (
157161 { redirectTo : path } ,
158- pathRegExp ( redirectPath , route )
162+ pathRegExp ( redirectPath , routeCopy )
159163 ) ;
160164 }
161165
Original file line number Diff line number Diff line change @@ -294,6 +294,21 @@ describe('$route', function() {
294294 $rootScope . $digest ( ) ;
295295 expect ( $route . current ) . toBeDefined ( ) ;
296296 } ) ) ;
297+
298+ it ( "should use route params inherited from prototype chain" , function ( ) {
299+ function BaseRoute ( ) { }
300+ BaseRoute . prototype . templateUrl = 'foo.html' ;
301+
302+ module ( function ( $routeProvider ) {
303+ $routeProvider . when ( '/foo' , new BaseRoute ) ;
304+ } ) ;
305+
306+ inject ( function ( $route , $location , $rootScope ) {
307+ $location . path ( '/foo' ) ;
308+ $rootScope . $digest ( ) ;
309+ expect ( $route . current . templateUrl ) . toBe ( 'foo.html' ) ;
310+ } ) ;
311+ } ) ;
297312 } ) ;
298313
299314
You can’t perform that action at this time.
0 commit comments