Skip to content

Commit f2ca9bf

Browse files
committed
Upgrade to the latest gulp to use es6 in t/
1 parent 46ab014 commit f2ca9bf

File tree

4 files changed

+1123
-2811
lines changed

4 files changed

+1123
-2811
lines changed

www/lib/r2.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ r2.get_flag_address = function(name) {
330330

331331
r2.get_flag_names = function(offset) {
332332
var names = [];
333-
for (var i in r2.flags[offset]) {
333+
for (let i in r2.flags[offset]) {
334334
names[names.length] = r2.flags[offset][i].name;
335335
}
336336
return names;
@@ -364,7 +364,7 @@ r2.store_asm_config = function() {
364364
config = {};
365365
r2.cmd('e', function(x) {
366366
conf = x.split('\n');
367-
for (var prop in conf) {
367+
for (let prop in conf) {
368368
var fields = conf[prop].split(' ');
369369
if (fields.length == 3) {
370370
// TODO: Dont know why byt e~asm. is not working so filtering here
@@ -518,7 +518,7 @@ r2.getTextLogger = function(obj) {
518518
obj.refresh = function(cb) {
519519
obj.load(function(ret) {
520520
//obj.last = 0;
521-
for (var i = 0; i < ret.length; i++) {
521+
for (let i = 0; i < ret.length; i++) {
522522
var message = ret[i];
523523
obj.events['message']({
524524
'id': message[0],
@@ -567,7 +567,7 @@ r2.filter_asm = function(x, display) {
567567
r2.cmd('s', function(x) {
568568
curoff = x;
569569
});
570-
for (var i = lines.length - 1; i > 0; i--) {
570+
for (let i = lines.length - 1; i > 0; i--) {
571571
var a = lines[i].match(/0x([a-fA-F0-9]+)/);
572572
if (a && a.length > 0) {
573573
lastoff = a[0].replace(/:/g, '');
@@ -577,8 +577,8 @@ r2.filter_asm = function(x, display) {
577577
if (display == 'afl') {
578578
// hasmore (false);
579579
var z = '';
580-
for (var i = 0; i < lines.length; i++) {
581-
var row = lines[i].replace(/\ +/g, ' ').split(/ /g);
580+
for (let i = 0; i < lines.length; i++) {
581+
const row = lines[i].replace(/\ +/g, ' ').split(/ /g);
582582
z += row[0] + ' ' + row[3] + '\n';
583583
}
584584
x = z;
@@ -592,7 +592,9 @@ r2.filter_asm = function(x, display) {
592592
var row = lines[i].replace(/\ +/g, ' ').split(/ /g);
593593
var mark = row[1] == '*' ? '*' : ' ';
594594
var space = row[2] ? row[2] : row[1];
595-
if (!space) continue;
595+
if (!space) {
596+
continue;
597+
}
596598
z += row[0] + ' ' + mark + ' <a href="javascript:runcmd(\'fs ' +
597599
space + '\')">' + space + '</a>\n';
598600
}

www/t/gulpfile.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
var gulp = require('gulp'),
2-
tar = require('gulp-tar'),
3-
gzip = require('gulp-gzip'),
4-
uglify = require('gulp-uglify'),
5-
cleanCSS = require('gulp-clean-css'),
6-
concat = require('gulp-concat'),
7-
gulpUtil = require('gulp-util');
1+
import gulp from 'gulp';
2+
import tar from 'gulp-tar';
3+
import uglify from 'gulp-uglify';
4+
import cleanCSS from 'gulp-clean-css';
5+
import concat from 'gulp-concat';
6+
import gulpUtil from 'gulp-util';
87

9-
var R2 = '../lib/';
10-
var DEST = '../../dist/t/'
8+
const R2 = '../lib/';
9+
const DEST = '../../dist/t/'
1110

1211
gulp.task('default', async function() {
1312
await gulp.src(['js/tiled.js', 'js/modals.js', R2 + 'r2.js', 'js/main.js'])

0 commit comments

Comments
 (0)