From 5143e7bf065a3cbdf8400cf095b653d51bc83b8f Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 6 Jan 2012 18:10:47 -0800
Subject: feat(module): new module loader
---
docs/src/templates/doc_widgets.js | 70 +++++++++++++++++++--------------------
docs/src/templates/docs.js | 7 ++--
docs/src/templates/index.html | 3 +-
3 files changed, 39 insertions(+), 41 deletions(-)
(limited to 'docs/src')
diff --git a/docs/src/templates/doc_widgets.js b/docs/src/templates/doc_widgets.js
index eb8f36f6..c130add8 100644
--- a/docs/src/templates/doc_widgets.js
+++ b/docs/src/templates/doc_widgets.js
@@ -13,27 +13,31 @@
var HTML_TEMPLATE =
- '\n' +
- '\n' +
- ' \n' +
- ' \n' +
- '_HTML_SOURCE_\n' +
- ' \n' +
- '';
+ '\n' +
+ '\n' +
+ ' \n' +
+ '_SCRIPT_SOURCE_' +
+ ' \n' +
+ '_HTML_SOURCE_\n' +
+ ' \n' +
+ '';
angular.widget('doc:example', ['$injector', '$element', function($injector, element){
this.descend(true); //compile the example code
- var module = element.attr('module');
+ var module = element.attr('module') || '';
//jQuery find() methods in this widget contain primitive selectors on purpose so that we can use
//jqlite instead. jqlite's find() method currently supports onlt getElementsByTagName!
var example = element.find('pre').eq(0), //doc-source
- exampleSrc = example.text(),
+ scriptSrc = '',
+ htmlSrc = example.text().replace(/]*>([\s\S]+)<\/script>/im, function(_, script) {
+ scriptSrc = script;
+ return '';
+ }),
showSource = example.attr('source') !== 'false',
jsfiddle = example.attr('jsfiddle') || true,
scenario = element.find('pre').eq(1); //doc-scenario
- var code = indent(exampleSrc);
var tabHtml =
'';
@@ -43,13 +47,12 @@
'Source
- ' +
jsFiddleButton(jsfiddle) + // may or may not have value
- '
';
+ '
';
}
// show live preview tab
tabHtml +=
'Live Preview
' +
- '' + exampleSrc +'';
+ '' + htmlSrc +'';
// show scenario tab, if present
if (scenario.text()) {
tabHtml +=
@@ -62,19 +65,18 @@
tabs.find('li').eq(1).find('pre').text(
HTML_TEMPLATE.
- replace('_HTML_SOURCE_', code.html).
- replace('_MODULE_', (module ? (' ng:module="' + module + '"') : '')));
+ replace('_SCRIPT_SOURCE_', scriptSrc ? ' \n' : '').
+ replace('_HTML_SOURCE_', indent(htmlSrc, ' ')).
+ replace('_MODULE_', module ? '="' + module + '"' : ''));
element.html('');
element.append(tabs);
- var script = (exampleSrc.match(/]*>([\s\S]*)<\/script>/) || [])[1] || '';
-
try {
if (window.execScript) { // IE
- window.execScript(script || '"stupid IE!"'); // IE complains when evaling empty string
+ window.execScript(scriptSrc || '"stupid IE!"'); // IE complains when evaling empty string
} else {
- window.eval(script);
+ window.eval(scriptSrc);
}
} catch (e) {
alert(e);
@@ -86,20 +88,20 @@
function jsFiddleButton(jsfiddle) {
+ var fixJsFiddleIssue132 = true;
if (jsfiddle !== 'false') {
if(jsfiddle === true) {
//dynamically generate a fiddle
- var fiddleUrl = 'http://jsfiddle.net/api/post/library/pure/',
- fiddleSrc = exampleSrc,
- stripIndent = fiddleSrc.match(/^(\s*)/)[1].length;
+ var fiddleUrl = 'http://jsfiddle.net/api/post/library/pure/';
- //escape closing textarea
- fiddleSrc = fiddleSrc.replace(/<\/textarea>/gi,'</textarea>');
- //strip extra indentation
- fiddleSrc = fiddleSrc.replace(new RegExp('^\\s{' + stripIndent + '}', 'gm'), '');
+ function jsFiddleEscape(text, prefix) {
+ return indent(text.replace(/<\/textarea>/gi,'</textarea>'), prefix);
+ }
return '';
} else {
@@ -127,10 +128,10 @@
}
}]);
- function indent(text) {
+ function indent(text, prefix) {
+ prefix = prefix || '';
if (!text) return text;
var lines = text.split(/\r?\n/);
- var lineNo = [];
var i;
// remove any leading blank lines
@@ -147,10 +148,9 @@
}
for (i = 0; i < lines.length; i++) {
- lines[i] = ' ' + lines[i].substring(minIndent);
- lineNo.push(5 + i);
+ lines[i] = prefix + lines[i].substring(minIndent);
}
- return {html: lines.join('\n'), hilite: lineNo.join(',') };
+ return lines.join('\n');
}
var HTML_TPL =
diff --git a/docs/src/templates/docs.js b/docs/src/templates/docs.js
index 6b76a953..38a75236 100644
--- a/docs/src/templates/docs.js
+++ b/docs/src/templates/docs.js
@@ -152,10 +152,7 @@ function TutorialInstructionsCtrl($cookieStore) {
};
}
-window.angular = window.angular || {};
-angular.module = angular.module || {};
-
-angular.module.ngdocs = function($locationProvider, $filterProvider) {
+angular.module('ngdocs', [], function($locationProvider, $filterProvider) {
$locationProvider.html5Mode(true).hashPrefix('!');
$filterProvider.register('title', function(){
@@ -165,4 +162,4 @@ angular.module.ngdocs = function($locationProvider, $filterProvider) {
});
}
});
-};
+});
diff --git a/docs/src/templates/index.html b/docs/src/templates/index.html
index 8a6dc7a7..9054f095 100644
--- a/docs/src/templates/index.html
+++ b/docs/src/templates/index.html
@@ -1,6 +1,7 @@
@@ -27,7 +28,7 @@
type: 'text/css'});
addTag('script', {src: 'syntaxhighlighter/syntaxhighlighter-combined.js'}, sync);
if (jQuery) addTag('script', {src: 'jquery.min.js'});
- addTag('script', {src: angularPath, 'ng:autobind':'', 'ng:modules':'ngdocs'}, sync);
+ addTag('script', {src: angularPath}, sync);
addTag('script', {src: 'docs-combined.js'}, sync);
addTag('script', {src: 'docs-keywords.js'}, sync);
--
cgit v1.2.3