diff --git a/bower.json b/bower.json index b8c3685c..0f29e77f 100644 --- a/bower.json +++ b/bower.json @@ -2,11 +2,11 @@ "name": "stf", "version": "0.1.0", "dependencies": { - "angular": "~1.3.0-beta.12", - "angular-route": "~1.3.0-beta.12", - "angular-sanitize": "~1.3.0-beta.12", - "angular-animate": "~1.3.0-beta.12", - "angular-touch": "~1.3.0-beta.12", + "angular": "~1.3.0-beta.13", + "angular-route": "~1.3.0-beta.13", + "angular-sanitize": "~1.3.0-beta.13", + "angular-animate": "~1.3.0-beta.13", + "angular-touch": "~1.3.0-beta.13", "se7en-bootstrap-3": "git@ghe.amb.ca.local:stf/se7en-bootstrap-3.git#46b7dd0792cfdc66bf01e351cd680de88740d60c", "socket.io-client": "~1.0.4", "lodash": "~2.4.1", @@ -44,8 +44,8 @@ }, "private": true, "resolutions": { - "angular": "~1.3.0-beta.12", - "angular-sanitize": "~1.3.0-beta.12", - "angular-touch": "~1.3.0-beta.12" + "angular": "~1.3.0-beta.13", + "angular-sanitize": "~1.3.0-beta.13", + "angular-touch": "~1.3.0-beta.13" } } diff --git a/res/app/control-panes/dashboard/upload/activities/activities.jade b/res/app/control-panes/dashboard/upload/activities/activities.jade index 82dc3ef0..62f3070d 100644 --- a/res/app/control-panes/dashboard/upload/activities/activities.jade +++ b/res/app/control-panes/dashboard/upload/activities/activities.jade @@ -6,27 +6,42 @@ div(ng-controller='ActivitiesCtrl') td(translate) Package td input.form-control(type='text', placeholder='', ng-model='selectedPackageName', - typeahead='packageName for packageName in packageNames') + list='packageList') + datalist(id='packageList') + option(ng-repeat='packageName in packageNames', ng-value='packageName') + //typeahead='packageName for packageName in packageNames') tr td(translate) Activity td input.form-control(type='text', placeholder='', ng-model='selectedActivityName', - typeahead='activityName for activityName in activityNames') + list='activityList') + datalist(id='activityList') + option(ng-repeat='activityName in activityNames', ng-value='activityName') + //typeahead='activityName for activityName in activityNames') tr td(translate) Action td input.form-control(type='text', placeholder='', ng-model='selectedAction', - typeahead='action for action in activityActions') + list='actionList') + datalist(id='actionList') + option(ng-repeat='action in activityActions', ng-value='action') + //typeahead='action for action in activityActions') tr td(translate) Category td input.form-control(type='text', placeholder='', ng-model='selectedCategory', - typeahead='category for category in activityCategories') + list='categoryList') + datalist(id='categoryList') + option(ng-repeat='category in activityCategories', ng-value='category') + //typeahead='category for category in activityCategories') tr td(translate) Data td input.form-control(type='text', placeholder='', ng-model='selectedData', - typeahead='data for data in activityData', id='selectedData') + list='dataList') + datalist(id='dataList') + option(ng-repeat='data in activityData', ng-value='data') + //typeahead='data for data in activityData', id='selectedData') button.btn.btn-sm.btn-primary-outline(ng-click='runActivity()').pull-right i.fa.fa-play