Skip to content
This repository was archived by the owner on Jul 6, 2022. It is now read-only.

Commit a4df3fc

Browse files
rcreaseyrcreasey
committed
fixing es5 shim/sham.
1 parent 9a099dd commit a4df3fc

4 files changed

Lines changed: 9 additions & 8 deletions

File tree

‎app/js/core/data.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ var Data = {
155155
populate: function(callback) {
156156
log('Populating Region Data...');
157157
Server.vicinity(function(error, data) {
158-
if (error) return callback(false);
158+
if (error) { return callback(false); }
159159
Data.state.vicinity = data.current;
160160
Data.regions = data.regions;
161161
Data.systems = data.systems;

‎gulpfile.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var gulp = require('gulp')
1515
, uglify = require('gulp-uglify')
1616
, vinylPaths = require('vinyl-paths')
1717
, wrap = require('gulp-wrap')
18-
// , debug = require('gulp-debug')
18+
, debug = require('gulp-debug')
1919

2020
// [ prepare ]------------------------------------------------------------------
2121
gulp.task('prepare', function() {
@@ -79,20 +79,20 @@ gulp.task('prepare', function() {
7979
.pipe(concat('js/client.js'))
8080
.pipe(gulp.dest('client'));
8181

82-
gulp.src(mainBowerFiles())
83-
.pipe(filter(['es5-shim.js']))
84-
.pipe(concat('js/es5-shim.js'))
82+
gulp.src(['vendor/es5-shim/es5-shim.js', 'vendor/es5-shim/es5-sham.js'])
83+
.pipe(concat('js/es5.js'))
8584
.pipe(gutil.env.type === 'production' ? uglify() : gutil.noop())
8685
.pipe(gulp.dest('public'));
8786

8887
gulp.src(mainBowerFiles())
89-
.pipe(filter(['*.js', '!es5-shim*']))
88+
.pipe(filter(['*.js', '!es5*']))
89+
.pipe(debug({title: 'es5'}))
9090
.pipe(concat('js/lib.js'))
9191
// .pipe(gutil.env.type === 'production' ? uglify() : gutil.noop())
9292
.pipe(gulp.dest('public'));
9393

9494
gulp.src(mainBowerFiles())
95-
.pipe(filter(['*.js', '!es5-shim*', '!jquery.js', '!typeahead*']))
95+
.pipe(filter(['*.js', '!es5*', '!jquery.js', '!typeahead*']))
9696
.pipe(concat('js/lib.js'))
9797
.pipe(gulp.dest('client'));
9898

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"faye": "^1.1.0",
3535
"gulp": "^3.8.11",
3636
"gulp-concat": "^2.4.1",
37+
"gulp-debug": "^2.0.1",
3738
"gulp-declare": "^0.3.0",
3839
"gulp-download": "0.0.1",
3940
"gulp-filter": "^2.0.2",

‎server/views/main/index.jade‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ block content
8181
span MENU
8282
#alert-container
8383

84-
script(type='text/javascript', src='/js/es5-shim.js')
84+
script(type='text/javascript', src='/js/es5.js')
8585
script(type='text/javascript', src='/js/lib.js')
8686
script(type='text/javascript', src='/js/templates.js')
8787
- if (user)

0 commit comments

Comments
 (0)