kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-06-18 03:58:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

docs(app): minor refactoring of 'docs/app/src/*'

Browse Source
This commit is contained in:
Georgios Kalpakas
2014-11-28 17:59:08 +02:00
committed by Caitlin Potter
parent 8edece2207
commit c820655ccd
8 changed files with 96 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/app/src/app.js
View File

@@ -1,3 +1,5 @@
'use strict';
angular.module('docsApp', [
'ngMaterial',
'DocsController',

8
docs/app/src/directives.js
View File

@@ -10,13 +10,13 @@ angular.module('directives', [])
return function link(scope, element) {
element.on('click', function(event) {
$location.hash('');
scope.$apply($anchorScroll);
$anchorScroll();
});
};
}])
.directive('code', function() {
.directive('code', ['$window', function($window) {
return {
restrict: 'E',
terminal: true,
@@ -25,10 +25,10 @@ angular.module('directives', [])
var match = /lang-(\S+)/.exec(element[0].className);
var lang = match && match[1];
var html = element.html();
element.html(window.prettyPrintOne(html, lang, linenums));
element.html($window.prettyPrintOne(html, lang, linenums));
}
};
})
}])
.directive('scrollYOffsetElement', ['$anchorScroll', function($anchorScroll) {
return function(scope, element) {

6
docs/app/src/docs.js
View File

@@ -25,13 +25,13 @@ angular.module('DocsController', [])
$window._gaq.push(['_trackPageview', pagePath]);
});
$scope.$watch(function docsPathWatch() {return $location.path(); }, function docsPathWatchAction(path) {
$scope.$watch(function docsPathWatch() { return $location.path(); }, function docsPathWatchAction(path) {
path = path.replace(/^\/?(.+?)(\/index)?\/?$/, '$1');
currentPage = $scope.currentPage = NG_PAGES[path];
var currentPage = $scope.currentPage = NG_PAGES[path];
if ( currentPage ) {
if (currentPage) {
$scope.partialPath = 'partials/' + path + '.html';
$scope.currentArea = NG_NAVIGATION[currentPage.area];
var pathParts = currentPage.path.split('/');

20
docs/app/src/errors.js
View File

@@ -1,23 +1,23 @@
angular.module('errors', ['ngSanitize'])
.filter('errorLink', ['$sanitize', function ($sanitize) {
.filter('errorLink', ['$sanitize', function($sanitize) {
var LINKY_URL_REGEXP = /((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s\.\;\,\(\)\{\}<>]/g,
MAILTO_REGEXP = /^mailto:/,
STACK_TRACE_REGEXP = /:\d+:\d+$/;
var truncate = function (text, nchars) {
var truncate = function(text, nchars) {
if (text.length > nchars) {
return text.substr(0, nchars - 3) + '...';
}
return text;
};
return function (text, target) {
return function(text, target) {
var targetHtml = target ? ' target="' + target + '"' : '';
if (!text) return text;
return $sanitize(text.replace(LINKY_URL_REGEXP, function (url) {
return $sanitize(text.replace(LINKY_URL_REGEXP, function(url) {
if (STACK_TRACE_REGEXP.test(url)) {
return url;
}
@@ -47,16 +47,14 @@ angular.module('errors', ['ngSanitize'])
});
};
return {
link: function (scope, element, attrs) {
var search = $location.search(),
return function (scope, element, attrs) {
var search = $location.search(),
formatArgs = [attrs.errorDisplay],
i;
for (i = 0; angular.isDefined(search['p'+i]); i++) {
formatArgs.push(search['p'+i]);
}
element.html(errorLinkFilter(interpolate.apply(null, formatArgs), '_blank'));
for (i = 0; angular.isDefined(search['p'+i]); i++) {
formatArgs.push(search['p'+i]);
}
element.html(errorLinkFilter(interpolate.apply(null, formatArgs), '_blank'));
};
}]);

4
docs/app/src/examples.js
View File

@@ -2,7 +2,7 @@ angular.module('examples', [])
.factory('formPostData', ['$document', function($document) {
return function(url, fields) {
/**
/*
* Form previously posted to target="_blank", but pop-up blockers were causing this to not work.
* If a user chose to bypass pop-up blocker one time and click the link, they would arrive at
* a new default plnkr, not a plnkr with the desired template.
@@ -48,7 +48,7 @@ angular.module('examples', [])
// The manifests provide the production index file but Plunkr wants
// a straight index.html
if (filename === "index-production.html") {
filename = "index.html"
filename = "index.html";
}
return {

74
docs/app/src/search.js
View File

@@ -15,25 +15,21 @@ angular.module('search', [])
angular.forEach(hits, function(hit) {
var area = hit.area;
var limit = (area == 'api') ? 40 : 14;
var limit = (area === 'api') ? 40 : 14;
results[area] = results[area] || [];
if(results[area].length < limit) {
results[area].push(hit);
}
});
var totalAreas = 0;
for(var i in results) {
++totalAreas;
}
var totalAreas = Object.keys(results).length;
if(totalAreas > 0) {
$scope.colClassName = 'cols-' + totalAreas;
}
$scope.hasResults = totalAreas > 0;
$scope.results = results;
});
}
else {
} else {
clearResults();
}
if(!$scope.$$phase) $scope.$apply();
@@ -65,16 +61,17 @@ angular.module('search', [])
.controller('Error404SearchCtrl', ['$scope', '$location', 'docsSearch',
function($scope, $location, docsSearch) {
docsSearch($location.path().split(/[\/\.:]/).pop()).then(function(results) {
$scope.results = {};
angular.forEach(results, function(result) {
var area = $scope.results[result.area] || [];
area.push(result);
$scope.results[result.area] = area;
function($scope, $location, docsSearch) {
docsSearch($location.path().split(/[\/\.:]/).pop()).then(function(results) {
$scope.results = {};
angular.forEach(results, function(result) {
var area = $scope.results[result.area] || [];
area.push(result);
$scope.results[result.area] = area;
});
});
});
}])
}
])
.provider('docsSearch', function() {
@@ -82,9 +79,9 @@ angular.module('search', [])
// This version of the service builds the index in the current thread,
// which blocks rendering and other browser activities.
// It should only be used where the browser does not support WebWorkers
function localSearchFactory($http, $timeout, NG_PAGES) {
function localSearchFactory($http, $log, $timeout, NG_PAGES) {
console.log('Using Local Search Index');
$log.log('Using Local Search Index');
// Create the lunr index
var index = lunr(function() {
@@ -121,14 +118,14 @@ angular.module('search', [])
});
};
}
localSearchFactory.$inject = ['$http', '$timeout', 'NG_PAGES'];
localSearchFactory.$inject = ['$http', '$log', '$timeout', 'NG_PAGES'];
// This version of the service builds the index in a WebWorker,
// which does not block rendering and other browser activities.
// It should only be used where the browser does support WebWorkers
function webWorkerSearchFactory($q, $rootScope, NG_PAGES) {
function webWorkerSearchFactory($log, $q, $rootScope, NG_PAGES) {
console.log('Using WebWorker Search Index')
$log.log('Using WebWorker Search Index');
var searchIndex = $q.defer();
var results;
@@ -163,14 +160,15 @@ angular.module('search', [])
return searchIndex.promise.then(function() {
results = $q.defer();
worker.postMessage({ q: q });
worker.postMessage({q: q});
return results.promise;
});
};
}
webWorkerSearchFactory.$inject = ['$q', '$rootScope', 'NG_PAGES'];
webWorkerSearchFactory.$inject = ['$log', '$q', '$rootScope', 'NG_PAGES'];
return {
// TODO(gkalpak): Would be nice to use `$window` (e.g. for easier testing)
$get: window.Worker ? webWorkerSearchFactory : localSearchFactory
};
})
@@ -188,31 +186,47 @@ angular.module('search', [])
scope.$eval(attrs.focused + '=false');
});
});
// TODO(gkalpak): Do we need this if we first register the listeners
// and the call `.focus()` ?
scope.$eval(attrs.focused + '=true');
};
})
.directive('docsSearchInput', ['$document',function($document) {
.directive('docsSearchInput', ['$document', function($document) {
var doc = $document[0];
var body = angular.element(doc.body);
return function(scope, element, attrs) {
var ESCAPE_KEY_KEYCODE = 27,
FORWARD_SLASH_KEYCODE = 191;
angular.element($document[0].body).on('keydown', function(event) {
element.on('keydown', onInputKeydown);
body.on('keydown', onBodyKeydown);
// Since we are attaching a listener to <body>,
// it is a good idea to detach it upon scope destruction
// (Not likely to happen with the current implemetation, but...things change.)
scope.$on('$destroy', function() {
body.off('keydown', onBodyKeydown);
});
function onBodyKeydown(event) {
var input = element[0];
if(event.keyCode == FORWARD_SLASH_KEYCODE && document.activeElement != input) {
if ((event.keyCode === FORWARD_SLASH_KEYCODE) && (doc.activeElement !== input)) {
event.stopPropagation();
event.preventDefault();
input.focus();
}
});
}
element.on('keydown', function(event) {
if(event.keyCode == ESCAPE_KEY_KEYCODE) {
function onInputKeydown(event) {
if (event.keyCode === ESCAPE_KEY_KEYCODE) {
event.stopPropagation();
event.preventDefault();
scope.$apply(function() {
scope.hideResults();
});
}
});
}
};
}]);

10
docs/app/src/tutorials.js
View File

@@ -10,8 +10,9 @@ angular.module('tutorials', [])
return {
scope: {},
template:
// TODO(gkalpak): Remove Bootstrap-specific staff
'<a ng-href="tutorial/{{prev}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-step-backward"></i> Previous</li></a>\n' +
'<a ng-href="http://angular.github.io/angular-phonecat/step-{{seq}}/app"><li class="btn btn-primary"><i class="glyphicon glyphicon-play"></i> Live Demo</li></a>\n' +
'<a ng-href="https://angular.github.io/angular-phonecat/step-{{seq}}/app"><li class="btn btn-primary"><i class="glyphicon glyphicon-play"></i> Live Demo</li></a>\n' +
'<a ng-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 ng-href="tutorial/{{next}}"><li class="btn btn-primary">Next <i class="glyphicon glyphicon-step-forward"></i></li></a>',
link: function(scope, element, attrs) {
@@ -32,18 +33,19 @@ angular.module('tutorials', [])
.directive('docTutorialReset', function() {
return {
scope: {
'step': '@docTutorialReset'
step: '@docTutorialReset'
},
template:
// TODO(gkalpak): Remove Bootstrap-specific staff
'<p><a href="" ng-click="show=!show;$event.stopPropagation()">Workspace Reset Instructions ➤</a></p>\n' +
'<div class="alert alert-info" ng-show="show">\n' +
' <p>Reset the workspace to step {{step}}.</p>' +
' <p><pre>git checkout -f step-{{step}}</pre></p>\n' +
' <p>Refresh your browser or check out this step online: '+
'<a href="http://angular.github.io/angular-phonecat/step-{{step}}/app">Step {{step}} Live Demo</a>.</p>\n' +
'<a href="https://angular.github.io/angular-phonecat/step-{{step}}/app">Step {{step}} Live Demo</a>.</p>\n' +
'</div>\n' +
'<p>The most important changes are listed below. You can see the full diff on ' +
'<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{step ? (step - 1): \'0~1\'}}...step-{{step}}">GitHub</a>\n' +
'</p>'
};
});
});

34
docs/app/src/versions.js
View File

@@ -2,8 +2,9 @@ angular.module('versions', [])
.controller('DocsVersionsCtrl', ['$scope', '$location', '$window', 'NG_VERSIONS', function($scope, $location, $window, NG_VERSIONS) {
$scope.docs_version = NG_VERSIONS[0];
$scope.docs_versions = NG_VERSIONS;
for(var i=0, minor = NaN; i < NG_VERSIONS.length; i++) {
for (var i = 0, ii = NG_VERSIONS.length, minor = NaN; i < ii; i++) {
var version = NG_VERSIONS[i];
// NaN will give false here
if (minor <= version.minor) {
@@ -13,17 +14,34 @@ angular.module('versions', [])
minor = version.minor;
}
$scope.docs_versions = NG_VERSIONS;
$scope.getGroupName = function(v) {
return v.isLatest ? 'Latest' : (v.isStable ? 'Stable' : 'Unstable');
};
$scope.getGroupName = getGroupName;
$scope.groupBy = groupBy;
$scope.jumpToDocsVersion = jumpToDocsVersion;
$scope.jumpToDocsVersion = function(version) {
function getGroupName(v) {
return v.isLatest ? 'Latest' : ('v' + v.major + '.' + v.minor + '.x');
}
// TODO(gkalpak): Do we really need this as a "public" function ?
// Would a one-time groupping (in JS) be sufficient ?
function groupBy(items, prop) {
var groupped = {};
var getter = angular.isFunction(prop) ? prop : function(item) { return item[prop]; };
items.forEach(function(item) {
var groupName = getter(item);
var groupList = groupped[groupName] = (groupped[groupName] || []);
groupList.push(item);
});
return groupped;
}
function jumpToDocsVersion(version) {
var currentPagePath = $location.path().replace(/\/$/, '');
// TODO: We need to do some munging of the path for different versions of the API...
$window.location = version.docsUrl + currentPagePath;
};
}
}]);