Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

feat(filterFilter): support filterFilter for object literal collection #6508

Closed
wants to merge 102 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
bbd967d
feat(filterFilter): support filterFilter for object literal collection
Mar 2, 2014
1d7c261
docs(changelog): release notes for 1.2.14 feisty-cryokinesis
IgorMinar Mar 1, 2014
9869040
chore(release): update cdn version
NgDashboard Mar 1, 2014
8258539
docs(ngMock): fixes in flush() documentation
thenickcox Nov 11, 2013
5cf35cf
docs(loader): change 'MyModule' -> 'myModule'
moretti Dec 13, 2013
8cb87c9
docs(guide/injecting-services): fix list formatting in Related* sections
gurdiga Dec 17, 2013
b1b1daa
docs(*): ensure jsdoc type expressions are valid
petebacondarwin Feb 27, 2014
d9ad819
chore(package.json): update dgeni dependencies
petebacondarwin Feb 28, 2014
f3b2361
docs(directives): ensure that the back-to-top directive resets location
petebacondarwin Mar 2, 2014
ae472d5
docs(error/ng/btstrpd): note that loading angular.js twice can cause …
amagee Mar 1, 2014
9064b86
docs($interval): cancel() takes a promise not a number
MikeMcElroy Feb 27, 2014
f886717
docs(ngView): rename controller suffix in ngView example
sgronblo Jan 15, 2014
0fde21c
docs(loader): remove duplicate "the"
OleMchls Mar 2, 2014
a319e03
docs(guide/expression): clarify
btford Mar 3, 2014
fed1f8d
docs(guide/templates): clarity
btford Mar 3, 2014
e2845b2
docs(guide/services): rewrite services documentation
btford Mar 3, 2014
193c076
docs(guide/bootstrap): fix formatting
btford Mar 3, 2014
019e141
docs(guide/css-styling): rename and fix formatting
btford Mar 3, 2014
9643fb6
docs(guide/e2e-testing): rename and fix formatting
btford Mar 3, 2014
20b4c9a
docs(guide/unit-testing): rename and fix formatting
btford Mar 3, 2014
e7c96b8
docs(guide/introduction): reword for clarity
btford Mar 3, 2014
cecf92e
docs(guide/concepts): fix links
btford Mar 3, 2014
7b1b3e1
docs(guide/controller): reorganize, add Controller suffix, formatting
btford Mar 3, 2014
cafa0b0
docs(guide/databinding): reword for clarity
btford Mar 3, 2014
56a7199
docs(guide/di): fix formatting and improve clarity
btford Mar 3, 2014
8ae8688
docs(guide/module): improve clarity
btford Mar 3, 2014
c41222e
chore(grunt): remove unnecessary white spaces
takashi Mar 4, 2014
f237b31
docs(tutorial/index): improve accessibility
Sharondio Dec 9, 2013
9984283
docs(tutorial): update step_08.ngdoc
cchungmin Mar 4, 2014
1a19708
docs(guide/forms): fix a typo
mikeg0184 Mar 5, 2014
d58f463
docs(guide/services): clean up typos
zakj Mar 5, 2014
8ef0cb7
docs(tutorial): update step_09.ngdoc
tpiere Jan 26, 2014
2114c45
docs(directive.ngdoc): typo fix
tonybergeron Mar 5, 2014
3d53b26
style: enable jscs requireLeftStickedOperators rule
TimotheeJeannin Mar 4, 2014
daf4216
chore(publish.sh): publish to all serving backends
chirayuk Mar 5, 2014
7911b41
chore(build): remove IE8 target from all test configs
IgorMinar Mar 6, 2014
9cbf12f
chore(build): don't instruct Jenkins test on IE
IgorMinar Mar 6, 2014
2dee514
fix(style): expressions in style tags
SekibOmazic Feb 28, 2014
ca50254
feat(input): support types date, time, datetime-local, month, week
benlesh Dec 4, 2013
3fbffeb
docs(guide/services): minor fixes
moroshko Mar 6, 2014
d418959
docs(tutorial): link update for Jasmine
edhedges Mar 7, 2014
0d719b3
chore(doc-gen): improve error reporting
petebacondarwin Mar 7, 2014
0b9ccde
chore(doc-gen): fix error-doc processor
petebacondarwin Mar 7, 2014
3c3c8f3
docs($route): fix formatting of example code
petebacondarwin Mar 7, 2014
bfaa967
chore(doc-gen): add inline @type tag
petebacondarwin Mar 7, 2014
f0de491
chore(doc-gen): add contentFolder config property
petebacondarwin Mar 7, 2014
8e4789d
chore(package): update dgeni dependencies
petebacondarwin Mar 7, 2014
de4209e
fix($compile): support templates with thead and tfoot root elements
lgalfaso Feb 17, 2014
0f4dbfe
docs(404 errors): provide a better 404 experience
petebacondarwin Mar 7, 2014
efd4540
style(jsdoc tags): remove/ammend invalid tags
petebacondarwin Mar 7, 2014
67d4816
docs(guide/directive): fix typo
SekibOmazic Mar 7, 2014
c8c31cc
docs(guide/migration): fix typos
SekibOmazic Mar 7, 2014
23e102f
docs(guide/migration): fix broken link
IgorMinar Mar 7, 2014
391ed5a
docs(ngBind): fix typo
SekibOmazic Mar 7, 2014
5f2f233
chore(build): upgrade grunt-jscs-checker to ~0.4.0
IgorMinar Mar 7, 2014
83e4e11
docs($sce): correct typo
SekibOmazic Mar 7, 2014
35a020f
docs(changelog): release notes for 1.3.0-beta.1 retractable-eyebrow
btford Mar 7, 2014
82428c9
chore(release): Update package.json to reflect 1.3.x version
tbosch Mar 8, 2014
f7c0c9d
chore(release): update cdn version
NgDashboard Mar 8, 2014
715a301
docs(Error404): improve search results layout
petebacondarwin Mar 8, 2014
dad0e3c
docs(Error404): better heading
petebacondarwin Mar 8, 2014
34605ef
docs(tutorial/step-12): correct application name
cchungmin Mar 8, 2014
61923f2
docs(guide/providers): remove unneeded word "the"
chadfennell Mar 9, 2014
9cdf57c
feat(): whitelist blob urls for sanitization of data-bound image urls
IgorMinar Mar 10, 2014
bf9c1f9
docs(guide/forms): remove unnecessary controller reference
Narretz Mar 3, 2014
08d44fa
docs($route): change routes property to correct type
dusanbartos Mar 5, 2014
b3278d5
chore(docs): ensure the "Improve this doc" button is clickable
matsko Mar 10, 2014
e545660
docs(ngRepeat): Separate animation class in new lines
Basemm Mar 10, 2014
9a1bb70
docs(route.js): changed html entities lt gt to < and >
lhaussknecht Mar 10, 2014
f216086
docs(versions): rework the version info extraction
petebacondarwin Mar 11, 2014
db8e155
chore(build): refactor build version information
petebacondarwin Mar 11, 2014
f6b0a28
docs(tutorial): display button icons (Previous, Live Demo, ...)
Mar 11, 2014
de3e2e1
chore(package.json): update dgeni-packages dependency
petebacondarwin Mar 11, 2014
c9a041e
chore(doc-gen): fix dependencyPath
petebacondarwin Mar 11, 2014
95f7490
chore(npm): add shrinkwrap to lock down dependencies
IgorMinar Mar 11, 2014
5b947f3
chore(version-info): better error msg if not tags
petebacondarwin Mar 12, 2014
bb1260c
chore(version-info): use remote tags and increment patch version
tbosch Mar 12, 2014
5b02319
chore(shrinkwrap): re-run shrinkwrap locally
petebacondarwin Mar 13, 2014
725c6d9
chore(shrinkwrap): update dgeni-packages
petebacondarwin Mar 13, 2014
d12a408
chore(CHANGELOG.md): add input type date PR as breaking change
tbosch Mar 13, 2014
b63f6a4
fix (ngAnimate): fix requestAnimationFrame for old version of Firefox
Mar 4, 2014
f52ecab
docs($resource): fix example using promise
wesleycho Jan 28, 2014
c4dab60
docs(guide/unit-testing): fix typo
thynctank Mar 13, 2014
4775ef8
docs(guide/compiler): add missing closing parenthesis
n0nick Mar 13, 2014
606d3d7
docs(ngMock): grammar nitpick.
NickHeiner Mar 13, 2014
a20ce94
docs(scripts/utils.inc): clarify documentation
petebacondarwin Mar 14, 2014
c4c01e8
fix(ngAnimate): setting classNameFilter disables animation inside ng-if
Mar 4, 2014
8cbb9f4
fix($$rAF): always fallback to a $timeout incase native rAF isn't sup…
matsko Mar 14, 2014
82836b1
chore: fix compare-master-to-stable script
vojtajina Mar 14, 2014
9e83f50
chore: update compare-master-to-stable to use v1.2.x
vojtajina Mar 14, 2014
1c97c3f
chore: make compare-master-to-stable script more flexible
vojtajina Mar 14, 2014
017373e
fix($http): don't covert 0 status codes to 404 for non-file protocols
pkozlowski-opensource Mar 1, 2014
1cf8f3f
chore: update changelog for 1.3.0-beta.2
jeffbcross Mar 14, 2014
eb13243
chore(scripts): make the release script more flexible
vojtajina Mar 14, 2014
e97b692
chore(scripts): test seed and phonecat during a release
vojtajina Mar 14, 2014
ea90e61
chore(scripts): disable testing seed and phonecat during a release
vojtajina Mar 14, 2014
54367ac
chore(scripts): fix the versions script
vojtajina Mar 14, 2014
e4ccd59
chore(scripts): fix the versions script again
vojtajina Mar 14, 2014
f96196c
chore(release): update cdn version
NgDashboard Mar 15, 2014
3d984a6
chore(npm): clean up shrinkwrap file, remove unused properties
IgorMinar Mar 14, 2014
cdde83a
chore(clean-shrinkwrap): add a utility to clean up the shrinkwrap file
petebacondarwin Mar 13, 2014
cbaf4e1
chore(package.json): update karma to 0.12.0
IgorMinar Mar 15, 2014
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
3 changes: 2 additions & 1 deletion .jscs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"disallowKeywords": ["with"],
"disallowTrailingWhitespace": true,
"requireRightStickedOperators": ["!"]
"requireRightStickedOperators": ["!"],
"requireLeftStickedOperators": [","]
}
1 change: 0 additions & 1 deletion .jscs.json.todo
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
"disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"disallowRightStickedOperators": ["?", "+", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"requireLeftStickedOperators": [","],
"disallowImplicitTypeConversion": ["string"],
"disallowMultipleLineBreaks": true,
"disallowKeywordsOnNewLine": ["else"],
Expand Down
138 changes: 135 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,135 @@
<a name="1.3.0-beta.2"></a>
# 1.3.0-beta.2 silent-ventriloquism (2014-03-14)


