Skip to content

Commit 6104c70

Browse files
author
K.C. Hunter
committed
Part 10 video files added.
1 parent 55d6da9 commit 6104c70

3 files changed

Lines changed: 39 additions & 8 deletions

File tree

src/angularjstutorial.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,14 @@ var app = angular.module("isolateApp", []);
157157

158158
app.controller("AppCtrl", function ($scope, $element)
159159
{
160-
$scope.useMove = function (obj)
160+
$scope.getMove = function (name, movetype, move)
161161
{
162-
console.log(obj);
162+
console.log('' + name + ' performed a ' + movetype +
163+
' ' + move );
163164
}
165+
166+
$scope.movetypes = ['Finisher', 'Offensive Move', 'Defensive Move'];
167+
$scope.movetype = $scope.movetypes[0];
164168
})
165169

166170
.directive("character", function ()
@@ -169,8 +173,11 @@ app.controller("AppCtrl", function ($scope, $element)
169173
restrict: 'E',
170174
scope: {
171175
name: "@",
172-
image: "@"
176+
image: "@",
177+
movetype: "=",
178+
useMove: '&'
173179
},
174-
templateUrl: 'partials/shield_isolate.html'
180+
templateUrl: 'partials/shield_isolate.html',
181+
controller: 'AppCtrl'
175182
}
176183
})

src/partials/shield_isolate.html

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,21 @@
77
</figure>
88
</div>
99
</div>
10+
<div>Select Move Type:
11+
<select data-ng-model="movetype"
12+
data-ng-options="movetype for movetype in movetypes">
13+
</select>
14+
</div>
15+
<div>Move:
16+
<input type="text"
17+
data-ng-model="value"
18+
class="form-control">
19+
</div>
20+
<div class="panel-footer clearfix">
21+
<div class="btn btn-primary"
22+
data-ng-click="useMove({name:name, movetype:movetype, move:value})">
23+
Action!
24+
</div>
25+
</div>
26+
1027
</div>

src/resources/js/isolateScope.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@ var app = angular.module("isolateApp", []);
33

44
app.controller("AppCtrl", function ($scope, $element)
55
{
6-
$scope.useMove = function (obj)
6+
$scope.getMove = function (name, movetype, move)
77
{
8-
console.log(obj);
8+
console.log('' + name + ' performed a ' + movetype +
9+
' ' + move );
910
}
11+
12+
$scope.movetypes = ['Finisher', 'Offensive Move', 'Defensive Move'];
13+
$scope.movetype = $scope.movetypes[0];
1014
})
1115

1216
.directive("character", function ()
@@ -15,8 +19,11 @@ app.controller("AppCtrl", function ($scope, $element)
1519
restrict: 'E',
1620
scope: {
1721
name: "@",
18-
image: "@"
22+
image: "@",
23+
movetype: "=",
24+
useMove: '&'
1925
},
20-
templateUrl: 'partials/shield_isolate.html'
26+
templateUrl: 'partials/shield_isolate.html',
27+
controller: 'AppCtrl'
2128
}
2229
})

0 commit comments

Comments
 (0)