[gimp] plug-ins: get rid of getCurrentPath() in goat-exercise-gjs.js.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] plug-ins: get rid of getCurrentPath() in goat-exercise-gjs.js.
- Date: Fri, 9 Aug 2019 13:48:45 +0000 (UTC)
commit d0be3d3e0cf761f8d5186bf8d65bcad90a8c5fae
Author: Jehan <jehan girinstud io>
Date: Fri Aug 9 15:31:53 2019 +0200
plug-ins: get rid of getCurrentPath() in goat-exercise-gjs.js.
The file path was already the same as ARGV first argument (i.e.
System.programInvocationName as I added this myself!). Why did I even
bothered with this annoying trick!
This makes the code much simpler, which is better for demo code.
plug-ins/goat-exercises/goat-exercise-gjs.js | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/plug-ins/goat-exercises/goat-exercise-gjs.js b/plug-ins/goat-exercises/goat-exercise-gjs.js
index 5b20e6d01e..67554f4b60 100755
--- a/plug-ins/goat-exercises/goat-exercise-gjs.js
+++ b/plug-ins/goat-exercises/goat-exercise-gjs.js
@@ -35,23 +35,6 @@ const GLib = imports.gi.GLib;
const GObject = imports.gi.GObject;
const Gio = imports.gi.Gio;
-/* Trick coming from extensionUtils.js in gnome-shell.
- * See in particular implementation of getCurrentExtension().
- */
-function getCurrentPath() {
- let stackLine = (new Error()).stack.split('\n')[1];
-
- /* In GIMP case, I saw strings such as:
- * run@/home/jehan/.config/GIMP/2.99/plug-ins/hello-world/hello-world.js:150:24
- * Let's make sure all cases are handled.
- */
- let match = new RegExp('@(.+\\.js)(:\\d+)+').exec(stackLine);
- if (! match)
- return null;
-
- return match[1];
-}
-
/* gjs's ARGV is not C-style. We must add the program name as first
* value.
*/
@@ -139,14 +122,13 @@ var Goat = GObject.registerClass({
box.pack_start(label, false, false, 1);
label.show();
- let path = getCurrentPath();
- if (path) {
+ let contents = String(GLib.file_get_contents(System.programInvocationName)[1]);
+ if (contents) {
let scrolled = new Gtk.ScrolledWindow();
scrolled.set_vexpand (true);
box.pack_start(scrolled, true, true, 1);
scrolled.show();
- let contents = String(GLib.file_get_contents(path)[1]);
let view = new Gtk.TextView();
view.set_wrap_mode(Gtk.WrapMode.WORD);
view.set_editable(false);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]