Merge pull request #144 from circlingthesun/angular-1.3

Upgraded to Angular 1.3.1, Foundation 5.4.7 and Font Awesome 4.2

Author: jbrowning

Gruntfile.js

@@ -8,9 +8,9 @@ module.exports = function(grunt) {
   grunt.util.linefeed = '\n';
 
   grunt.initConfig({
-    ngversion: '1.2.15',
-    fdversion: '5.2.0',
-    faversion: '4.0.3',
+    ngversion: '1.3.1',
+    fdversion: '5.4.7',
+    faversion: '4.2.0',
     modules: [],//to be filled in by build task
     pkg: grunt.file.readJSON('package.json'),
     dist: 'dist',

karma.conf.js

@@ -47,5 +47,4 @@ module.exports = function(config) {
     // if true, it capture browsers, run tests and exit
     singleRun: false
  });
-}
-
+};

misc/demo/assets/app.js

@@ -1,9 +1,9 @@
-angular.module('foundationDemoApp', ['mm.foundation', 'plunker'], function($httpProvider){
+var app = angular.module('foundationDemoApp', ['mm.foundation', 'plunker'], function($httpProvider){
   FastClick.attach(document.body);
   delete $httpProvider.defaults.headers.common['X-Requested-With'];
 });
 
-function MainCtrl($scope, $http, $document, $modal, orderByFilter) {
+app.controller('MainCtrl', function($scope, $http, $document, $modal, orderByFilter) {
   var url = "http://50.116.42.77:3001";
   //iFrame for downloading
   var $iframe = angular.element('<iframe>').css('display','none');
@@ -56,9 +56,9 @@ function MainCtrl($scope, $http, $document, $modal, orderByFilter) {
       downloadFileFromUrl(downloadUrl.join(''));
     });
   };
-}
+});
 
-var SelectModulesCtrl = function($scope, $modalInstance, modules) {
+app.controller('SelectModulesCtrl', function($scope, $modalInstance, modules) {
 
   $scope.selectedModules = [];
   $scope.modules = modules;
@@ -78,9 +78,9 @@ var SelectModulesCtrl = function($scope, $modalInstance, modules) {
   $scope.cancel = function () {
     $modalInstance.dismiss();
   };
-};
+});
 
-var DownloadCtrl = function($scope, $modalInstance) {
+app.controller('DownloadCtrl', function($scope, $modalInstance) {
   $scope.options = {
     minified: true,
     tpls: true
@@ -94,4 +94,4 @@ var DownloadCtrl = function($scope, $modalInstance) {
   $scope.cancel = function () {
     $modalInstance.dismiss();
   };
-}
+});