Skip to content

Commit 9164f91

Browse files
CLC-4379 - Upgrade to AngularJS 1.3.0
https://jira.ets.berkeley.edu/jira/browse/CLC-4379 http://angularjs.blogspot.com/2014/10/angularjs-130-superluminal-nudge.html https://docs.angularjs.org/guide/migration#migrating-from-1-2-to-1-3 QA Focus: * Datepicker * Tasks - setting completed /uncompleted angular/angular.js#8041 * Watch the developer console in the browsers for new errors / warnings
1 parent 2f276b8 commit 9164f91

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ gem 'icalendar', '~> 2.2.0'
101101
##################
102102

103103
# Our very own library for angular dependency!
104-
gem 'angular-gem', '1.2.25'
104+
gem 'angular-gem', '1.3.0'
105105

106106
# Datepicker
107107
gem 'pikaday-gem', '~> 1.2.0'

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ GEM
7777
thread_safe (~> 0.1)
7878
tzinfo (~> 1.1)
7979
addressable (2.3.6)
80-
angular-gem (1.2.25)
80+
angular-gem (1.3.0)
8181
coffee-script (~> 2.2)
8282
railties (~> 4.0)
8383
angular-rails-templates (0.1.3)
@@ -472,7 +472,7 @@ DEPENDENCIES
472472
activerecord-session_store (~> 0.1.0)
473473
activeresource (~> 4.0.0)
474474
addressable (~> 2.3.4)
475-
angular-gem (= 1.2.25)
475+
angular-gem (= 1.3.0)
476476
angular-rails-templates (~> 0.1.3)
477477
bootstrap-sass (~> 3.2.0.2)
478478
bundler (~> 1.7.0)

app/assets/templates/dashboard_task_loop.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
data-ng-click="api.util.preventBubble($event)"
2626
data-ng-change="changeTaskState(task)"
2727
data-ng-disabled="!!task.editorIsProcessing"
28-
data-ng-false-value="needsAction"
28+
data-ng-false-value="'needsAction'"
2929
data-ng-model="task.status"
3030
data-ng-show="task.emitter=='Google'"
31-
data-ng-true-value="completed"
31+
data-ng-true-value="'completed'"
3232
>
3333
<label for="cc-widget-tasks-checkbox-{{$index}}" data-ng-show="task.emitter!='bCourses'" class="cc-visuallyhidden">
3434
<span data-ng-bind-template="mark {{task.title}} as"></span>

app/views/layouts/application.html.erb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
<noscript><meta http-equiv="Refresh" content="0; URL=/enable-javascript.html"></noscript>
1111

12+
<base href="/" />
13+
1214
<%= favicon_link_tag 'favicon.ico' %>
1315
<%= favicon_link_tag 'favicon.png', :rel => 'icon', :type => 'image/png' %>
1416

0 commit comments

Comments
 (0)