Skip to content

Commit 095701c

Browse files
mchapmanmchapman
committed
chore(general) Move from definitelyTyped to typings
1 parent 8cf4305 commit 095701c

38 files changed

+144
-119
lines changed

‎dist/forms-angular.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/// <reference path="../typings/angularjs/angular.d.ts" />
2-
/// <reference path="../typings/underscore/underscore.d.ts" />
1+
/// <reference path="../typings/globals/angular/index.d.ts" />
2+
/// <reference path="../typings/globals/underscore/index.d.ts" />
33
declare module fng {
44
interface IFieldViewInfo {
55
name: string;

‎dist/forms-angular.js

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/// <reference path="../typings/angularjs/angular.d.ts" />
2-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1+
/// <reference path="../typings/globals/angular/index.d.ts" />
2+
/// <reference path="../../typings/globals/angular/index.d.ts" />
33
/// <reference path="../fng-types.ts" />
44
var fng;
55
(function (fng) {
@@ -30,7 +30,7 @@ var fng;
3030
controllers.BaseCtrl = BaseCtrl;
3131
})(controllers = fng.controllers || (fng.controllers = {}));
3232
})(fng || (fng = {}));
33-
/// <reference path="../../typings/angularjs/angular.d.ts" />
33+
/// <reference path="../../typings/globals/angular/index.d.ts" />
3434
var fng;
3535
(function (fng) {
3636
var controllers;
@@ -51,7 +51,7 @@ var fng;
5151
controllers.SaveChangesModalCtrl = SaveChangesModalCtrl;
5252
})(controllers = fng.controllers || (fng.controllers = {}));
5353
})(fng || (fng = {}));
54-
/// <reference path="../../typings/angularjs/angular.d.ts" />
54+
/// <reference path="../../typings/globals/angular/index.d.ts" />
5555
var fng;
5656
(function (fng) {
5757
var controllers;
@@ -75,7 +75,7 @@ var fng;
7575
controllers.ModelCtrl = ModelCtrl;
7676
})(controllers = fng.controllers || (fng.controllers = {}));
7777
})(fng || (fng = {}));
78-
/// <reference path="../../typings/angularjs/angular.d.ts" />
78+
/// <reference path="../../typings/globals/angular/index.d.ts" />
7979
var fng;
8080
(function (fng) {
8181
var controllers;
@@ -284,7 +284,7 @@ var fng;
284284
controllers.NavCtrl = NavCtrl;
285285
})(controllers = fng.controllers || (fng.controllers = {}));
286286
})(fng || (fng = {}));
287-
/// <reference path="../../typings/angularjs/angular.d.ts" />
287+
/// <reference path="../../typings/globals/angular/index.d.ts" />
288288
var fng;
289289
(function (fng) {
290290
var controllers;
@@ -401,7 +401,7 @@ var fng;
401401
controllers.SearchCtrl = SearchCtrl;
402402
})(controllers = fng.controllers || (fng.controllers = {}));
403403
})(fng || (fng = {}));
404-
/// <reference path="../../typings/angularjs/angular.d.ts" />
404+
/// <reference path="../../typings/globals/angular/index.d.ts" />
405405
var fng;
406406
(function (fng) {
407407
var directives;
@@ -428,7 +428,7 @@ var fng;
428428
directives.modelControllerDropdown = modelControllerDropdown;
429429
})(directives = fng.directives || (fng.directives = {}));
430430
})(fng || (fng = {}));
431-
/// <reference path="../../typings/angularjs/angular.d.ts" />
431+
/// <reference path="../../typings/globals/angular/index.d.ts" />
432432
var fng;
433433
(function (fng) {
434434
var directives;
@@ -449,7 +449,7 @@ var fng;
449449
directives.errorDisplay = errorDisplay;
450450
})(directives = fng.directives || (fng.directives = {}));
451451
})(fng || (fng = {}));
452-
/// <reference path="../../typings/angularjs/angular.d.ts" />
452+
/// <reference path="../../typings/globals/angular/index.d.ts" />
453453
var fng;
454454
(function (fng) {
455455
var directives;
@@ -498,8 +498,8 @@ var fng;
498498
directives.fngLink = fngLink;
499499
})(directives = fng.directives || (fng.directives = {}));
500500
})(fng || (fng = {}));
501-
/// <reference path="../../typings/angularjs/angular.d.ts" />
502-
/// <reference path="../../typings/underscore/underscore.d.ts" />
501+
/// <reference path="../../typings/globals/angular/index.d.ts" />
502+
/// <reference path="../../typings/globals/underscore/index.d.ts" />
503503
/// <reference path="../fng-types.ts" />
504504
var fng;
505505
(function (fng) {
@@ -1096,8 +1096,8 @@ var fng;
10961096
};
10971097
var unwatch = scope.$watch(attrs.schema, function (newValue) {
10981098
if (newValue) {
1099-
newValue = angular.isArray(newValue) ? newValue : [newValue]; // otherwise some old tests stop working for no real reason
1100-
if (newValue.length > 0) {
1099+
var newArrayValue = angular.isArray(newValue) ? newValue : [newValue]; // otherwise some old tests stop working for no real reason
1100+
if (newArrayValue.length > 0) {
11011101
unwatch();
11021102
var elementHtml = '';
11031103
var recordAttribute = attrs.model || 'record'; // By default data comes from scope.record
@@ -1122,7 +1122,7 @@ var fng;
11221122
if (theRecord === scope.topLevelFormName) {
11231123
throw new Error('Model and Name must be distinct - they are both ' + theRecord);
11241124
}
1125-
elementHtml += processInstructions(newValue, true, attrs);
1125+
elementHtml += processInstructions(newArrayValue, true, attrs);
11261126
if (tabsSetup === tabsSetupState.Forced) {
11271127
elementHtml += '</uib-tabset>';
11281128
}
@@ -1223,7 +1223,7 @@ var fng;
12231223
directives.formInput = formInput;
12241224
})(directives = fng.directives || (fng.directives = {}));
12251225
})(fng || (fng = {}));
1226-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1226+
/// <reference path="../../typings/globals/angular/index.d.ts" />
12271227
var fng;
12281228
(function (fng) {
12291229
var directives;
@@ -1239,7 +1239,7 @@ var fng;
12391239
directives.formButtons = formButtons;
12401240
})(directives = fng.directives || (fng.directives = {}));
12411241
})(fng || (fng = {}));
1242-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1242+
/// <reference path="../../typings/globals/angular/index.d.ts" />
12431243
/// <reference path="../controllers/search-ctrl.ts" />
12441244
var fng;
12451245
(function (fng) {
@@ -1257,7 +1257,7 @@ var fng;
12571257
directives.globalSearch = globalSearch;
12581258
})(directives = fng.directives || (fng.directives = {}));
12591259
})(fng || (fng = {}));
1260-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1260+
/// <reference path="../../typings/globals/angular/index.d.ts" />
12611261
var fng;
12621262
(function (fng) {
12631263
var filters;
@@ -1275,7 +1275,7 @@ var fng;
12751275
filters.camelCase = camelCase;
12761276
})(filters = fng.filters || (fng.filters = {}));
12771277
})(fng || (fng = {}));
1278-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1278+
/// <reference path="../../typings/globals/angular/index.d.ts" />
12791279
var fng;
12801280
(function (fng) {
12811281
var filters;
@@ -1304,7 +1304,7 @@ var fng;
13041304
filters.titleCase = titleCase;
13051305
})(filters = fng.filters || (fng.filters = {}));
13061306
})(fng || (fng = {}));
1307-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1307+
/// <reference path="../../typings/globals/angular/index.d.ts" />
13081308
var fng;
13091309
(function (fng) {
13101310
var services;
@@ -1376,7 +1376,7 @@ var fng;
13761376
services.addAllService = addAllService;
13771377
})(services = fng.services || (fng.services = {}));
13781378
})(fng || (fng = {}));
1379-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1379+
/// <reference path="../../typings/globals/angular/index.d.ts" />
13801380
var fng;
13811381
(function (fng) {
13821382
var services;
@@ -1444,7 +1444,7 @@ var fng;
14441444
services.cssFrameworkService = cssFrameworkService;
14451445
})(services = fng.services || (fng.services = {}));
14461446
})(fng || (fng = {}));
1447-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1447+
/// <reference path="../../typings/globals/angular/index.d.ts" />
14481448
var fng;
14491449
(function (fng) {
14501450
var services;
@@ -1463,7 +1463,7 @@ var fng;
14631463
services.$data = $data;
14641464
})(services = fng.services || (fng.services = {}));
14651465
})(fng || (fng = {}));
1466-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1466+
/// <reference path="../../typings/globals/angular/index.d.ts" />
14671467
/// <reference path="../fng-types.ts" />
14681468
var fng;
14691469
(function (fng) {
@@ -1732,8 +1732,8 @@ var fng;
17321732
services.routingService = routingService;
17331733
})(services = fng.services || (fng.services = {}));
17341734
})(fng || (fng = {}));
1735-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1736-
/// <reference path="../../typings/underscore/underscore.d.ts" />
1735+
/// <reference path="../../typings/globals/angular/index.d.ts" />
1736+
/// <reference path="../../typings/globals/underscore/index.d.ts" />
17371737
/// <reference path="../fng-types.ts" />
17381738
var fng;
17391739
(function (fng) {
@@ -2442,7 +2442,7 @@ var fng;
24422442
formGenerator.$inject = ["$location", "$timeout", "$filter", "SubmissionsService", "routingService", "recordHandler"];
24432443
})(services = fng.services || (fng.services = {}));
24442444
})(fng || (fng = {}));
2445-
/// <reference path="../../typings/angularjs/angular.d.ts" />
2445+
/// <reference path="../../typings/globals/angular/index.d.ts" />
24462446
/// <reference path="../fng-types.ts" />
24472447
var fng;
24482448
(function (fng) {
@@ -2668,7 +2668,7 @@ var fng;
26682668
services.formMarkupHelper = formMarkupHelper;
26692669
})(services = fng.services || (fng.services = {}));
26702670
})(fng || (fng = {}));
2671-
/// <reference path="../../typings/angularjs/angular.d.ts" />
2671+
/// <reference path="../../typings/globals/angular/index.d.ts" />
26722672
var fng;
26732673
(function (fng) {
26742674
var services;
@@ -2690,7 +2690,7 @@ var fng;
26902690
services.inputSizeHelper = inputSizeHelper;
26912691
})(services = fng.services || (fng.services = {}));
26922692
})(fng || (fng = {}));
2693-
/// <reference path="../../typings/angularjs/angular.d.ts" />
2693+
/// <reference path="../../typings/globals/angular/index.d.ts" />
26942694
var fng;
26952695
(function (fng) {
26962696
var services;
@@ -2803,8 +2803,8 @@ var fng;
28032803
services.pluginHelper = pluginHelper;
28042804
})(services = fng.services || (fng.services = {}));
28052805
})(fng || (fng = {}));
2806-
/// <reference path="../../typings/angularjs/angular.d.ts" />
2807-
/// <reference path="../../typings/underscore/underscore.d.ts" />
2806+
/// <reference path="../../typings/globals/angular/index.d.ts" />
2807+
/// <reference path="../../typings/globals/underscore/index.d.ts" />
28082808
/// <reference path="../fng-types.ts" />
28092809
var fng;
28102810
(function (fng) {
@@ -3598,7 +3598,7 @@ var fng;
35983598
services.recordHandler = recordHandler;
35993599
})(services = fng.services || (fng.services = {}));
36003600
})(fng || (fng = {}));
3601-
/// <reference path="../../typings/angularjs/angular.d.ts" />
3601+
/// <reference path="../../typings/globals/angular/index.d.ts" />
36023602
var fng;
36033603
(function (fng) {
36043604
var services;
@@ -3615,7 +3615,7 @@ var fng;
36153615
services.SchemasService = SchemasService;
36163616
})(services = fng.services || (fng.services = {}));
36173617
})(fng || (fng = {}));
3618-
/// <reference path="../../typings/angularjs/angular.d.ts" />
3618+
/// <reference path="../../typings/globals/angular/index.d.ts" />
36193619
var fng;
36203620
(function (fng) {
36213621
var services;
@@ -3689,7 +3689,7 @@ var fng;
36893689
services.SubmissionsService = SubmissionsService;
36903690
})(services = fng.services || (fng.services = {}));
36913691
})(fng || (fng = {}));
3692-
/// <reference path="../typings/angularjs/angular.d.ts" />
3692+
/// <reference path="../typings/globals/angular/index.d.ts" />
36933693
/// <reference path="controllers/base.ts" />
36943694
/// <reference path="controllers/saveChangesModal.ts" />
36953695
/// <reference path="controllers/model.ts" />

