Commit 3916a48

committed

Single

1 parent 642856a commit 3916a48Copy full SHA for 3916a48

File tree

+22

-27

lines changed

+22

-27

lines changed

Lines changed: 17 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,23 @@`
	`1`	`+app.controller('dashboardCtr', function($scope,$mdDialog) {`
`1`	`2`
	`3`	`+console.log("dashboard");`
`2`	`4`
	`5`	`+$scope.showAdvanced = function(ev,presentData) {`
	`6`	`+ console.log(presentData);`
	`7`	`+ $mdDialog.show({`
	`8`	`+ templateUrl: 'templates/popup.html',`
	`9`	`+ parent: angular.element(document.body),`
	`10`	`+ targetEvent: ev,`
	`11`	`+ clickOutsideToClose:true`
	`12`	`+ })}`
`3`	`13`
`4`		`-app.controller('dashboardCtr', function($scope,$mdDialog) {`
`5`		`- $scope.imagePath = 'assets/images/galaxy-s5-large.jpg';`
	`14`	`+ $scope.cancel = function() {`
	`15`	`+ $mdDialog.cancel();`
	`16`	`+ }`
`6`	`17`
`7`		`-//console.log("Rakesh");`
	`18`	`+function dialogCtr($scope, $mdDialog, info) {`
	`19`	`+ // Assigned from construction <code>locals</code> options...`
	`20`	`+ $scope.info = info;`
	`21`	`+ }`
`8`	`22`
`9`	`23`	`});`

Lines changed: 0 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,24 +27,6 @@ app.controller('homeCtr', function($scope, $mdSidenav, readJsonData, $state, $md`
`27`	`27`
`28`	`28`	`$state.go('home.dashboard');`
`29`	`29`
`30`		`-$scope.showAdvanced = function(ev) {`
`31`		`- $mdDialog.show({`
`32`		`- //controller: 'dialogCtr',`
`33`		`- //locals : {info : data},`
`34`		`- templateUrl: 'templates/popup.html',`
`35`		`- parent: angular.element(document.body),`
`36`		`- targetEvent: ev,`
`37`		`- clickOutsideToClose:true`
`38`		`- })}`
`39`		`-`
`40`		`- $scope.cancel = function() {`
`41`		`- $mdDialog.cancel();`
`42`		`- }`
`43`		`-`
`44`		`-function dialogCtr($scope, $mdDialog, info) {`
`45`		`- // Assigned from construction <code>locals</code> options...`
`46`		`- $scope.info = info;`
`47`		`- }`
`48`	`30`
`49`	`31`	`});`
`50`	`32`	`// var e = document.getElementById(id);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<div layout="row" layout-wrap >`
`2`		`- <md-card ng-repeat="file in data" ng-controller="dashboardCtr" class="card" flex-gt-sm="30" >`
	`2`	`+ <md-card ng-repeat="file in data" aria-label="" class="card" flex-gt-sm="30" ng-controller="dashboardCtr">`
`3`	`3`	`<md-card-title>`
`4`	`4`	`<md-card-title-text>`
`5`	`5`	`<p>{{file.name}}</p>`
`@@ -12,7 +12,7 @@`
`12`	`12`	`</md-card-content>`
`13`	`13`	`<md-card-actions layout="row" layout-align="end center">`
`14`	`14`	`<p>${{file.price}}</p>`
`15`		`- <md-button ng-click="showAdvanced($event)">Buy</md-button>`
	`15`	`+ <md-button ng-click="showAdvanced($event,file)">Buy</md-button>`
`16`	`16`	`</md-card-actions>`
`17`	`17`	`</md-card>`
`18`	`18`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<md-dialog ng-controller="homeCtr">`
	`1`	`+<md-dialog aria-label="Shubham" ng-controller="dashboardCtr">`
`2`	`2`	`<form>`
`3`	`3`	`<md-toolbar>`
`4`	`4`	`<div class="md-toolbar-tools">`
`@@ -12,9 +12,8 @@ <h2>Phones</h2>`
`12`	`12`
`13`	`13`	`<md-dialog-content>`
`14`	`14`	`<div class="md-dialog-content">`
`15`		`-`
`16`		`- <img src="assets/images/galaxy-s5-large.jpg">`
`17`		`-`
	`15`	`+ {{presentData.image.large}}`
	`16`	`+ <!-- <img src="assets/images/galaxy-s5-large.jpg"> -->`
`18`	`17`	`</div>`
`19`	`18`	`</md-dialog-content>`
`20`	`19`

Comments

(0)