Merge branch 'master' of github.com:jadjoubran/laravel5-angular-material-starter

jadjoubran · jadjoubran · commit b19c89b11c7a · 2016-04-16T12:30:23.000+03:00
diff --git a/angular/services/dialog.service.js b/angular/services/dialog.service.js
@@ -14,7 +14,7 @@ export class DialogService {
             options = {};
         }
 
-        options.templateUrl = './views/dialogs/' + template + '/' + template + 'dialog.html'
+        options.templateUrl = './views/dialogs/' + template + '/' + template + '.dialog.html'
 
         return this.$mdDialog.show(options);
     }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export class DialogService {`
`14`	`14`	`options = {};`
`15`	`15`	`}`
`16`	`16`
`17`		`- options.templateUrl = './views/dialogs/' + template + '/' + template + 'dialog.html'`
	`17`	`+ options.templateUrl = './views/dialogs/' + template + '/' + template + '.dialog.html'`
`18`	`18`
`19`	`19`	`return this.$mdDialog.show(options);`
`20`	`20`	`}`