Skip to content

Commit bfac42d

Browse files
committed
Merge pull request #2 from angularity/revert-1-saurabh
Revert "Saurabh"
2 parents 30aaa33 + 848c723 commit bfac42d

File tree

8 files changed

+7
-859
lines changed

8 files changed

+7
-859
lines changed

guide/ES5vsES6.md

Lines changed: 0 additions & 169 deletions
This file was deleted.

guide/composition.md

Lines changed: 3 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ Ideally `controllers` are specified only in the routing. The `controller` specif
3636

3737
### main.js
3838

39-
<div class="es6-start"></div>
40-
4139
```javascript
4240
/* globals angular */
41+
4342
import myRoutes from 'myRoutes';
4443
import myDirective from 'myDirective';
4544
import MyController from 'MyController';
@@ -51,43 +50,12 @@ angular.module('app', [ 'templates' ])
5150
.service('MyService', MyService)
5251
```
5352

54-
<div class="es6-stop"></div>
55-
56-
57-
<div class="es5-start"></div>
58-
59-
```javascript
60-
var myRoutes = require('../../js-lib/app/myRoutes');
61-
var MyController = require('../../js-lib/app/MyController');
62-
var myDirective = require('../../js-lib/app/myDirective');
63-
var MyService = require('../../js-lib/app/MyService');
64-
var myFactory = require('../../js-lib/app/myFactory');
65-
66-
angular.module('app', ['ui.router','templates'])
67-
.config(['$stateProvider', '$urlRouterProvider', myRoutes])
68-
.controller('MyController', MyController)
69-
.factory('myFactory',myFactory)
70-
.service('MyService',MyService)
71-
.directive('myDirective', myDirective)
72-
73-
```
74-
75-
<div class="es5-stop"></div>
76-
77-
7853
### routes.js
79-
80-
81-
<div class="es6-start"></div>
82-
8354
```javascript
84-
var MyController = 'MyController';
55+
import MyController from 'MyController';
8556

8657
/**
8758
* <p>TODO description of this file</p>
88-
* @ngInject
89-
* @param {object} $urlRouterProvider
90-
* @param $stateProvider
9159
*/
9260
export default function todoRoutes($stateProvider, $urlRouterProvider) {
9361
'use strict';
@@ -100,35 +68,4 @@ export default function todoRoutes($stateProvider, $urlRouterProvider) {
10068
controller: MyController
10169
});
10270
}
103-
```
104-
105-
<div class="es6-stop"></div>
106-
107-
<div class="es5-start"></div>
108-
109-
```javascript
110-
/**
111-
* <p>TODO description of this file</p>
112-
* @ngInject
113-
* @param {object} $urlRouterProvider
114-
* @param $stateProvider
115-
*/
116-
117-
var MyController = require('../app/MyController');
118-
119-
function appRoutes($stateProvider, $urlRouterProvider) {
120-
'use strict';
121-
122-
$urlRouterProvider.otherwise('/');
123-
$stateProvider
124-
.state('home', {
125-
url : '/',
126-
templateUrl: '/partials/partial.html',
127-
controller : MyController
128-
});
129-
}
130-
131-
module.exports = myRoutes;
132-
```
133-
134-
<div class="es5-stop"></div>
71+
```

guide/controllers.md

Lines changed: 0 additions & 131 deletions
This file was deleted.

0 commit comments

Comments
 (0)