Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions docs/dgeni-conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var Package = require('dgeni').Package;


module.exports = new Package('dgeni-example', [
require('dgeni-packages/angularjs'),
require('dgeni-packages/ngdoc'),
require('dgeni-packages/jsdoc'),
require('dgeni-packages/nunjucks')
])
Expand Down Expand Up @@ -32,16 +32,16 @@ module.exports = new Package('dgeni-example', [
variableEnd: '$}'
};

templateFinder.templateFolders
.unshift(path.resolve(__dirname, 'templates'));
// templateFinder.templateFolders
// .unshift(path.resolve(__dirname, 'templates'));

templateFinder.templatePatterns = [
'${ doc.template }',
'${ doc.id }.${ doc.docType }.template.html',
'${ doc.id }.template.html',
'${ doc.docType }.template.html',
'common.template.html'
];
// templateFinder.templatePatterns = [
// '${ doc.template }',
// '${ doc.id }.${ doc.docType }.template.html',
// '${ doc.id }.template.html',
// '${ doc.docType }.template.html',
// 'common.template.html'
// ];
})


Expand Down
23 changes: 0 additions & 23 deletions docs/templates/base.template.html

This file was deleted.

10 changes: 0 additions & 10 deletions docs/templates/common.template.html

This file was deleted.

13 changes: 0 additions & 13 deletions docs/templates/componentGroup.template.html

This file was deleted.

12 changes: 0 additions & 12 deletions docs/templates/ngController.template.html

This file was deleted.

12 changes: 0 additions & 12 deletions docs/templates/ngDirective.template.html

This file was deleted.

12 changes: 0 additions & 12 deletions docs/templates/ngFilter.template.html

This file was deleted.

26 changes: 0 additions & 26 deletions docs/templates/ngModule.template.html

This file was deleted.

12 changes: 0 additions & 12 deletions docs/templates/ngService.template.html

This file was deleted.

12 changes: 0 additions & 12 deletions docs/templates/partials/dependencies.template.html

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"canonical-path": "0.0.2",
"del": "^0.1.3",
"dgeni": "^0.4.0",
"dgeni-packages": "git://github.com/angular/dgeni-packages.git#angular-docs",
"dgeni-packages": "^0.10.12",
"gulp": "^3.5.6",
"run-sequence": "^1.0.1"
},
Expand Down
9 changes: 7 additions & 2 deletions src/app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/**
* @ngdoc module
* @name app
* @module app
* @description
*
* The main application module.
* It depends upon {@link mod1} and {@link mod2}.
* It depends upon {@link module:mod1} and {@link module:mod2}.
*/
angular.module('app', ['mod1', 'mod2']);
angular.module('app', ['mod1', 'mod2']);
17 changes: 16 additions & 1 deletion src/mod1.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
/**
* @ngdoc module
* @name mod1
* @module mod1
*
* @description
*
* Contains helper services
*/

/**
* @ngdoc service
* @name service1
* @module mod1
* @description
*
* Contains helper services
*/
angular.module('mod1', [])
Expand All @@ -16,4 +31,4 @@ angular.module('mod1', [])
});
}
};
}]);
}]);
17 changes: 16 additions & 1 deletion src/mod2.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
/**
* @ngdoc module
* @name mod2
* @description
*
* Controllers and directives
*
*/
angular.module('mod2', ['mod1'])

/**
* @ngdoc type
* @name MyCtrl
* @module mod2
* @description
*
* Attaches the `getItem` helper to the scope
*/
.controller('MyCtrl', ['$scope', 'service1', function($scope, service1) {
Expand All @@ -15,6 +25,11 @@ angular.module('mod2', ['mod1'])
}])

/**
* @ngdoc directive
* @name directive1
* @module mod2
* @description
*
* Does something special with the DOM
*/
.directive('directive1', function() {
Expand All @@ -28,4 +43,4 @@ angular.module('mod2', ['mod1'])
var div = angular.element('<div></div>');
}
};
});
});