Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ function processDoc(opts) {
if (/^((https?:)?\/\/)/.test(file)) {
return file;
} else {
fstreams.push(streamFile(file, path.join('js', path.dirname(fileName)), fakeDest));
return path.join('js', fileName);
fstreams.push(streamFile(file, 'js', fakeDest));
return path.join('js', path.basename(fileName));
}
});

Expand All @@ -313,8 +313,8 @@ function processDoc(opts) {
if (/^((https?:)?\/\/)/.test(file)) {
return file;
} else {
fstreams.push(streamFile(file, path.join('css', path.dirname(fileName)), fakeDest));
return path.join('css', fileName);
fstreams.push(streamFile(file, 'css', fakeDest));
return path.join('css', path.basename(fileName));
}
});

Expand Down
2 changes: 1 addition & 1 deletion src/reader.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function process(content, file, section, options) {
// console.log('-section-----\n' + section)
// console.log('-options-----\n' + JSON.stringify(options, null, 2))
// console.log('')
if (/\.js|.ts$/.test(file)) {
if (/(\.js|\.ts)$/.test(file)) {
processJsFile(content, file, section, options).forEach(function(doc) {
exports.docs.push(doc);
});
Expand Down
26 changes: 23 additions & 3 deletions src/templates/css/docs.css
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@ img.AngularJS-small {
font-weight: bold;
font-size: 13px;
color: black;
overflow: hidden;
text-overflow: ellipsis;
}

.form-search > ul.nav > li > a {
margin: 0;
overflow: auto;
}

.form-search > ul.nav > li.module {
Expand Down Expand Up @@ -139,8 +140,27 @@ img.AngularJS-small {
/* Content */
/* =============================== */

.improve-docs {
.edit-example {
margin-top: 9px;
}

.improve-docs, .view-source, .edit-example {
float: right;
margin-left: 35px;
position: relative;
}

.improve-docs i, .view-source i, .edit-example i {
position: absolute;
left: -20px;
top: 50%;
margin-top: -.5em;
text-decoration: none !important;
}

.methods .view-source {
margin: -0.5em 0 0 0;
text-decoration: none !important;
}

.hint {
Expand Down Expand Up @@ -217,7 +237,7 @@ ul.methods > li > h3,
ul.properties > li > h3,
ul.events > li > h3 {
margin: -19px -19px 1em -19px;
padding: .25em 19px;
padding: .25em 39px .25em 19px;
background-color: #d3d3d3;
font-family: monospace;
}
Expand Down
5 changes: 1 addition & 4 deletions src/templates/css/prettify.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,9 @@

pre.prettyprint {
padding: 8px;
border: 1px solid #e1e1e8;
}
pre.prettyprint:not(.alert) {
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
}

pre.prettyprint.linenums {
-webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
Expand Down
12 changes: 5 additions & 7 deletions src/templates/js/angular-bootstrap-prettify.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ directive.ngEvalJavascript = ['getEmbeddedTemplate', function(getEmbeddedTemplat
}];


directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location', '$sniffer', '$animate', '$exceptionHandler',
function($templateCache, $browser, docsRootScope, $location, $sniffer, $animate, $exceptionHandler) {
directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location', '$sniffer', '$exceptionHandler',
function($templateCache, $browser, docsRootScope, $location, $sniffer, $exceptionHandler) {
return {
terminal: true,
link: function(scope, element, attrs) {
Expand All @@ -205,7 +205,6 @@ directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location',
$provide.value('$anchorScroll', angular.noop);
$provide.value('$browser', $browser);
$provide.value('$sniffer', $sniffer);
$provide.value('$animate', $animate);
$provide.provider('$location', function() {
this.$get = ['$rootScope', function($rootScope) {
docsRootScope.$on('$locationChangeSuccess', function(event, oldUrl, newUrl) {
Expand Down Expand Up @@ -254,11 +253,10 @@ directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location',
});

element.bind('$destroy', function() {
if(deregisterEmbedRootScope){
deregisterEmbedRootScope()
if (deregisterEmbedRootScope) {
deregisterEmbedRootScope();
}

if(embedRootScope){
if (embedRootScope) {
embedRootScope.$destroy();
}
});
Expand Down
230 changes: 230 additions & 0 deletions src/templates/js/angular.min.js

Large diffs are not rendered by default.

35 changes: 21 additions & 14 deletions src/templates/js/docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ docsApp.directive.code = function() {

docsApp.directive.sourceEdit = function(getEmbeddedTemplate) {
return NG_DOCS.editExample ? {
template: '<a class="btn pull-right" ng-click="plunkr($event)" href>' +
'<i class="icon-pencil"></i> Edit in Plunkr</a>',
template: '<a class="edit-example pull-right" ng-click="plunkr($event)" href>' +
'<i class="icon-edit"></i> Edit in Plunkr</a>',
scope: true,
controller: function($scope, $attrs, openPlunkr) {
var sources = {
Expand Down Expand Up @@ -112,20 +112,17 @@ docsApp.directive.sourceEdit = function(getEmbeddedTemplate) {

docsApp.serviceFactory.loadedUrls = function($document) {
var urls = {};
var tmp = document.createElement ('a');

angular.forEach($document.find('script'), function(script) {
tmp.href = script.src;
var match = script.src.match(/^.*\/([^\/]*\.js)$/);
if (match) {
urls[tmp.pathname] = match[0];
urls[match[1].replace(/(\-\d.*)?(\.min)?\.js$/, '.js')] = match[0];
}
});

urls.base = [];
angular.forEach(NG_DOCS.scripts, function(script) {
tmp.href = script;
var match = urls[tmp.pathname];
var match = urls[script.replace(/(\-\d.*)?(\.min)?\.js$/, '.js')];
if (match) {
urls.base.push(match);
}
Expand Down Expand Up @@ -202,13 +199,11 @@ docsApp.serviceFactory.sections = function serviceFactory() {
getPage: function(sectionId, partialId) {
var pages = sections[sectionId];

if (pages) {
partialId = partialId || 'index';
partialId = partialId || 'index';

for (var i = 0, ii = pages.length; i < ii; i++) {
if (pages[i].id == partialId) {
return pages[i];
}
for (var i = 0, ii = pages.length; i < ii; i++) {
if (pages[i].id == partialId) {
return pages[i];
}
}
return null;
Expand Down Expand Up @@ -523,7 +518,19 @@ docsApp.controller.DocsController = function($scope, $location, $window, section
}
};

angular.module('docsApp', ['ngAnimate', 'bootstrap', 'bootstrapPrettify']).
function module(name, modules, optional) {
if (optional) {
angular.forEach(optional, function(name) {
try {
angular.module(name);
modules.push(name);
} catch(e) {}
});
}
return angular.module(name, modules);
}

module('docsApp', ['bootstrap', 'bootstrapPrettify'], ['ngAnimate']).
config(function($locationProvider) {
if (NG_DOCS.html5Mode) {
$locationProvider.html5Mode(true).hashPrefix('!');
Expand Down
Loading