diff --git a/docs/components/angular-bootstrap/bootstrap-prettify.js b/docs/components/angular-bootstrap/bootstrap-prettify.js
index fa40c6e70789..b42c7c3a7b2c 100644
--- a/docs/components/angular-bootstrap/bootstrap-prettify.js
+++ b/docs/components/angular-bootstrap/bootstrap-prettify.js
@@ -7,6 +7,7 @@ var DEPENDENCIES = {
'angular.js': 'http://code.angularjs.org/' + angular.version.full + '/angular.min.js',
'angular-resource.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-resource.min.js',
'angular-route.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-route.min.js',
+ 'angular-animate.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-animate.min.js',
'angular-sanitize.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-sanitize.min.js',
'angular-cookies.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-cookies.min.js'
};
@@ -188,7 +189,7 @@ directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location',
return {
terminal: true,
link: function(scope, element, attrs) {
- var modules = [],
+ var modules = ['ngAnimate'],
embedRootScope,
deregisterEmbedRootScope;
diff --git a/docs/src/ngdoc.js b/docs/src/ngdoc.js
index eb26bbf25e16..177fbd21a53e 100644
--- a/docs/src/ngdoc.js
+++ b/docs/src/ngdoc.js
@@ -190,6 +190,7 @@ Doc.prototype = {
var example = new Example(self.scenarios);
if(animations) {
example.enableAnimations();
+ example.addDeps('angular-animate.js');
}
example.setModule(module);
diff --git a/docs/src/templates/css/animations.css b/docs/src/templates/css/animations.css
index a12ecb7b01bd..81db50bac80a 100644
--- a/docs/src/templates/css/animations.css
+++ b/docs/src/templates/css/animations.css
@@ -64,18 +64,6 @@
height:0;
}
-.example-animate-container {
- position:relative;
- background:white;
- border:1px solid black;
- height:40px;
- overflow:hidden;
-}
-
-.example-animate-container > div {
- padding:1em;
-}
-
.animate-container.animations-off * {
-webkit-transition: none;
-moz-transition: none;
diff --git a/docs/src/templates/js/docs.js b/docs/src/templates/js/docs.js
index 1413a0de9b61..f52c2216b55c 100644
--- a/docs/src/templates/js/docs.js
+++ b/docs/src/templates/js/docs.js
@@ -357,32 +357,123 @@ docsApp.serviceFactory.formPostData = function($document) {
};
};
-docsApp.serviceFactory.openPlunkr = function(templateMerge, formPostData, angularUrls) {
+
+docsApp.serviceFactory.prepareDefaultAppModule = function() {
return function(content) {
+ var deps = [];
+ angular.forEach(content.deps, function(file) {
+ if(file.name == 'angular-animate.js') {
+ deps.push('ngAnimate');
+ }
+ });
+
+ var moduleName = 'App';
+ return {
+ module : moduleName,
+ script : "angular.module('" + moduleName + "', ['" + deps.join("','") + "']);\n\n"
+ };
+ };
+};
+
+docsApp.serviceFactory.prepareEditorAssetTags = function(angularUrls) {
+ return function(content, options) {
+ options = options || {};
+ var includeLocalFiles = options.includeLocalFiles;
+ var html = makeScriptTag(angularUrls['angular.js']);
+
var allFiles = [].concat(content.js, content.css, content.html, content.json);
- var indexHtmlContent = '\n' +
- '\n' +
- ' \n' +
- ' \n' +
- '{{scriptDeps}}\n' +
- ' \n' +
- ' \n\n' +
- '{{indexContents}}' +
- '\n\n \n' +
- '\n';
- var scriptDeps = '';
angular.forEach(content.deps, function(file) {
if (file.name !== 'angular.js') {
- scriptDeps += ' \n';
+ var isLocal = false;
+ for(var i=0;i\n';
+ };
+
+ function makeCssLinkTag(src) {
+ return '\n';
+ };
+ };
+};
+
+
+docsApp.serviceFactory.openPlunkr = function(templateMerge, formPostData, prepareEditorAssetTags, prepareDefaultAppModule) {
+ return function(content) {
+ var hasRouting = false;
+ angular.forEach(content.deps, function(file) {
+ hasRouting = hasRouting || file.name == 'angular-route.js';
+ });
+ var indexHtmlContent = '\n' +
+ '\n' +
+ ' \n' +
+ '{{scriptDeps}}';
+
+ if(hasRouting) {
+ indexHtmlContent += '\n';
+ }
+
+ indexHtmlContent += '\n' +
+ ' \n\n' +
+ '{{indexContents}}\n\n' +
+ ' \n' +
+ '\n';
+
indexProp = {
module: content.module,
- angularJSUrl: angularUrls['angular.js'],
- scriptDeps: scriptDeps,
+ scriptDeps: prepareEditorAssetTags(content, { includeLocalFiles : true }),
indexContents: content.html[0].content
};
+
+ var allFiles = [].concat(content.js, content.css, content.html, content.json);
+
+ if(!content.module) {
+ var moduleData = prepareDefaultAppModule(content);
+ indexProp.module = moduleData.module;
+
+ var found = false;
+ angular.forEach(content.js, function(file) {
+ if(file.name == 'script.js') {
+ file.content = moduleData.script + file.content;
+ found = true;
+ }
+ });
+ if(!found) {
+ indexProp.scriptDeps += '\n';
+ allFiles.push({
+ name : 'script.js',
+ content : moduleData.script
+ });
+ }
+ };
+
var postData = {};
+
angular.forEach(allFiles, function(file, index) {
if (file.content && file.name != 'index.html') {
postData['files[' + file.name + ']'] = file.content;
@@ -399,13 +490,14 @@ docsApp.serviceFactory.openPlunkr = function(templateMerge, formPostData, angula
};
};
-docsApp.serviceFactory.openJsFiddle = function(templateMerge, formPostData, angularUrls) {
-
+docsApp.serviceFactory.openJsFiddle = function(templateMerge, formPostData, prepareEditorAssetTags, prepareDefaultAppModule) {
var HTML = '\n{{html:2}}
',
- CSS = ' \n' +
- '{{head:0}} \n' +
+ '{{head:0}}