## Bug Fixes

- **$$rAF:** always fallback to a $timeout in case native rAF isn't supported
([7b5e0199](https://github.com/angular/angular.js/commit/7b5e019981f352add88be2984de68e553d1bfa93),
[#6654](https://github.com/angular/angular.js/issues/6654))
- **$http:** don't convert 0 status codes to 404 for non-file protocols
([56e73ea3](https://github.com/angular/angular.js/commit/56e73ea355c851fdfd574d6d2a9e2fcb75677945),
[#6074](https://github.com/angular/angular.js/issues/6074), [#6155](https://github.com/angular/angular.js/issues/6155))
- **ngAnimate:** setting classNameFilter disables animation inside ng-if
([129e2e02](https://github.com/angular/angular.js/commit/129e2e021ab1d773874428cd1fb329eae72797c4),
[#6539](https://github.com/angular/angular.js/issues/6539))


## Features

- whitelist blob urls for sanitization of data-bound image urls
([47ab8df4](https://github.com/angular/angular.js/commit/47ab8df455df1f1391b760e1fbcc5c21645512b8),
[#4623](https://github.com/angular/angular.js/issues/4623))



<a name="1.3.0-beta.1"></a>
# 1.3.0-beta.1 retractable-eyebrow (2014-03-07)


## Bug Fixes

- **$compile:** support templates with thead and tfoot root elements
([53ec5e13](https://github.com/angular/angular.js/commit/53ec5e13e5955830b6751019eef232bd2125c0b6),
[#6289](https://github.com/angular/angular.js/issues/6289))
- **style:** expressions in style tags
([0609453e](https://github.com/angular/angular.js/commit/0609453e1f9ae074f8d786df903096a6eadb6aa0),
[#2387](https://github.com/angular/angular.js/issues/2387), [#6492](https://github.com/angular/angular.js/issues/6492))


## Features

- **input:** support types date, time, datetime-local, month, week
([46bd6dc8](https://github.com/angular/angular.js/commit/46bd6dc88de252886d75426efc2ce8107a5134e9),
[#5864](https://github.com/angular/angular.js/issues/5864))


## Breaking Changes

- **build:** due to [eaa1d00b](https://github.com/angular/angular.js/commit/eaa1d00b24008f590b95ad099241b4003688cdda),
As communicated before, IE8 is no longer supported.
- **input:** types date, time, datetime-local, month, week now always
require a `Date` object as model ([46bd6dc8](https://github.com/angular/angular.js/commit/46bd6dc88de252886d75426efc2ce8107a5134e9),
[#5864](https://github.com/angular/angular.js/issues/5864))

For more info: http://blog.angularjs.org/2013/12/angularjs-13-new-release-approaches.html



<a name="1.2.14"></a>
# 1.2.14 feisty-cryokinesis (2014-03-01)


## Bug Fixes

- **$animate:**
- delegate down to addClass/removeClass if setClass is not found
([18c41af0](https://github.com/angular/angular.js/commit/18c41af065006a804a3d38eecca7ae184103ece9),
[#6463](https://github.com/angular/angular.js/issues/6463))
- ensure all comment nodes are removed during a leave animation
([f4f1f43d](https://github.com/angular/angular.js/commit/f4f1f43d5140385bbf070510975f72b65196e08a),
[#6403](https://github.com/angular/angular.js/issues/6403))
- only block keyframes if a stagger is set to occur
([e71e7b6c](https://github.com/angular/angular.js/commit/e71e7b6cae57f25c5837dda98551c8e0a5cb720d),
[#4225](https://github.com/angular/angular.js/issues/4225))
- ensure that animateable directives cancel expired leave animations
([e9881991](https://github.com/angular/angular.js/commit/e9881991ca0a5019d3a4215477738ed247898ba0),
[#5886](https://github.com/angular/angular.js/issues/5886))
- ensure all animated elements are taken care of during the closing timeout
([99720fb5](https://github.com/angular/angular.js/commit/99720fb5ab7259af37f708bc4eeda7cbbe790a69),
[#6395](https://github.com/angular/angular.js/issues/6395))
- fix for TypeError Cannot call method 'querySelectorAll' in cancelChildAnimations
([c914cd99](https://github.com/angular/angular.js/commit/c914cd99b3aaf932e3c0e2a585eead7b76621f1b),
[#6205](https://github.com/angular/angular.js/issues/6205))
- **$http:**
- do not add trailing question
([c8e03e34](https://github.com/angular/angular.js/commit/c8e03e34b27a8449d8e1bfe0e3801d6a67ae2c49),
[#6342](https://github.com/angular/angular.js/issues/6342))
- send GET requests by default
([267b2173](https://github.com/angular/angular.js/commit/267b217376ed466e9f260ecfdfa15a8227c103ff),
[#5985](https://github.com/angular/angular.js/issues/5985), [#6401](https://github.com/angular/angular.js/issues/6401))
- **$parse:** reduce false-positives in isElement tests
([5fe1f39f](https://github.com/angular/angular.js/commit/5fe1f39f027c6f2c6a530975dd5389d788d3c0eb),
[#4805](https://github.com/angular/angular.js/issues/4805), [#5675](https://github.com/angular/angular.js/issues/5675))
- **input:** use ValidityState to determine validity
([c2d447e3](https://github.com/angular/angular.js/commit/c2d447e378dd72d1b955f476bd5bf249625b4dab),
[#4293](https://github.com/angular/angular.js/issues/4293), [#2144](https://github.com/angular/angular.js/issues/2144), [#4857](https://github.com/angular/angular.js/issues/4857), [#5120](https://github.com/angular/angular.js/issues/5120), [#4945](https://github.com/angular/angular.js/issues/4945), [#5500](https://github.com/angular/angular.js/issues/5500), [#5944](https://github.com/angular/angular.js/issues/5944))
- **isElement:** reduce false-positives in isElement tests
([75515852](https://github.com/angular/angular.js/commit/75515852ea9742d3d84a0f463c2a2c61ef2b7323))
- **jqLite:**
- properly toggle multiple classes
([4e73c80b](https://github.com/angular/angular.js/commit/4e73c80b17bd237a8491782bcf9e19f1889e12ed),
[#4467](https://github.com/angular/angular.js/issues/4467), [#6448](https://github.com/angular/angular.js/issues/6448))
- make jqLite('<iframe src="someurl">').contents() return iframe document, as in jQuery
([05fbed57](https://github.com/angular/angular.js/commit/05fbed5710b702c111c1425a9e241c40d13b0a54),
[#6320](https://github.com/angular/angular.js/issues/6320), [#6323](https://github.com/angular/angular.js/issues/6323))
- **numberFilter:** convert all non-finite/non-numbers/non-numeric strings to the empty string
([cceb455f](https://github.com/angular/angular.js/commit/cceb455fb167571e26341ded6b595dafd4d92bc6),
[#6188](https://github.com/angular/angular.js/issues/6188), [#6261](https://github.com/angular/angular.js/issues/6261))
- **$parse:** support trailing commas in object & array literals
([6b049c74](https://github.com/angular/angular.js/commit/6b049c74ccc9ee19688bb9bbe504c300e61776dc))
- **ngHref:** bind ng-href to xlink:href for SVGAElement
([2bce71e9](https://github.com/angular/angular.js/commit/2bce71e9dc10c8588f9eb599a0cd2e831440fc48),
[#5904](https://github.com/angular/angular.js/issues/5904))


## Features

- **$animate:** animate dirty, pristine, valid, invalid for form/fields
([33443966](https://github.com/angular/angular.js/commit/33443966c8e8cac85a863bb181d4a4aff00baab4),
[#5378](https://github.com/angular/angular.js/issues/5378))


## Performance Improvements

- **$animate:** use rAF instead of timeouts to issue animation callbacks
([4c4537e6](https://github.com/angular/angular.js/commit/4c4537e65e6cf911c9659b562d89e3330ce3ffae))
- **$cacheFactory:** skip LRU bookkeeping for caches with unbound capacity
([a4078fca](https://github.com/angular/angular.js/commit/a4078fcae4a33295675d769a1cd067837029da2f),
[#6193](https://github.com/angular/angular.js/issues/6193), [#6226](https://github.com/angular/angular.js/issues/6226))



<a name="1.2.13"></a>
# 1.2.13 romantic-transclusion (2014-02-14)

Expand Down Expand Up @@ -202,11 +334,11 @@ The animation mock module has been renamed from `mock.animate` to `ngAnimateMock

- **$http:** due to [e1cfb195](https://github.com/angular/angular.js/commit/e1cfb1957feaf89408bccf48fae6f529e57a82fe),
it is now necessary to separately specify default HTTP headers for PUT, POST and PATCH requests, as these no longer share a single object.

To migrate your code, follow the example below:

Before:

// Will apply to POST, PUT and PATCH methods
$httpProvider.defaults.headers.post = {
"X-MY-CSRF-HEADER": "..."
Expand Down
5 changes: 3 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var files = require('./angularFiles').files;
var util = require('./lib/grunt/utils.js');
var versionInfo = require('./lib/versions/version-info');
var path = require('path');

module.exports = function(grunt) {
Expand All @@ -8,10 +9,10 @@ module.exports = function(grunt) {

grunt.loadTasks('lib/grunt');

var NG_VERSION = util.getVersion();
var NG_VERSION = versionInfo.currentVersion;
NG_VERSION.cdn = versionInfo.currentPackage.cdnVersion;
var dist = 'angular-'+ NG_VERSION.full;


//global beforeEach
util.init();

Expand Down
9 changes: 6 additions & 3 deletions compare-master-to-stable.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/local/bin/node
#!/usr/bin/env node

var util = require('util');
var cp = require('child_process');
Expand Down Expand Up @@ -121,9 +121,12 @@ then(function (tags) {
value();
}).
then(function (tags) {
var master = tags.pop();
var stable = tags.pop();

return [
{ name: 'v1.0.x', tag: tags[0] },
{ name: 'master', tag: tags[1] }
{ name: stable.replace(/\d+$/, 'x'), tag: stable },
{ name: 'master', tag: master}
];
}).
then(allInSeries(function (branch) {
Expand Down
11 changes: 11 additions & 0 deletions docs/app/assets/Error404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<h1>Oops!</h1>

<p>The page you requested does not exist. Perhaps you were looking for something else...</p>

<div ng-controller="Error404SearchCtrl">

<dl ng-repeat="(key, value) in results" ng-show="value.length" style="float: left; margin-right:20px">
<dt>{{ key }}</dt>
<dd ng-repeat="item in value"><a ng-href="{{ item.path }}">{{ item.name }}</a></dd>
</dl>
</div>
15 changes: 9 additions & 6 deletions docs/app/assets/css/docs.css
Original file line number Diff line number Diff line change
Expand Up @@ -501,10 +501,6 @@ h4 {
padding-top:20px;
}

.improve-docs {
float:right;
}

.btn {
color:#428bca;
position: relative;
Expand Down Expand Up @@ -538,10 +534,17 @@ h4 {
background:white!important;
}

.view-source, .improve-docs {
position:relative;
z-index:100;
}

.view-source {
margin-right:10px;
padding-right:10px;
border-right:1px solid #999;
}

.improve-docs {
float:right;
}

.return-arguments,
Expand Down
3 changes: 2 additions & 1 deletion docs/app/src/directives.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ angular.module('directives', [])
*
* @description Ensure that the browser scrolls when the anchor is clicked
*/
.directive('backToTop', ['$anchorScroll', function($anchorScroll) {
.directive('backToTop', ['$anchorScroll', '$location', function($anchorScroll, $location) {
return function link(scope, element) {
element.on('click', function(event) {
$location.hash('');
scope.$apply($anchorScroll);
});
};
Expand Down
2 changes: 1 addition & 1 deletion docs/app/src/docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ angular.module('DocsController', [])
breadcrumbPath += '/';
});
} else {
$scope.currentArea = null;
$scope.currentArea = NG_NAVIGATION['api'];
$scope.breadcrumb = [];
}
});
Expand Down
4 changes: 4 additions & 0 deletions docs/app/src/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ angular.module('search', [])
};
}])

.controller('Error404SearchCtrl', ['$scope', '$location', 'docsSearch', function($scope, $location, docsSearch) {
$scope.results = docsSearch($location.path().split(/[\/\.:]/).pop());
}])

.factory('lunrSearch', function() {
return function(properties) {
if (window.RUNNING_IN_NG_TEST_RUNNER) return null;
Expand Down
8 changes: 4 additions & 4 deletions docs/app/src/tutorials.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ angular.module('tutorials', [])
element.addClass('btn-group');
element.addClass('tutorial-nav');
element.append(templateMerge(
'<a href="tutorial/{{prev}}"><li class="btn btn-primary"><i class="icon-step-backward"></i> Previous</li></a>\n' +
'<a href="http://angular.github.com/angular-phonecat/step-{{seq}}/app"><li class="btn btn-primary"><i class="icon-play"></i> Live Demo</li></a>\n' +
'<a href="https://github.com/angular/angular-phonecat/compare/step-{{diffLo}}...step-{{diffHi}}"><li class="btn btn-primary"><i class="icon-search"></i> Code Diff</li></a>\n' +
'<a href="tutorial/{{next}}"><li class="btn btn-primary">Next <i class="icon-step-forward"></i></li></a>', props));
'<a href="tutorial/{{prev}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-step-backward"></i> Previous</li></a>\n' +
'<a href="http://angular.github.com/angular-phonecat/step-{{seq}}/app"><li class="btn btn-primary"><i class="glyphicon glyphicon-play"></i> Live Demo</li></a>\n' +
'<a href="https://github.com/angular/angular-phonecat/compare/step-{{diffLo}}...step-{{diffHi}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-search"></i> Code Diff</li></a>\n' +
'<a href="tutorial/{{next}}"><li class="btn btn-primary">Next <i class="glyphicon glyphicon-step-forward"></i></li></a>', props));
}
};
})
Expand Down
4 changes: 4 additions & 0 deletions docs/config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ module.exports = function(config) {
require('./tag-defs/tutorial-step')
]);

config.append('processing.inlineTagDefinitions', [
require('./inline-tag-defs/type')
]);

config.set('processing.search.ignoreWordsFile', path.resolve(packagePath, 'ignore.words'));

config.prepend('rendering.templateFolders', [
Expand Down
12 changes: 12 additions & 0 deletions docs/config/inline-tag-defs/type.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
var typeClassFilter = require('dgeni-packages/ngdoc/rendering/filters/type-class');
var encoder = new require('node-html-encoder').Encoder();

module.exports = {
name: 'type',
description: 'Replace with markup that displays a nice type',
handlerFactory: function() {
return function(doc, tagName, tagDescription) {
return '<a href="" class="' + typeClassFilter.process(tagDescription) + '">'+encoder.htmlEncode(tagDescription) + '</a>';
};
}
};
6 changes: 6 additions & 0 deletions docs/config/processors/error-docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ module.exports = {
_.forEach(docs, function(doc) {
if ( doc.docType === 'error' ) {

// Parse out the error info from the id
parts = doc.name.split(':');
doc.namespace = parts[0];
doc.name = parts[1];


var namespaceDoc = errorNamespaces[doc.namespace];
if ( !namespaceDoc ) {
// First time we came across this namespace, so create a new one
Expand Down
7 changes: 4 additions & 3 deletions docs/config/processors/git-data.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
var gruntUtils = require('../../../lib/grunt/utils');
var versionInfo = require('../../../lib/versions/version-info');

module.exports = {
name: 'git-data',
runBefore: ['loading-files'],
description: 'This processor adds information from the local git repository to the extraData injectable',
init: function(config, injectables) {
injectables.value('gitData', {
version: gruntUtils.getVersion(),
versions: gruntUtils.getPreviousVersions(),
info: gruntUtils.getGitRepoInfo()
version: versionInfo.currentVersion,
versions: versionInfo.previousVersions,
info: versionInfo.gitRepoInfo
});
},
process: function(extraData, gitData) {
Expand Down
9 changes: 3 additions & 6 deletions docs/config/processors/pages-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,9 @@ module.exports = {
_(docs)
.filter(function(doc) { return doc.area === 'api'; })
.filter(function(doc) { return doc.docType === 'module'; })
.forEach(function(doc) { if ( !doc.path ) {
log.warn('Missing path property for ', doc.id);
}})
.map(function(doc) { return _.pick(doc, ['id', 'module', 'docType', 'area']); })
.tap(function(docs) {
log.debug(docs);
Expand Down Expand Up @@ -188,12 +191,6 @@ module.exports = {
area.navGroups = navGroupMapper(pages, area);
});

_.forEach(docs, function(doc) {
if ( !doc.path ) {
log.warn('Missing path property for ', doc.id);
}
});

// Extract a list of basic page information for mapping paths to paritals and for client side searching
var pages = _(docs)
.map(function(doc) {
Expand Down
Loading