Skip to content

Commit 2bfd320

Browse files
committed
docs(): add @DeleGate tag
1 parent eb44123 commit 2bfd320

File tree

8 files changed

+19
-24
lines changed

8 files changed

+19
-24
lines changed

docs/tag-defs/index.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
module.exports = [
22
{
3-
name: 'controller',
3+
name: 'delegate',
44
transformFn: function(doc, tag) {
5-
var desc = tag.description.trim();
6-
var id = desc.split(' ')[0];
7-
var other = desc.split(' ').splice(1).join(' ');
8-
9-
var link = '{@link ionic.controller:' + id + '}';
10-
return link + (other ? ' ' + other : '');
5+
return '{@link ' + tag.description + '}';
116
}
127
},
13-
{
14-
name: 'controllerBind',
15-
},
168
{
179
name: 'parent',
1810
transformFn: function(doc, tag) {

docs/templates/api/api.template.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ <h1 class="api-title">
2727
Child of <$ doc.parentLinks $>
2828
</small>
2929
<@ endif @>
30-
<@ if doc.controller @>
30+
<@ if doc.delegate @>
3131
<br/>
3232
<small>
33-
Controller: <$ doc.controller $>
33+
Delegate: <$ doc.delegate $>
3434
</small>
3535
<@ endif @>
3636
</h1>

js/ext/angular/src/directive/ionicContent.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ angular.module('ionic.ui.content', ['ionic.ui.scroll'])
2828
* @ngdoc directive
2929
* @name ionContent
3030
* @module ionic
31+
* @delegate ionic.service:$ionicScrollDelegate
3132
* @restrict E
3233
*
3334
* @description
3435
* The ionContent directive provides an easy to use content area that can be configured
35-
* to use Ionic's custom Scroll View, or the built in overflow scorlling of the browser.
36+
* to use Ionic's custom Scroll View, or the built in overflow scrolling of the browser.
3637
*
3738
* While we recommend using the custom Scroll features in Ionic in most cases, sometimes
3839
* (for performance reasons) only the browser's native overflow scrolling will suffice,

js/ext/angular/src/directive/ionicNavBar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ function($scope, $element, $attrs, $ionicViewService, $animate, $compile, $ionic
226226
* @ngdoc directive
227227
* @name ionNavBar
228228
* @module ionic
229-
* @controller $ionicNavBarDelegate as $scope.$$ionicNavBarDelegateController
229+
* @delegate ionic.service:$ionicNavBarDelegate
230230
* @restrict E
231231
*
232232
* @description

js/ext/angular/src/directive/ionicScroll.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ angular.module('ionic.ui.scroll', [])
77
* @ngdoc directive
88
* @name ionScroll
99
* @module ionic
10+
* @delegate ionic.service:$ionicScrollDelegate
1011
* @restrict E
1112
*
1213
* @description

js/ext/angular/src/directive/ionicSideMenu.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
110110
* @ngdoc directive
111111
* @name ionSideMenus
112112
* @module ionic
113+
* @delegate ionic.service:$ionicSideMenuDelegate
113114
* @restrict E
114115
*
115116
* @description
@@ -125,14 +126,14 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
125126
*
126127
* @usage
127128
* To use side menus, add an `<ion-side-menus>` parent element,
128-
* an `<ion-pane ion-side-menu-content>` for the center content,
129+
* an `<ion-side-menu-content>` for the center content,
129130
* and one or more `<ion-side-menu>` directives.
130131
*
131132
* ```html
132133
* <ion-side-menus>
133134
* <!-- Center content -->
134-
* <ion-pane ion-side-menu-content ng-controller="ContentController">
135-
* </ion-pane>
135+
* <ion-side-menu-content ng-controller="ContentController">
136+
* </io-side-menu-content>
136137
*
137138
* <!-- Left menu -->
138139
* <ion-side-menu side="left">
@@ -193,20 +194,18 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
193194
* @ngdoc directive
194195
* @name ionSideMenuContent
195196
* @module ionic
196-
* @restrict A
197+
* @restrict E
197198
* @parent ionic.directive:ionSideMenus
198199
*
199200
* @description
200201
* A container for the main visible content, sibling to one or more
201202
* {@link ionic.directive:ionSideMenu} directives.
202203
*
203-
* An attribute directive, recommended to be used as part of an `<ion-pane>` element.
204-
*
205204
* @usage
206205
* ```html
207-
* <div ion-side-menu-content
206+
* <ion-side-menu-content
208207
* drag-content="canDrag">
209-
* </div>
208+
* </ion-side-menu-content>
210209
* ```
211210
* For a complete side menu example, see the
212211
* {@link ionic.directive:ionSideMenus} documentation.
@@ -216,14 +215,14 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
216215
*/
217216
.directive('ionSideMenuContent', ['$timeout', '$ionicGesture', function($timeout, $ionicGesture) {
218217
return {
219-
restrict: 'AC',
218+
restrict: 'EA', //DEPRECATED 'A'
220219
require: '^ionSideMenus',
221220
scope: true,
222221
compile: function(element, attr) {
223222
return { pre: prelink };
224223
function prelink($scope, $element, $attr, sideMenuCtrl) {
225224

226-
$element.addClass('menu-content');
225+
$element.addClass('menu-content pane');
227226

228227
if (angular.isDefined(attr.dragContent)) {
229228
$scope.$watch(attr.dragContent, function(value) {

js/ext/angular/src/directive/ionicSlideBox.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ angular.module('ionic.ui.slideBox', [])
107107
* @ngdoc directive
108108
* @name ionSlideBox
109109
* @module ionic
110+
* @delegate ionic.service:$ionicSlideBoxDelegate
110111
* @restrict E
111112
* @description
112113
* The Slide Box is a multi-page container where each page can be swiped or dragged between:

js/ext/angular/src/directive/ionicTabBar.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ angular.module('ionic.ui.tabs', ['ionic.service.view'])
169169
* @ngdoc directive
170170
* @name ionTabs
171171
* @module ionic
172+
* @delegate ionic.service:$ionicTabsDelegate
172173
* @restrict E
173174
* @codepen KbrzJ
174175
*

0 commit comments

Comments
 (0)