Replaces require.js with jepnope

Gets rid of the AMD pattern, adds scriptLoader service, work on security
service started
This commit is contained in:
Per Ploug
2013-06-18 10:51:26 +02:00
parent a2e4b6b698
commit 4b68d1950c
36 changed files with 681 additions and 385 deletions

View File

@@ -9,8 +9,12 @@ files = [
'lib/jquery/jquery-1.8.2.min.js',
'lib/angular/angular.min.js',
'test/lib/angular/angular-mocks.js',
'src/app.js',
'src/common/**/*.js',
'src/app_dev.js',
'src/common/directives/*.js',
'src/common/filters/*.js',
'src/common/services/*.js',
'src/common/security/*.js',
'src/common/mocks/**/*.js',
'src/views/**/*.controller.js',
'test/unit/**/*.spec.js'
];

View File

@@ -11,10 +11,10 @@ describe('content factory tests', function () {
describe('global content factory crud', function () {
it('should return a content object, given an id', function () {
var doc1 = contentFactory.getContent(1234);
expect(doc1).toNotBe(undefined);
expect(doc1.id).toBe(1234);
var doc1 = contentFactory.getById(1234).then(function(doc1){
expect(doc1).toNotBe(undefined);
expect(doc1.id).toBe(1234);
});
});
it('should return a content children collection given an id', function () {