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

Small improvements for bugs I ran into on mobile devices and older webkit browsers #6733

Closed
wants to merge 123 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
ee2d616
Older versions of Safari/webkit have a buggy implementation of the pu…
WardMe Dec 17, 2013
3486de2
Fixing an issue with iOS7 sending the change event before the value h…
WardMe Dec 17, 2013
66c05ef
Typo in the version number
WardMe Dec 17, 2013
0812061
chore(grunt): remove unnecessary white spaces
takashi Mar 4, 2014
a72bc4e
docs(tutorial/index): improve accessibility
Sharondio Dec 9, 2013
7325008
docs(tutorial): update step_08.ngdoc
cchungmin Mar 4, 2014
229a155
docs(guide/forms): fix a typo
mikeg0184 Mar 5, 2014
6d4ce24
docs(guide/services): clean up typos
zakj Mar 5, 2014
84f3670
docs(tutorial): update step_09.ngdoc
tpiere Jan 26, 2014
f39ac57
docs(directive.ngdoc): typo fix
tonybergeron Mar 5, 2014
8c7b9b8
style: enable jscs requireLeftStickedOperators rule
TimotheeJeannin Mar 4, 2014
4c4d24a
chore(publish.sh): publish to all serving backends
chirayuk Mar 5, 2014
1c20aed
docs(guide/services): minor fixes
moroshko Mar 6, 2014
e8c8c54
docs(tutorial): link update for Jasmine
edhedges Mar 7, 2014
021d3aa
chore(doc-gen): improve error reporting
petebacondarwin Mar 7, 2014
1537f80
chore(doc-gen): fix error-doc processor
petebacondarwin Mar 7, 2014
50ce574
docs($route): fix formatting of example code
petebacondarwin Mar 7, 2014
2eff326
chore(doc-gen): add inline @type tag
petebacondarwin Mar 7, 2014
dec5eb6
chore(doc-gen): add contentFolder config property
petebacondarwin Mar 7, 2014
7678501
chore(package): update dgeni dependencies
petebacondarwin Mar 7, 2014
ca0ac64
fix($compile): support templates with thead and tfoot root elements
lgalfaso Feb 17, 2014
a8aba89
docs(versions): rework the version info extraction
petebacondarwin Mar 11, 2014
550fc21
chore(build): refactor build version information
petebacondarwin Mar 11, 2014
e9e8d49
style(jsdoc tags): remove/ammend invalid tags
petebacondarwin Mar 7, 2014
5874db8
docs(tutorial): display button icons (Previous, Live Demo, ...)
Mar 11, 2014
822d7e5
docs(guide/directive): fix typo
SekibOmazic Mar 7, 2014
c0f3400
docs(guide/migration): fix typos
SekibOmazic Mar 7, 2014
dc39f36
docs(guide/migration): fix broken link
IgorMinar Mar 7, 2014
cfc6175
docs(ngBind): fix typo
SekibOmazic Mar 7, 2014
309cfd1
chore(build): upgrade grunt-jscs-checker to ~0.4.0
IgorMinar Mar 7, 2014
9223215
docs($sce): correct typo
SekibOmazic Mar 7, 2014
95d6cdc
docs(changelog): release notes for 1.3.0-beta.1 retractable-eyebrow
btford Mar 7, 2014
ebe280e
docs(404 errors): provide a better 404 experience
petebacondarwin Mar 7, 2014
63831f1
docs(Error404): improve search results layout
petebacondarwin Mar 8, 2014
96f94d4
docs(Error404): better heading
petebacondarwin Mar 8, 2014
b9d77d4
docs(tutorial/step-12): correct application name
cchungmin Mar 8, 2014
8e6d387
docs(guide/providers): remove unneeded word "the"
chadfennell Mar 9, 2014
0db301f
docs(guide/forms): remove unnecessary controller reference
Narretz Mar 3, 2014
a43c6e1
docs($route): change routes property to correct type
dusanbartos Mar 5, 2014
98f6a82
chore(docs): ensure the "Improve this doc" button is clickable
matsko Mar 10, 2014
1102ffa
docs(ngRepeat): Separate animation class in new lines
Basemm Mar 10, 2014
465663e
docs(route.js): changed html entities lt gt to < and >
lhaussknecht Mar 10, 2014
f2a6be3
chore(build): don't instruct Jenkins test on IE
IgorMinar Mar 6, 2014
612c882
chore(npm): add shrinkwrap to lock down dependencies
IgorMinar Mar 11, 2014
f3444d4
chore(version-info): better error msg if not tags
petebacondarwin Mar 12, 2014
809d47e
chore(version-info): use remote tags and increment patch version
tbosch Mar 12, 2014
0b7fef3
chore(shrinkwrap): re-run shrinkwrap locally
petebacondarwin Mar 13, 2014
602a114
chore(shrinkwrap): update dgeni-packages
petebacondarwin Mar 13, 2014
eadd8d0
docs(scripts/utils.inc): clarify documentation
petebacondarwin Mar 14, 2014
a41a2a1
fix(ngAnimate): setting classNameFilter disables animation inside ng-if
Mar 4, 2014
ee8e4a9
fix($$rAF): always fallback to a $timeout incase native rAF isn't sup…
matsko Mar 14, 2014
25e639b
chore(package.json): update dgeni-packages dependency
petebacondarwin Mar 11, 2014
aa4ba23
chore(doc-gen): fix dependencyPath
petebacondarwin Mar 11, 2014
ec16352
fix (ngAnimate): fix requestAnimationFrame for old version of Firefox
Mar 4, 2014
b068c8b
docs($resource): fix example using promise
wesleycho Jan 28, 2014
d69793d
docs(guide/unit-testing): fix typo
thynctank Mar 13, 2014
dfdb725
docs(guide/compiler): add missing closing parenthesis
n0nick Mar 13, 2014
7cbf61c
docs(ngMock): grammar nitpick.
NickHeiner Mar 13, 2014
f108a2a
fix($http): don't covert 0 status codes to 404 for non-file protocols
pkozlowski-opensource Mar 1, 2014
c794b96
chore(npm): clean up shrinkwrap file, remove unused properties
IgorMinar Mar 14, 2014
771bccc
chore(clean-shrinkwrap): add a utility to clean up the shrinkwrap file
petebacondarwin Mar 13, 2014
ca73363
chore(package.json): update karma to 0.12.0
IgorMinar Mar 15, 2014
fbb125a
fix($http): allow sending Blob data using $http
bbaia Nov 18, 2013
8d28d65
docs(guide/tutorial): make capitalization of "Angular" consistent
emilesilvis Mar 14, 2014
1b46a7d
chore(version-info): previousVersions should not return `undefined`
petebacondarwin Mar 18, 2014
c24e4e4
chore(package.json): update dgeni-packages dependency
petebacondarwin Mar 18, 2014
103cb51
docs(guide/concepts): move ng-app into example text
petebacondarwin Mar 18, 2014
922cb7e
chore(log): add `log.empty()` method to the testing logger
IgorMinar Mar 17, 2014
3dd9572
fix(Scope): $watchCollection should call listener with oldValue
IgorMinar Mar 17, 2014
e84da22
fix($$RAFProvider): check for webkitCancelRequestAnimationFrame
Traxmaxx Mar 4, 2014
d4ac254
test(ngMock): workaround issue with negative timestamps
brettporter Mar 18, 2014
83f37d7
fix(version-info): explicitly specify the remote
chirayuk Mar 14, 2014
1da4e89
chore(scripts): make the release script more flexible
vojtajina Mar 14, 2014
505ead7
chore(scripts): test seed and phonecat during a release
vojtajina Mar 14, 2014
6bb17af
chore(scripts): disable testing seed and phonecat during a release
vojtajina Mar 14, 2014
1517d6d
chore(scripts): fix the versions script
vojtajina Mar 14, 2014
320f6d1
chore(scripts): fix the versions script again
vojtajina Mar 14, 2014
dc149de
fix(select): avoid checking option element selected properties in render
Jan 26, 2014
de07dde
chore(angularjs.org/publish.sh): align release script with new website
petebacondarwin Mar 14, 2014
86ab885
chore(release): fix angularjs.org cdn script
tbosch Mar 20, 2014
ef88a8a
chore(CHANGELOG.md): add input type date PR as breaking change
tbosch Mar 13, 2014
eeb261b
chore: update changelog for 1.3.0-beta.2
jeffbcross Mar 14, 2014
7b5be9e
chore(CHANGELOG.md): add changelog for 1.3.0-beta.3
tbosch Mar 21, 2014
4b29186
docs(tutorial): fix broken link
Brianmanden Mar 17, 2014
770fd5a
docs(misc/contribute): make anchor links work properly
caitp Mar 17, 2014
5b93e5f
chore(shrinkwrap): grunt-jasmine-node is retrieved from github
petebacondarwin Mar 17, 2014
1f27501
docs(runnableExamples): add "edit in Plunker" button
petebacondarwin Mar 17, 2014
78bc84c
docs(guide/module): remove duplicate word
x-cray Mar 17, 2014
cad307f
docs(triaging): correct information about milestones
IgorMinar Mar 17, 2014
39635fd
docs(ngRoute): remove global controller syntax in the example
bradwheel Mar 9, 2014
9226b36
docs($http): update shortcut method description
linclark Mar 14, 2014
57b0d91
docs(ngInclude): make the quote type explicit
mark0978 Mar 8, 2014
98d825e
fix(jqLite): traverse `host` property for DocumentFragment in inherit…
caitp Mar 10, 2014
8f7f0d2
docs(ngForm): remove duplicate @param annotation
al-the-x Mar 17, 2014
8ba4525
docs(tutorial/step_12): link to API docs
janhancic Jan 26, 2014
c041686
docs(booleanAttrs): fix typo
SekibOmazic Mar 8, 2014
c7e6015
docs(tutorial/step_02): add experiment to update controller test
neiljohnston Mar 15, 2014
a86cb7d
docs(ngView): remove global controller definitions
UnicodeSnowman Mar 8, 2014
483325a
chore(formatting): removed unnecessary white spaces
takashi Mar 7, 2014
5fb298b
docs(migration): note that services can now return functions
wbyoko Mar 1, 2014
1c27e5f
docs(css): Fix word breaks issue in <pre>
Mar 7, 2014
f0347d5
docs(module): add link to mentioned resource
Mar 10, 2014
344cdce
docs(css): RegExp doesn't have .type-hint-regexp class
SekibOmazic Mar 7, 2014
dadce48
docs(errors/$compile/nonassing): update nonassign.ngdoc
poshest Mar 17, 2014
df80440
docs($cookies): cookies serializer only supports strings
recurrence Mar 16, 2014
6c82a49
docs(loader): add annotations to example
breyed Feb 15, 2014
9ab594a
docs($templateCache): use GFM example format rather than <pre> tags
jesselpalmer Jan 31, 2014
5b7f1bc
style($templateCache): remove trailing whitespace
caitp Mar 18, 2014
ca69dc6
chore(utils): fix version number processing
petebacondarwin Mar 18, 2014
0d60f8d
fix(angular.bootstrap): only allow angular to load once
siddii Jan 17, 2014
b91b311
docs(tutorial/step_05): removed stray "a"
frandroid Mar 18, 2014
916e53c
docs(tutorial/step_05): fix services link
frandroid Mar 18, 2014
01a34f5
fix(ngTouch): update workaround for desktop Webkit quirk
cconstantin Feb 18, 2014
93d1c95
fix(ngCookie): convert non-string values to string
caitp Mar 18, 2014
10d3e1e
fix(orderBy): support string predicates containing non-ident characters
caitp Feb 6, 2014
e48c28f
fix($rootScope): ng-repeat can't handle NaN values. #4605
SekibOmazic Feb 9, 2014
8fd47a1
docs($q): add mention of Antroid 2.x browser
thorn0 Feb 18, 2014
375c47d
docs($document): add a documentation example.
Mar 20, 2014
187b4ad
docs(tutorial): correct spelling mistake
alexgarrettsmith Mar 20, 2014
ad128e0
test($rootScope): add assertion to test ensuring that NaN -> NaN does…
caitp Mar 20, 2014
87b18b9
docs(changelog): remove 1.3 notes from 1.2
vojtajina Mar 21, 2014
a9b5a10
chore(CHANGELOG): add notes for 1.2.15
vojtajina Mar 21, 2014
2dfc376
Merge commit 'a9b5a1087ddea10c95318981c20c386a56ca19f7'
WardMe Mar 26, 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
83 changes: 68 additions & 15 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,56 @@
<a name="v1.2.15"></a>
# v1.2.15 beer-underestimating (2014-03-21)


