jeena/Podcast
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Update Angular to 1.2.0 RC2

Browse source
This commit is contained in:
Colin Frei 2013-09-22 11:10:37 +02:00
parent 7416269494
commit 0d3a40980e
184 changed files with 17993 additions and 21133 deletions
Download patch file Download diff file Expand all files Collapse all files

33
lib/angular/docs/index-jq.html
View file

@ -20,6 +20,11 @@
// we can't add css/js the usual way, because some browsers (FF) eagerly prefetch resources
// before the base attribute is added, causing 404 and terribly slow loading of the docs app.
(function() {
if (window.name.indexOf('NG_DEFER_BOOTSTRAP!') == 0) {
//TODO(i): super ugly hack to temporarily speed up our e2e tests until we move to protractor + extracted examples
window.RUNNING_IN_NG_TEST_RUNNER = true;
}
var indexFile = (location.pathname.match(/\/(index[^\.]*\.html)/) || ['', ''])[1],
rUrl = /(#!\/|api|guide|misc|tutorial|cookbook|error|index[^\.]*\.html).*$/,
baseUrl = location.href.replace(rUrl, indexFile),
@ -29,8 +34,8 @@
headEl = document.getElementsByTagName('head')[0],
sync = true,
angularVersion = {
current: '1.2.0rc1', // rewrite during build
cdn: '1.1.4'
current: '1.2.0-rc.2', // rewrite during build
cdn: '1.2.0rc1'
};
addTag('base', {href: baseUrl});
@ -49,8 +54,10 @@
addTag('script', {src: path('angular-animate.js') }, sync);
addTag('script', {src: 'components/angular-bootstrap.js' }, sync);
addTag('script', {src: 'components/angular-bootstrap-prettify.js' }, sync);
addTag('script', {src: 'components/google-code-prettify.js' }, sync);
addTag('script', {src: 'components/' + (debug ? 'lunr.js' : 'lunr.min.js') }, sync);
if (!window.RUNNING_IN_NG_TEST_RUNNER) {
addTag('script', {src: 'components/google-code-prettify.js' }, sync);
addTag('script', {src: 'components/' + (debug ? 'lunr.js' : 'lunr.min.js') }, sync);
}
addTag('script', {src: 'components/marked.js' }, sync);
addTag('script', {src: 'docs-data.js'}, sync);
addTag('script', {src: 'js/docs.js'}, sync);
@ -112,11 +119,13 @@
_gaq.push(['_setAccount', 'UA-8594346-3']);
_gaq.push(['_setDomainName', '.angularjs.org']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
if (!window.RUNNING_IN_NG_TEST_RUNNER) {
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
}
</script>
</head>
@ -241,9 +250,9 @@
<div class="span3">
<div class="well">
<div ng-controller="DocsVersionsCtrl">
<select ng-options="v.version as v.title group by v.group for v in versions"
ng-model="version"
ng-change="jumpToDocsVersion(version)"
<select ng-options="v as v.title group by v.group for v in docs_versions"
ng-model="docs_version"
ng-change="jumpToDocsVersion(docs_version)"
class="docs-version-jump">
</select>
</div>