diff --git a/docs/components/angular-bootstrap/bootstrap.js b/docs/components/angular-bootstrap/bootstrap.js
index 31ec763ee1e9..81a599e97bf1 100644
--- a/docs/components/angular-bootstrap/bootstrap.js
+++ b/docs/components/angular-bootstrap/bootstrap.js
@@ -193,7 +193,7 @@ directive.table = function() {
return {
restrict: 'E',
link: function(scope, element, attrs) {
- element[0].className = 'table table-bordered table-striped code-table';
+ element.addClass('table table-bordered table-striped code-table');
}
};
};
diff --git a/docs/content/api/index.ngdoc b/docs/content/api/index.ngdoc
index d0ab64e63510..95e45e634735 100644
--- a/docs/content/api/index.ngdoc
+++ b/docs/content/api/index.ngdoc
@@ -2,6 +2,286 @@
@name API Reference
@description
-Use the API Reference documentation when you need more information about a specific feature. Check out
-{@link guide/ Developer Guide} for AngularJS concepts. If you are new to AngularJS we recommend the
-{@link tutorial/ Tutorial}.
+# AngularJS API Docs
+Welcome to the AngularJS API docs page. The pages here contain the AngularJS reference materials for version .
+
+The docs are organized into **modules** which contain various components of an AngularJS application.
+These components are directives, services, filters, providers, types, global APIs and testing mocks.
+
+## {@link ng ng (core module)}
+This module is provided by default and contains the core components of AngularJS.
+
+
+
+ | {@link ng#directive Directives} |
+
+
+ This is the core collection of directives you would use in your template code to build an AngularJS application.
+
+
+
+ Some examples include:
+ {@link ng.ngClick ngClick},
+ {@link ng.ngInclude ngInclude},
+ {@link ng.ngInclude ngRepeat},
+ etc…
+
+ |
+
+
+ |
+ {@link ng#service Services / Factories}
+ |
+
+
+ This is the core collection of services which are used within the DI of your application.
+
+
+ Some examples include:
+ {@link ng.$compile $compile},
+ {@link ng.$http $http},
+ {@link ng.$routeParams $routeParams},
+ {@link ng.$location $location},
+ etc…
+
+ |
+
+
+ |
+ {@link ng#filter Filters}
+ |
+
+
+ The core filters available in the ng module are used to transform template data before it is renders within directives and expressions.
+
+
+ Some examples include:
+ {@link ng.filter:filter filter},
+ {@link ng.filter:date date},
+ {@link ng.filter:currency currency},
+ {@link ng.filter:lowercase lowercase},
+ {@link ng.filter:uppercase uppercase},
+ etc...
+
+ |
+
+
+ |
+ {@link ng#function Global APIs}
+ |
+
+
+ The core global API functions are attached to the angular object. These core functions are useful for low level JavaScript operations within your application.
+
+
+ Some examples include:
+ {@link angular.copy angular.copy()},
+ {@link angular.equals angular.equals()},
+ {@link angular.element angular.element()},
+ etc...
+
+ |
+
+
+
+
+## {@link ngRoute ngRoute}
+
+Use ngRoute to enable URL routing to your application. The ngRoute module supports URL management via both hashbang and HTML5 pushState.
+
+Include the **angular-route.js** file and set **ngRoute** as a dependency for this to work in your application.
+
+
+
+ |
+ {@link ngRoute#service Services / Factories}
+ |
+
+ The following services are used for route management:
+
+ - {@link ngRoute.$routeParams $routeParams} is used to access the querystring values present in the URL.
+ - {@link ngRoute.$route $route} is used to access the details of the route that is currently being accessed.
+ - {@link ngRoute.$routeProvider $routeProvider} is used to register routes for the application.
+
+ |
+
+
+ |
+ {@link ngRoute#directive Directives}
+ |
+
+ The {@link ngRoute.directive:ngView ngView} directive will display the template of the current route within the page.
+ |
+
+
+
+
+## {@link ngAnimate ngAnimate}
+
+Use ngAnimate to enable animation features into your application. Various core ng directives will provide
+animation hooks into your application when ngAnimate is included. Animations are defined by using CSS transitions/animations
+or JavaScript callbacks.
+
+Include the **angular-animate.js** file and set **ngAnimate** as a dependency for this to work in your application.
+
+
+
+ |
+ {@link ngAnimate#service Services / Factories}
+ |
+
+ Use {@link ngAnimate.$animate $animate} to trigger animation operations within your directive code.
+ |
+
+
+ |
+ {@link ngAnimate CSS-based animations}
+ |
+
+ Follow ngAnimate’s CSS naming structure to reference CSS transitions / keyframe animations in AngularJS. Once defined the animation can be triggered by referencing the CSS class within the HTML template code.
+ |
+
+
+ |
+ {@link ngAnimate JS-based animations}
+ |
+
+ Use {@link angular.Module#animation module.animation()} to register a JavaScript animation. Once registered the animation can be triggered by referencing the CSS class within the HTML template code.
+ |
+
+
+
+
+## {@link ngResource ngResource}
+
+Use the ngResource module when querying and posting data to a REST API.
+
+Include the **angular-resource.js** file and set **ngResource** as a dependency for this to work in your application.
+
+
+
+ |
+ {@link ngResource#service Services / Factories}
+ |
+
+ The {@link ngResource.$resource $resource} service is used to define RESTful objects which communicate with a REST API.
+ |
+
+
+
+## {@link ngCookies ngCookies}
+
+Use the ngCookies module to handle cookie management within your application.
+
+Include the **angular-cookies.js** file and set **ngCookies** as a dependency for this to work in your application.
+
+
+
+ |
+ {@link ngCookies#service Services / Factories}
+ |
+
+ The following services are used for cookie management:
+
+ - The {@link ngCookies.$cookies $cookie} service is a convenient wrapper to store simple data within browser cookies.
+ - {@link ngCookies.$cookieStore $cookieStore} is used to store more complex data using serialization.
+
+ |
+
+
+
+## {@link ngTouch ngTouch}
+
+Use ngTouch when developing for mobile browsers/devices.
+
+Include the **angular-touch.js** file and set **ngTouch** as a dependency for this to work in your application.
+
+
+
+ |
+ {@link ngTouch#service Services / Factories}
+ |
+
+ The {@link ngTouch.$swipe $swipe} service is used to register and manage mobile DOM events.
+ |
+
+
+ |
+ {@link ngTouch#directive Directives}
+ |
+
+ Various directives are available in ngTouch to emulate mobile DOM events.
+ |
+
+
+
+## {@link ngSanitize ngSanitize}
+
+Use ngSanitize to securely parse and manipulate HTML data in your application.
+
+Include the **angular-sanitize.js** file and set **ngSanitize** as a dependency for this to work in your application.
+
+
+
+ |
+ {@link ngSanitize#service Services / Factories}
+ |
+
+ The {@link ngSanitize.$sanitize $sanitize} service is used to clean up dangerous HTML code in a quick and convenient way.
+ |
+
+
+ |
+ {@link ngTouch#filter Filters}
+ |
+
+ The {@link ngSanitize.filter:linky linky filter} is used to turn URLs into HTML links within the provided string.
+ |
+
+
+
+## {@link ngMock ngMock}
+
+Use ngMock to inject and mock modules, factories, services and providers within your unit tests
+
+Include the **angular-mocks.js** file into your test runner for this to work.
+
+
+
+ |
+ {@link ngMock#service Services / Factories}
+ |
+
+
+ ngMock will extend the behavior of various core services to become testing aware and manageable in a synchronous manner.
+
+
+
+ Some examples include:
+ {@link ngMock.$timeout $timeout},
+ {@link ngMock.$interval $interval},
+ {@link ngMock.$log $log},
+ {@link ngMock.$httpBackend $httpBackend},
+ etc...
+
+ |
+
+
+ |
+ {@link ngMock#function Global APIs}
+ |
+
+
+ Various helper functions are available to inject and mock modules within unit test code.
+
+
+
+ Some examples
+ {@link angular.mock.inject inject()},
+ {@link angular.mock.module module()},
+ {@link angular.mock.dump dump()},
+ etc...
+
+ |
+
+
diff --git a/docs/content/api/ng.ngdoc b/docs/content/api/ng.ngdoc
index 5c2f95172996..2877a5660f91 100644
--- a/docs/content/api/ng.ngdoc
+++ b/docs/content/api/ng.ngdoc
@@ -2,4 +2,7 @@
@name ng
@description
-`ng` is the name of the {@link guide/module angular module} that contains all of the core angular services.
+# ng (core module)
+The ng module is loaded by default when an AngularJS application is started. The module itself contains the essential components to for an AngularJS application to function. The table below lists a high level breakdown of each of the services/factories, filters, directives and testing components available within this core module.
+
+
diff --git a/docs/src/ngdoc.js b/docs/src/ngdoc.js
index 24d1aa26163e..249f1802034e 100644
--- a/docs/src/ngdoc.js
+++ b/docs/src/ngdoc.js
@@ -213,6 +213,14 @@ Doc.prototype = {
return words.join(' ');
},
+ shortDescription : function() {
+ var text = this.description.split("\n")[0];
+ text = text.replace(/<.+?\/?>/g, '');
+ text = text.replace(/{/g,'{');
+ text = text.replace(/}/g,'}');
+ return text;
+ },
+
getMinerrNamespace: function () {
if (this.ngdoc !== 'error') {
throw new Error('Tried to get the minErr namespace, but @ngdoc ' +
@@ -471,11 +479,20 @@ Doc.prototype = {
(this.ngdoc === 'error' ? this.name : '') ||
(((this.file||'').match(/.*(\/|\\)([^(\/|\\)]*)\.ngdoc/)||{})[2]) || // try to extract it from file name
this.name; // default to name
+ this.moduleName = parseModuleName(this.id);
this.description = this.markdown(this.description);
this.example = this.markdown(this.example);
this['this'] = this.markdown(this['this']);
return this;
+ function parseModuleName(id) {
+ var module = id.split('.')[0];
+ if(module == 'angular') {
+ module = 'ng';
+ }
+ return module;
+ }
+
function flush() {
if (atName) {
var text = trim(atText.join('\n')), match;
@@ -1106,6 +1123,8 @@ function metadata(docs){
name: title(doc),
shortName: shortName,
type: doc.ngdoc,
+ moduleName: doc.moduleName,
+ shortDescription: doc.shortDescription(),
keywords:doc.keywords()
});
});
diff --git a/docs/src/templates/css/docs.css b/docs/src/templates/css/docs.css
index 430ff4c9a7b8..783f1d211509 100644
--- a/docs/src/templates/css/docs.css
+++ b/docs/src/templates/css/docs.css
@@ -508,3 +508,26 @@ pre ol li {
font-size: 16px;
word-break: normal;
}
+
+.text-info {
+ color:#3a87ad;
+}
+
+.definition-table tr > td:first-child {
+ font-weight:bold;
+ width:30%;
+}
+
+.definition-table.spaced {
+ margin-bottom:30px;
+}
+
+.component-heading {
+ text-transform:capitalize;
+}
+
+.component-breakdown {
+ margin-bottom:30px;
+ padding-bottom:30px;
+ border-bottom:1px solid #aaa;
+}
diff --git a/docs/src/templates/js/docs.js b/docs/src/templates/js/docs.js
index fbabf19350a1..2c5c56d26d0c 100644
--- a/docs/src/templates/js/docs.js
+++ b/docs/src/templates/js/docs.js
@@ -207,6 +207,48 @@ docsApp.directive.sourceEdit = function(getEmbeddedTemplate) {
}
};
+docsApp.directive.docModuleComponents = ['sections', function(sections) {
+ return {
+ template: ' ' +
+ '
Module Components
' +
+ '
' +
+ '
{{ section.title }}
' +
+ '
' +
+ ' ' +
+ ' | Name | ' +
+ ' Description | ' +
+ '
' +
+ ' ' +
+ ' | {{ component.shortName }} | ' +
+ ' {{ component.shortDescription }} | ' +
+ '
' +
+ '
' +
+ '
' +
+ '