Skip to content

Commit

Permalink
chore(Angular): Updates to work with Angular 1.3
Browse files Browse the repository at this point in the history
Multiple changes to fix tests and code to work with Angular 1.3.x

fix(GridColumn): $q promises inherit then

We can't use hasOwnProperty() to check for them

chore(Karma): Use dots reporter

It's cleaner
  • Loading branch information
c0bra committed Dec 15, 2014
1 parent c7b0a66 commit ee753f1
Show file tree
Hide file tree
Showing 10 changed files with 30,548 additions and 25 deletions.
9 changes: 5 additions & 4 deletions Gruntfile.js
Expand Up @@ -276,6 +276,7 @@ module.exports = function(grunt) {
$:false,
jQuery: false,


/* grunt */
process: false,
require: false,
Expand Down Expand Up @@ -445,15 +446,15 @@ module.exports = function(grunt) {
},
scripts: [
// no jquery automatically loaded for tutorial!!!
'//ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js',
'//ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-touch.js',
'//ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-animate.js',
'//ajax.googleapis.com/ajax/libs/angularjs/1.3.6/angular.js',
'//ajax.googleapis.com/ajax/libs/angularjs/1.3.6/angular-touch.js',
'//ajax.googleapis.com/ajax/libs/angularjs/1.3.6/angular-animate.js',
'bower_components/csv-js/csv.js',
'bower_components/pdfmake/build/pdfmake.js',
'bower_components/pdfmake/build/vfs_fonts.js'
],
hiddenScripts: [
'//ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-animate.js',
'//ajax.googleapis.com/ajax/libs/angularjs/1.3.6/angular-animate.js',
'bower_components/google-code-prettify/src/prettify.js',
'node_modules/marked/lib/marked.js'
],
Expand Down
2,137 changes: 2,137 additions & 0 deletions lib/test/angular/1.3.6/angular-animate.js

Large diffs are not rendered by default.

0 comments on commit ee753f1

Please sign in to comment.