Skip to content

Commit a497567

Browse files
author
Will Johnston
committed
fixed grunt tasks
1 parent 2d71496 commit a497567

File tree

4 files changed

+13186
-6
lines changed

4 files changed

+13186
-6
lines changed

framework/framework/app/app.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,7 @@ module plat {
295295
return;
296296
}
297297

298-
var app = App.app = appInjector.inject(),
299-
navigator: routing.Navigator = app.navigator = acquire(__NavigatorInstance);
300-
301-
navigator.initialize((<typeof routing.Router>acquire(__RouterStatic)).currentRouter());
298+
var app = App.app = appInjector.inject();
302299

303300
app.on(__suspend, app.suspend);
304301
app.on(__resume, app.resume);
@@ -379,7 +376,9 @@ module plat {
379376
* @returns {plat.App}
380377
*/
381378
constructor() {
382-
var _ContextManager: observable.IContextManagerStatic = acquire(__ContextManagerStatic);
379+
var _ContextManager: observable.IContextManagerStatic = acquire(__ContextManagerStatic),
380+
navigator: routing.Navigator = this.navigator = acquire(__NavigatorInstance);
381+
navigator.initialize((<typeof routing.Router>acquire(__RouterStatic)).currentRouter());
383382
_ContextManager.defineGetter(this, 'uid', uniqueId(__Plat));
384383
}
385384

framework/gruntfile.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ function normalizeBlockComments(data) {
5353

5454
function addNodeTypeDefinition(data) {
5555
return data
56+
.slice(0, -2)
5657
.concat([
58+
'',
5759
'declare module \'platypus\' {',
5860
' export = plat;',
5961
'}',
@@ -104,6 +106,7 @@ module.exports = exports = function load(grunt) {
104106
options: {
105107
process: function (data) {
106108
return stripDocs(useStrict(data.split(/\r\n|\n/)))
109+
.concat(['export = plat;', ''])
107110
.join('\r\n');
108111
}
109112
},

framework/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "framework",
3-
"version": "0.10.0-beta.3",
3+
"version": "0.10.0-beta.4",
44
"description": "",
55
"main": "gruntfile.js",
66
"devDependencies": {

0 commit comments

Comments
 (0)