:up_arrow: Upgade to jQuery Terminal 2.X.X (#238)

bbody · Dec 3, 2018 · 857d9db · 857d9db
1 parent 7f0f38b
commit 857d9db
Show file tree

Hide file tree

Showing 11 changed files with 117 additions and 37 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -243,7 +243,7 @@ gulp.task('compile:html', function() {
 	const locals = {
 		production: false,
 		jquery_script_location: 'node_modules/jquery/dist/jquery.js',
-		jquery_mousewheel_script_location: 'node_modules/jquery.terminal/js/jquery.mousewheel-min.js',
+		keyboard_polyfill: 'node_modules/js-polyfills/keyboard.js',
 		jquery_terminal_script_location: 'node_modules/jquery.terminal/js/jquery.terminal.js',
 		init_script_location: 'js/examples/example-script.js',
 		cmd_resume_script_location: 'tmp/js/cmd-resume.js',
@@ -269,7 +269,7 @@ gulp.task('compile:html:example', function() {
 	const locals = {
 		production: true,
 		jquery_script_location: `//cdnjs.cloudflare.com/ajax/libs/jquery/${getLibraryVersion('jquery')}/jquery.min.js`,
-		jquery_mousewheel_script_location: `//cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/${getLibraryVersion('jquery-mousewheel')}/jquery.mousewheel.min.js`,
+		keyboard_polyfill: `//cdn.rawgit.com/inexorabletash/polyfill/master/keyboard.js`,
 		jquery_terminal_script_location: `//cdnjs.cloudflare.com/ajax/libs/jquery.terminal/${getLibraryVersion('jquery.terminal')}/js/jquery.terminal.min.js`,
 		init_script_location: './js/example-script.js',
 		cmd_resume_script_location: './js/cmd-resume.js',
@@ -290,7 +290,7 @@ gulp.task('compile:html:own-example', function() {
 	const locals = {
 		production: true,
 		jquery_script_location: `//cdnjs.cloudflare.com/ajax/libs/jquery/${getLibraryVersion('jquery')}/jquery.min.js`,
-		jquery_mousewheel_script_location: `//cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/${getLibraryVersion('jquery-mousewheel')}/jquery.mousewheel.min.js`,
+		keyboard_polyfill: `//cdn.rawgit.com/inexorabletash/polyfill/master/keyboard.js`,
 		jquery_terminal_script_location: `//cdnjs.cloudflare.com/ajax/libs/jquery.terminal/${getLibraryVersion('jquery.terminal')}/js/jquery.terminal.min.js`,
 		init_script_location: './js/own-script.js',
 		cmd_resume_script_location: '../js/cmd-resume.js',
@@ -312,7 +312,7 @@ gulp.task('compile:html:test', function() {
 	const locals = {
 		production: false,
 		jquery_script_location: `./node_modules/jquery/dist/jquery.min.js`,
-		jquery_mousewheel_script_location: `./node_modules/jquery-mousewheel/jquery.mousewheel.js`,
+		keyboard_polyfill: `./node_modules/js-polyfills/keyboard.js`,
 		jquery_terminal_script_location: `./node_modules/jquery.terminal/js/jquery.terminal.min.js`,
 		init_script_location: false, // Allow script to be triggered from code
 		cmd_resume_script_location: './js/cmd-resume.js',

diff --git a/index.pug b/index.pug
@@ -24,7 +24,7 @@ html(lang='en')
 
         script(src=jquery_script_location, type="text/javascript")
         script(src=cmd_resume_script_location, type="text/javascript")
-        script(src=jquery_mousewheel_script_location, type="text/javascript")
+        script(src=keyboard_polyfill, type="text/javascript")
         script(src=jquery_terminal_script_location, type="text/javascript")
         if init_script_location
             script(src=init_script_location, type="text/javascript")

diff --git a/js/helpers/constants.js b/js/helpers/constants.js
@@ -30,7 +30,7 @@ var CONSTANTS = {
 	NEW_LINE: "\n",
 	SEMI_COLON: ";",
 	EMPTY: "",
-	TAB: "\t",
+	TAB: "    ",
 	COLON: ":",
 	COMA: ", ",
 	DASH: " - ",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -55,8 +55,8 @@
     "jasmine": "^2.99",
     "jasmine-core": "^3.3.0",
     "jquery": "=3.3.1",
-    "jquery-mousewheel": "=3.1.13",
-    "jquery.terminal": "=1.16.1",
+    "jquery.terminal": "=2.0.1",
+    "js-polyfills": "^0.1.42",
     "jshint": "^2.9.6",
     "jshint-stylish": "^2.2.1",
     "karma": "^2.0.5",

diff --git a/spec-e2e/extended.nonFF.spec.js b/spec-e2e/extended.nonFF.spec.js
@@ -6,7 +6,7 @@ describe("Name", function() {
 
 		helper.loadExtendedCMDResume(browser);
 
-		$('body.terminal').waitForExist(5000);
+		$('body.full-screen-terminal').waitForExist(5000);
 	});
 
 	it("returns pgpkey", function(){

diff --git a/spec-e2e/multi.nonFF.spec.js b/spec-e2e/multi.nonFF.spec.js
@@ -6,7 +6,7 @@ describe("Simple", function() {
 
 		helper.loadSimpleCMDResume(browser);
 
-		$('body.terminal').waitForExist(5000);
+		$('body.full-screen-terminal').waitForExist(5000);
 	});
 
 	it("returns help", function(){

diff --git a/spec-e2e/simple.nonFF.spec.js b/spec-e2e/simple.nonFF.spec.js
@@ -6,7 +6,7 @@ describe("Simple", function() {
 
 		helper.loadSimpleCMDResume(browser);
 
-		$('body.terminal').waitForExist(5000);
+		$('body.full-screen-terminal').waitForExist(5000);
 	});
 
 	it("returns name", function(){

diff --git a/spec-e2e/siteLoad.spec.js b/spec-e2e/siteLoad.spec.js
@@ -11,7 +11,7 @@ describe("Website load", function() {
 			expect(title).toBe("Command Line Résumé");
 			helper.loadSimpleCMDResume(browser);
 
-			var terminal = $('body.terminal');
+			var terminal = $('body.full-screen-terminal');
 
 			terminal.waitForExist(5000);
 
@@ -22,9 +22,10 @@ describe("Website load", function() {
 	});
 	describe("Splash message", function() {
 		beforeEach(function(){
+			browser.url('/');
 			helper.loadSimpleCMDResume(browser);
 
-			$('body.terminal').waitForExist(5000);
+			$('body.full-screen-terminal').waitForExist(5000);
 		});
 
 		it("has welcome message", function(){
@@ -46,7 +47,7 @@ describe("Website load", function() {
 
 			helper.loadExtendedCMDResume(browser);
 
-			$('body.terminal').waitForExist(5000);
+			$('body.full-screen-terminal').waitForExist(5000);
 		});
 
 		it("has a splashscreen", function(){