## Bug Fixes

- **$$RAFProvider:** check for webkitCancelRequestAnimationFrame
([e84da228](https://github.com/angular/angular.js/commit/e84da2283c4e195be557f7b06c8783fe502acbbb),
[#6526](https://github.com/angular/angular.js/issues/6526))
- **$$rAF:** always fallback to a $timeout incase native rAF isn't supported
([ee8e4a94](https://github.com/angular/angular.js/commit/ee8e4a946ed8f943e00846b88d8d51c0b2cd1fab),
[#6654](https://github.com/angular/angular.js/issues/6654))
- **$compile:** support templates with thead and tfoot root elements
([ca0ac649](https://github.com/angular/angular.js/commit/ca0ac649971ae4fb50419b38f92a98d2226eb696),
[#6289](https://github.com/angular/angular.js/issues/6289))
- **$http:**
- allow sending Blob data using $http
([fbb125a3](https://github.com/angular/angular.js/commit/fbb125a3af164e52af2f8119175b04cbbed2f331),
[#5012](https://github.com/angular/angular.js/issues/5012))
- don't covert 0 status codes to 404 for non-file protocols
([f108a2a9](https://github.com/angular/angular.js/commit/f108a2a994149ecc011e29f327bcb8e11adf72d9),
[#6074](https://github.com/angular/angular.js/issues/6074), [#6155](https://github.com/angular/angular.js/issues/6155))
- **$rootScope:**
- ng-repeat can't handle NaN values. #4605
([e48c28fe](https://github.com/angular/angular.js/commit/e48c28fe9292efe7af6205b2be116d2350990c73),
[#4605](https://github.com/angular/angular.js/issues/4605))
- $watchCollection should call listener with oldValue
([3dd95727](https://github.com/angular/angular.js/commit/3dd9572754c7bafec30dd625f5c611346959c969),
[#2621](https://github.com/angular/angular.js/issues/2621), [#5661](https://github.com/angular/angular.js/issues/5661), [#5688](https://github.com/angular/angular.js/issues/5688), [#6736](https://github.com/angular/angular.js/issues/6736))
- **angular.bootstrap:** only allow angular to load once
([0d60f8d3](https://github.com/angular/angular.js/commit/0d60f8d367e38224696749b0f7de04bd60649815),
[#5863](https://github.com/angular/angular.js/issues/5863), [#5587](https://github.com/angular/angular.js/issues/5587))
- **jqLite:** traverse `host` property for DocumentFragment in inheritedData()
([98d825e1](https://github.com/angular/angular.js/commit/98d825e10d3bf76f47e69abba857a8933c8cb7d9),
[#6637](https://github.com/angular/angular.js/issues/6637))
- **ngAnimate:** setting classNameFilter disables animation inside ng-if
([a41a2a1d](https://github.com/angular/angular.js/commit/a41a2a1d2ce20f86ac2709592e4ada527160e580),
[#6539](https://github.com/angular/angular.js/issues/6539))
- **ngCookie:** convert non-string values to string
([93d1c95c](https://github.com/angular/angular.js/commit/93d1c95c61dbfa565333bb64527a103242175af7),
[#6151](https://github.com/angular/angular.js/issues/6151), [#6220](https://github.com/angular/angular.js/issues/6220))
- **ngTouch:** update workaround for desktop Webkit quirk
([01a34f51](https://github.com/angular/angular.js/commit/01a34f513bb567ed6d4c81d00d7c2a777c0dae01),
[#6302](https://github.com/angular/angular.js/issues/6302))
- **orderBy:** support string predicates containing non-ident characters
([10d3e1e4](https://github.com/angular/angular.js/commit/10d3e1e4472ab9f5cf4418b6438ec2e0f2b0b288),
[#6143](https://github.com/angular/angular.js/issues/6143), [#6144](https://github.com/angular/angular.js/issues/6144))
- **select:** avoid checking option element selected properties in render
([dc149de9](https://github.com/angular/angular.js/commit/dc149de9364c66b988f169f67cad39577ba43434),
[#2448](https://github.com/angular/angular.js/issues/2448), [#5994](https://github.com/angular/angular.js/issues/5994), [#6769](https://github.com/angular/angular.js/issues/6769))



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

Expand Down Expand Up @@ -275,26 +328,26 @@ The animation mock module has been renamed from `mock.animate` to `ngAnimateMock
## Breaking Changes

- **$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.
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:
To migrate your code, follow the example below:

Before:
Before:

// Will apply to POST, PUT and PATCH methods
$httpProvider.defaults.headers.post = {
"X-MY-CSRF-HEADER": "..."
};
// Will apply to POST, PUT and PATCH methods
$httpProvider.defaults.headers.post = {
"X-MY-CSRF-HEADER": "..."
};

After:
After:

// POST, PUT and PATCH default headers must be specified separately,
// as they do not share data.
$httpProvider.defaults.headers.post =
$httpProvider.defaults.headers.put =
$httpProviders.defaults.headers.patch = {
"X-MY-CSRF-HEADER": "..."
};
// POST, PUT and PATCH default headers must be specified separately,
// as they do not share data.
$httpProvider.defaults.headers.post =
$httpProvider.defaults.headers.put =
$httpProviders.defaults.headers.patch = {
"X-MY-CSRF-HEADER": "..."
};

<a name="1.2.8"></a>
# 1.2.8 interdimensional-cartography (2014-01-10)
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
6 changes: 3 additions & 3 deletions TRIAGING.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ This process based on the idea of minimizing user pain
1. Label `origin: google` for issues from Google

1. Assign a milestone:
* Current 1.x.y milestone - regressions and urgent bugs only
* Backlog - fixes; changes that should go into a patch release
* Ice Box - new features; changes that belong inß a major/minor release
* Backlog - triaged fixes and features, should be the default choice
* Current 1.x.y milestone (e.g. 1.3.0-beta-2) - regressions and urgent bugs only


1. Unassign yourself from the issue

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>
29 changes: 19 additions & 10 deletions docs/app/assets/css/docs.css
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,12 @@ h1,h2,h3,h4,h5,h6 {
}

pre {
padding:15px;
border:1px solid #ddd;
display:block;
border-radius:5px;
padding: 15px;
border: 1px solid #ddd;
border-radius: 5px;
display: block;
white-space: pre-wrap;
word-break: normal;
}

.aside-nav a,
Expand Down Expand Up @@ -464,6 +466,10 @@ iframe.example {
background:rgb(189, 63, 66);
}

.type-hint-regexp {
background: rgb(90, 84, 189);
}

.runnable-example-frame {
width:100%;
height:300px;
Expand Down Expand Up @@ -501,10 +507,6 @@ h4 {
padding-top:20px;
}

.improve-docs {
float:right;
}

.btn {
color:#428bca;
position: relative;
Expand Down Expand Up @@ -538,10 +540,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
4 changes: 3 additions & 1 deletion docs/app/src/docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ angular.module('DocsController', [])

.controller('DocsController', function($scope, $rootScope, $location, $window, $cookies, NG_PAGES, NG_NAVIGATION, NG_VERSION) {

$scope.docsVersion = NG_VERSION.isSnapshot ? 'snapshot' : NG_VERSION.version;

$scope.fold = function(url) {
if(url) {
$scope.docs_fold = '/notes/' + url;
Expand Down Expand Up @@ -87,7 +89,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
19 changes: 8 additions & 11 deletions docs/config/processors/pages-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ var AREA_NAMES = {
};

function getNavGroup(pages, area, pageSorter, pageMapper) {

var navItems = _(pages)
// We don't want the child to include the index page as this is already catered for
.omit(function(page) { return page.id === 'index'; })

// Apply the supplied sorting function
.sortBy(pageSorter)

// Apply the supplied mapping function
.map(pageMapper)

.value();

return {
Expand Down 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 @@ -173,7 +176,7 @@ module.exports = {
// - ngView
// - section "service"
// - $route
//
//
var areas = {};
_(navPages)
.groupBy('area')
Expand All @@ -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
4 changes: 2 additions & 2 deletions docs/config/templates/indexPage.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ <h4 class="search-results-group-heading">{{ key }}</h4>
<div class="container main-grid main-header-grid">
<div class="grid-left">
<div ng-controller="DocsVersionsCtrl" class="picker version-picker">
<select ng-options="v as ('v' + v.full) group by (v.isStable?'Stable':'Unstable') for v in docs_versions"
<select ng-options="v as ('v' + v.version + (v.isSnapshot ? ' (snapshot)' : '')) group by (v.isStable?'Stable':'Unstable') for v in docs_versions"
ng-model="docs_version"
ng-change="jumpToDocsVersion(docs_version)"
class="docs-version-jump">
Expand Down Expand Up @@ -219,7 +219,7 @@ <h4 class="search-results-group-heading">{{ key }}</h4>
</div>
<div class="grid-right">
<div id="loading" ng-show="loading">Loading...</div>
<div ng-hide="loading" ng-include="currentPage.outputPath" onload="afterPartialLoaded()" autoscroll></div>
<div ng-hide="loading" ng-include="currentPage.outputPath || 'Error404.html'" onload="afterPartialLoaded()" autoscroll></div>
</div>
</div>
</section>
Expand Down
Loading