chore(compiler): change default restriction to attribute only for directives

3 files changed, 77 insertions, 77 deletions

diff --git a/docs/src/ngdoc.js b/docs/src/ngdoc.js
index fc606d54..4fdfe21d 100644
--- a/docs/src/ngdoc.js
+++ b/docs/src/ngdoc.js
@@ -365,15 +365,50 @@ Doc.prototype = {
   html_usage_directive: function(dom){
     var self = this;
     dom.h('Usage', function() {
-      dom.tag('pre', {'class':"brush: js; html-script: true;"}, function() {
-        dom.text('<' + self.element + ' ');
-        dom.text(self.shortName);
-        if (self.param.length) {
-          dom.text('="' + self.param[0].name + '"');
-        }
-        dom.text('>\n   ...\n');
-        dom.text('</' + self.element + '>');
-      });
+      var restrict = self.restrict || 'AC';
+      if (restrict.match(/E/)) {
+        dom.text('as element');
+        dom.code(function() {
+          dom.text('<');
+          dom.text(self.shortName);
+          (self.param||[]).forEach(function(param){
+            dom.text('\n      ');
+            dom.text(param.optional ? ' [' : ' ');
+            dom.text(param.name);
+            dom.text(BOOLEAN_ATTR[param.name] ? '' : '="..."');
+            dom.text(param.optional ? ']' : '');
+          });
+          dom.text('></');
+          dom.text(self.shortName);
+          dom.text('>');
+        });
+      }
+      if (restrict.match(/A/)) {
+        var element = self.element || 'ANY'
+        dom.text('as attribute');
+        dom.code(function() {
+          dom.text('<' + element + ' ');
+          dom.text(self.shortName);
+          if (self.param.length) {
+            dom.text('="' + self.param[0].name + '"');
+          }
+          dom.text('>\n   ...\n');
+          dom.text('</' + element + '>');
+        });
+      }
+      if (restrict.match(/C/)) {
+        dom.text('as class');
+        var element = self.element || 'ANY'
+        dom.code(function() {
+          dom.text('<' + element + ' class="');
+          dom.text(self.shortName);
+          if (self.param.length) {
+            dom.text(': ' + self.param[0].name + ';');
+          }
+          dom.text('">\n   ...\n');
+          dom.text('</' + element + '>');
+        });
+      }
       self.html_usage_directiveInfo(dom);
       self.html_usage_parameters(dom);
     });
@@ -427,46 +462,6 @@ Doc.prototype = {
     });
   },
 
