Merge pull request tgstation#14528 from neersighted/es6

Port tgui to ES6

code/modules/mob/mob_helpers.dm

@@ -373,7 +373,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		return
 
 /proc/IsAdminGhost(var/mob/user)
-	if(check_rights(R_ADMIN, 0) && istype(user, /mob/dead/observer) && user.client.AI_Interact)
+	if(check_rights_for(user.client, R_ADMIN) && istype(user, /mob/dead/observer) && user.client.AI_Interact)
 		return 1
 	else
 		return 0

code/modules/tgui/states/states.dm

@@ -18,11 +18,11 @@
 	var/src_object = ui_host()
 
 	if(istype(user, /mob/dead/observer)) // Special-case ghosts.
-		if(check_rights_for(user.client, R_ADMIN))
+		if(IsAdminGhost(user))
 			return UI_INTERACTIVE // Admins can interact anyway.
-		if(get_dist(src_object, src) > user.client.view)
-			return UI_CLOSE // Keep ghosts from opening too many UIs.
-		return UI_UPDATE // Ghosts can only view.
+		if(get_dist(src_object, src) < user.client.view)
+			return UI_UPDATE // Keep ghosts from opening too many UIs.
+		return UI_CLOSE // Ghosts can only view.
 	return state.can_use_topic(src_object, user) // Check if the state allows interaction.
 
  /**

code/modules/tgui/tgui.dm

@@ -257,16 +257,16 @@
   * If the src_object's ui_act() returns 1, update all UIs attacked to it.
  **/
 /datum/tgui/Topic(href, href_list)
-	var/action = href_list["action"] // Pull the action out.
-	href_list -= "action"
+	var/action = href_list["action"]
+	var/params = href_list; params -= "action"
 
 	// Handle any special actions.
 	switch(action)
 		if("tgui:initialize")
 			user << output(url_encode(get_json(initial_data)), "[window_id].browser:initialize")
 			return
-		if("tgui:ie")
-			user << link("http://windows.microsoft.com/en-us/internet-explorer/download-ie")
+		if("tgui:link")
+			user << link(params["url"])
 			return
 		if("tgui:fancy")
 			user.client.prefs.tgui_fancy = TRUE
@@ -279,7 +279,7 @@
 	if(status != UI_INTERACTIVE || user != usr)
 		return // If UI is not interactive or usr calling Topic is not the UI user.
 
-	var/update = src_object.ui_act(action, href_list, state) // Call ui_act() on the src_object.
+	var/update = src_object.ui_act(action, params, state) // Call ui_act() on the src_object.
 	if(src_object && update)
 		SStgui.update_uis(src_object) // If we have a src_object and its ui_act() told us to update.
 

tgui/.babelrc

@@ -0,0 +1,8 @@
+{
+  "presets": [
+    "es2015"
+  ],
+  "plugins": [
+    "external-helpers"
+  ]
+}

tgui/Gulpfile.js

@@ -1,2 +1,2 @@
-require('coffee-script/register');
-require('./gulp');
+require('babel-register')
+require('./gulp')

tgui/gulp/.babelrc

@@ -0,0 +1,5 @@
+{
+  "presets": [
+    "es2015"
+  ]
+}

tgui/gulp/flags.js

@@ -0,0 +1,4 @@
+const flags = require('minimist')(process.argv.slice(2))
+
+export const debug = flags.debug || flags.d
+export const min = flags.min || flags.m

tgui/gulp/index.js

@@ -0,0 +1,12 @@
+import gulp from 'gulp'
+
+import { css, watch_css } from './tasks/css'
+import { js, watch_js } from './tasks/js'
+import { reload, watch_reload } from './tasks/reload'
+import { size } from './tasks/size'
+
+gulp.task(reload)
+gulp.task(size)
+
+gulp.task('default', gulp.series(gulp.parallel(css, js), size))
+gulp.task('watch', gulp.parallel(watch_css, watch_js, watch_reload))

tgui/paths.json → tgui/gulp/paths.json

@@ -1,5 +1,5 @@
 {
-  "out":"assets",
+  "out":"assets/",
   "css":{
     "dir":"styles/",
     "main":"main.styl",
@@ -11,7 +11,7 @@
   },
   "js":{
     "dir":"scripts/",
-    "main":"main.coffee",
+    "main":"main.js",
     "out":"tgui.js"
   }
 }