‎dist/forms-angular.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gulpfile.js

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var gulp = require('gulp');
22
var runSequence = require('run-sequence');
33
var del = require('del');
44
var Server = require('karma').Server;
5+
var typeScriptCompiler = require('gulp-tsc');
56

67
var browserSources = [
78
'js/**/*.ts'
@@ -37,8 +38,33 @@ gulp.task('build', function(callback) {
3738
callback);
3839
});
3940

40-
gulp.task('compile', function() {
41-
return buildHelper(browserSources, distDirectory , 'forms-angular.js');
41+
gulp.task('compile', function(callback) {
42+
runSequence(
43+
'compileServerSide',
44+
'compileClientSide',
45+
callback);
46+
});
47+
48+
gulp.task('compileClientSide', function() {
49+
return gulp
50+
.src(browserSources)
51+
.pipe(typeScriptCompiler({
52+
module: 'amd',
53+
declaration: true, // Generate *.d.ts declarations file as well
54+
emitError: false,
55+
out: 'forms-angular.js',
56+
target: 'ES5'
57+
}))
58+
.pipe(gulp.dest(distDirectory));
59+
});
60+
61+
gulp.task('compileServerSide', function() {
62+
return gulp
63+
.src('server/*.ts')
64+
.pipe(typeScriptCompiler({
65+
target: 'ES5'
66+
}))
67+
.pipe(gulp.dest('./server'));
4268
});
4369

4470
gulp.task('clean', function() {
@@ -122,25 +148,6 @@ gulp.task('uglify', function() {
122148
fs.writeFileSync('dist/forms-angular.min.js', finalCode);
123149
});
124150

125-
//gulp.task('umdify', function() {
126-
// umdHelper('dist/forms-angular.js', 'dist');
127-
// umdHelper('dist/forms-angular.min.js', 'dist');
128-
//});
129-
130-
var buildHelper = function(browserSources, directory, outputFile) {
131-
var typeScriptCompiler = require('gulp-tsc');
132-
133-
return gulp
134-
.src(browserSources)
135-
.pipe(typeScriptCompiler({
136-
module: 'amd',
137-
declaration: true, // Generate *.d.ts declarations file as well
138-
emitError: false,
139-
out: outputFile,
140-
target: 'ES5'
141-
}))
142-
.pipe(gulp.dest(directory));
143-
};
144151

145152
gulp.task('templates', function() {
146153
var templateCache = require('gulp-angular-templatecache');

‎js/controllers/base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1+
/// <reference path="../../typings/globals/angular/index.d.ts" />
22
/// <reference path="../fng-types.ts" />
33

44
module fng.controllers {

‎js/controllers/model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1+
/// <reference path="../../typings/globals/angular/index.d.ts" />
22

33
module fng.controllers {
44

‎js/controllers/nav.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1+
/// <reference path="../../typings/globals/angular/index.d.ts" />
22

33
module fng.controllers {
44

‎js/controllers/saveChangesModal.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1+
/// <reference path="../../typings/globals/angular/index.d.ts" />
22

33
module fng.controllers {
44

‎js/controllers/search-ctrl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1+
/// <reference path="../../typings/globals/angular/index.d.ts" />
22

33
module fng.controllers {
44

‎js/directives/dropdown.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1+
/// <reference path="../../typings/globals/angular/index.d.ts" />
22

33
module fng.directives {
44

‎js/directives/error-display.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1+
/// <reference path="../../typings/globals/angular/index.d.ts" />
22

33
module fng.directives {
44

‎js/directives/fng-link.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1+
/// <reference path="../../typings/globals/angular/index.d.ts" />
22

33
module fng.directives {
44

‎js/directives/form-buttons.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference path="../../typings/angularjs/angular.d.ts" />
1+
/// <reference path="../../typings/globals/angular/index.d.ts" />
22

33
module fng.directives {
44

0 commit comments

Comments
 (0)