-  html_usage_widget: function(dom){
-    var self = this;
-    dom.h('Usage', function() {
-      dom.h('In HTML Template Binding', function() {
-        dom.code(function() {
-          if (self.shortName.match(/^@/)) {
-            dom.text('<');
-            dom.text(self.element);
-            dom.text(' ');
-            dom.text(self.shortName.substring(1));
-            if (self.param.length) {
-              dom.text('="');
-              dom.text(self.param[0].name);
-              dom.text('"');
-            }
-            dom.text('>\n   ...\n</');
-            dom.text(self.element);
-            dom.text('>');
-          } else {
-            dom.text('<');
-            dom.text(self.shortName);
-            (self.param||[]).forEach(function(param){
-              dom.text('\n      ');
-              dom.text(param.optional ? ' [' : ' ');
-              dom.text(param.name);
-              dom.text(BOOLEAN_ATTR[param.name] ? '' : '="..."');
-              dom.text(param.optional ? ']' : '');
-            });
-            dom.text('></');
-            dom.text(self.shortName);
-            dom.text('>');
-          }
-        });
-      });
-
-      self.html_usage_directiveInfo(dom);
-      self.html_usage_parameters(dom);
-    });
-  },
-
   html_usage_directiveInfo: function(dom) {
     var self = this;
     var list = [];
diff --git a/docs/src/templates/doc_widgets.js b/docs/src/templates/doc_widgets.js
index 5d4f8905..acbdae4f 100644
--- a/docs/src/templates/doc_widgets.js
+++ b/docs/src/templates/doc_widgets.js
@@ -25,6 +25,7 @@ angular.module('ngdocs.directives', [], function($compileProvider) {
   $compileProvider.directive('docExample', ['$injector', '$log', '$browser', '$location',
                                     function($injector,   $log,   $browser,   $location) {
     return {
+      restrict: 'E',
       terminal: true,
       compile: function(element, attrs) {
         var module = attrs.module;
@@ -238,6 +239,7 @@ angular.module('ngdocs.directives', [], function($compileProvider) {
       '</div>';
 
     return {
+      restrict: 'EA',
       compile: function(element, attrs) {
         var tabs = angular.element(HTML_TPL.replace('{show}', attrs.show || 'false')),
             nav = tabs.find('ul'),
@@ -268,35 +270,38 @@ angular.module('ngdocs.directives', [], function($compileProvider) {
 
 
   $compileProvider.directive('docTutorialNav', function() {
-    return function(scope, element, attrs) {
-      var prevStep, codeDiff, nextStep,
-          content, step = attrs.docTutorialNav;
-
-      step = parseInt(step, 10);
-
-      if (step === 0) {
-        prevStep = '';
-        nextStep = 'step_01';
-        codeDiff = 'step-0~7...step-0';
-      } else if (step === 11){
-        prevStep = 'step_10';
-        nextStep = 'the_end';
-        codeDiff = 'step-10...step-11';
-      } else {
-        prevStep = 'step_' + pad(step - 1);
-        nextStep = 'step_'  + pad(step + 1);
-        codeDiff = 'step-' + step + '...step-' + step;
-      }
+    return {
+      restrict: 'EA',
+      link:function(scope, element, attrs) {
+        var prevStep, codeDiff, nextStep,
+            content, step = attrs.docTutorialNav;
+
+        step = parseInt(step, 10);
+
+        if (step === 0) {
+          prevStep = '';
+          nextStep = 'step_01';
+          codeDiff = 'step-0~7...step-0';
+        } else if (step === 11){
+          prevStep = 'step_10';
+          nextStep = 'the_end';
+          codeDiff = 'step-10...step-11';
+        } else {
+          prevStep = 'step_' + pad(step - 1);
+          nextStep = 'step_'  + pad(step + 1);
+          codeDiff = 'step-' + step + '...step-' + step;
+        }
 
-      content = angular.element(
-        '<li><a href="#!/tutorial/' + prevStep + '">Previous</a></li>' +
-        '<li><a href="http://angular.github.com/angular-phonecat/step-' + step + '/app">Live Demo</a></li>' +
-        '<li><a href="https://github.com/angular/angular-phonecat/compare/' + codeDiff + '">Code Diff</a></li>' +
-        '<li><a href="#!/tutorial/' + nextStep + '">Next</a></li>'
-      );
+        content = angular.element(
+          '<li><a href="#!/tutorial/' + prevStep + '">Previous</a></li>' +
+          '<li><a href="http://angular.github.com/angular-phonecat/step-' + step + '/app">Live Demo</a></li>' +
+          '<li><a href="https://github.com/angular/angular-phonecat/compare/' + codeDiff + '">Code Diff</a></li>' +
+          '<li><a href="#!/tutorial/' + nextStep + '">Next</a></li>'
+        );
 
-      element.attr('id', 'tutorial-nav');
-      element.append(content);
+        element.attr('id', 'tutorial-nav');
+        element.append(content);
+      }
     };
 
     function pad(step) {
diff --git a/docs/src/templates/docs.js b/docs/src/templates/docs.js
index b9fc0407..95cac2c9 100644
--- a/docs/src/templates/docs.js
+++ b/docs/src/templates/docs.js
@@ -158,6 +158,6 @@ angular.module('ngdocs', ['ngdocs.directives'], function($locationProvider, $fil
   });
 
   $compileProvider.directive('code', function() {
-    return { terminal: true };
+    return { restrict: 'E', terminal: true };
   });
 });