diff --git a/client/app/main/main.controller.js b/client/app/main/main.controller.js index 2c1ca57..92b0e41 100644 --- a/client/app/main/main.controller.js +++ b/client/app/main/main.controller.js @@ -1,23 +1,15 @@ 'use strict'; angular.module('manticoreApp') .controller('MainCtrl', function ($scope, $http, Auth) { $scope.documents = []; $scope.isLoggedIn = Auth.isLoggedIn; $http.get('/api/documents').success(function(documents) { $scope.documents = documents; }); - $scope.addDocument = function() { - if($scope.newDocument === '') { - return; - } - $http.post('/api/documents', { name: $scope.newDocument }); - $scope.newDocument = ''; - }; - $scope.deleteDocument = function(document) { $http.delete('/api/documents/' + document._id); }; }); diff --git a/karma.conf.js b/karma.conf.js index d698526..261721b 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,80 +1,81 @@ // Karma configuration // http://karma-runner.github.io/0.10/config/configuration-file.html module.exports = function(config) { config.set({ // base path, that will be used to resolve files and exclude basePath: '', // testing framework to use (jasmine/mocha/qunit/...) frameworks: ['jasmine'], // list of files / patterns to load in the browser files: [ 'client/bower_components/jquery/dist/jquery.js', 'client/bower_components/angular/angular.js', 'client/bower_components/angular-mocks/angular-mocks.js', 'client/bower_components/angular-resource/angular-resource.js', 'client/bower_components/angular-cookies/angular-cookies.js', 'client/bower_components/angular-sanitize/angular-sanitize.js', 'client/bower_components/angular-route/angular-route.js', 'client/bower_components/angular-bootstrap/ui-bootstrap-tpls.js', 'client/bower_components/lodash/dist/lodash.compat.js', 'client/bower_components/angular-ui-router/release/angular-ui-router.js', + 'client/bower_components/angular-file-upload/angular-file-upload.js', 'client/app/app.js', 'client/app/app.coffee', 'client/app/**/*.js', 'client/app/**/*.coffee', 'client/components/**/*.js', 'client/components/**/*.coffee', 'client/app/**/*.jade', 'client/components/**/*.jade', 'client/app/**/*.html', 'client/components/**/*.html' ], preprocessors: { '**/*.jade': 'ng-jade2js', '**/*.html': 'html2js', '**/*.coffee': 'coffee', }, ngHtml2JsPreprocessor: { stripPrefix: 'client/' }, ngJade2JsPreprocessor: { stripPrefix: 'client/' }, // list of files / patterns to exclude exclude: [], // web server port port: 8080, // level of logging // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG logLevel: config.LOG_INFO, // enable / disable watching file and executing tests whenever any file changes autoWatch: false, // Start these browsers, currently available: // - Chrome // - ChromeCanary // - Firefox // - Opera // - Safari (only Mac) // - PhantomJS // - IE (only Windows) browsers: ['PhantomJS'], // Continuous Integration mode // if true, it capture browsers, run tests and exit singleRun: false }); };