@@ -15,25 +15,28 @@ export default DS.Model.extend({
1515 */
1616 filePath : computed ( 'fileName' , {
1717 get ( ) {
18- var fileName = this . fileName || '' ;
18+ let fileName = this . fileName || '' ;
19+ let filePath = '' ;
1920
2021 // If the file name has an escaped `.`, we're using the new version of path
2122 // encoding that supports multiple periods in a path.
2223 // If not, we assume the last period separates the file ending and the rest are `/`s.
2324 // Required for back compat.
2425 // Ref: https://github.com/ember-cli/ember-twiddle/issues/658
25- var hasEscapedPeriod = / \\ \. / . test ( fileName ) ;
26+ let hasEscapedPeriod = / \\ \. / . test ( fileName ) ;
2627 if ( hasEscapedPeriod ) {
27- return fileName . replace ( / [ ^ \\ ] \. / gi, '/' ) . replace ( / \\ \. / gi, '.' ) ;
28+ filePath = fileName . replace ( / ( [ ^ \\ ] ) \. / gi, "$1/" ) . replace ( / \\ \. / gi, '.' ) ;
2829 }
2930 else {
30- var parts = fileName . split ( '.' ) ;
31- return parts . slice ( 0 , - 1 ) . join ( '/' ) + '.' + parts . slice ( - 1 ) ;
31+ let parts = fileName . split ( '.' ) ;
32+ filePath = parts . slice ( 0 , - 1 ) . join ( '/' ) + '.' + parts . slice ( - 1 ) ;
3233 }
34+ return filePath ;
3335 } ,
3436
3537 set ( key , value ) {
36- this . set ( 'fileName' , value . replace ( / \. / gi, '\\.' ) . replace ( / \/ / gi, '.' ) ) ;
38+ let fileName = value . replace ( / \. / gi, '\\.' ) . replace ( / \/ / gi, '.' ) ;
39+ this . set ( 'fileName' , fileName ) ;
3740 return value ;
3841 }
3942 } ) ,
0 commit comments