aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
blob: 34414d1e95ca8133666202b893938058ee83bbcc (about) (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161

*.eps
*.go
*.log
*.mo
*.pdf
*.png
*.tar.xz
*.tmp
*~
.#*
\#*\#
,*
/ABOUT-NLS
/INSTALL
/aclocal.m4
/autom4te.cache
/build-aux/ar-lib
/build-aux/compile
/build-aux/config.guess
/build-aux/config.rpath
/build-aux/config.sub
/build-aux/depcomp
/build-aux/install-sh
/build-aux/mdate-sh
/build-aux/missing
/build-aux/test-driver
/build-aux/texinfo.tex
/config.status
/configure
/doc/*.1
/doc/.dirstamp
/doc/contributing.*.texi
/doc/guix*.aux
/doc/guix*.cp
/doc/guix*.cps
/doc/guix*.fn
/doc/guix*.fns
/doc/guix*.html
/doc/guix*.info
/doc/guix*.info-[0-9]
/doc/guix*.ky
/doc/guix*.pg
/doc/guix*.toc
/doc/guix*.t2p
/doc/guix*.tp
/doc/guix*.vr
/doc/guix*.vrs
/doc/guix.*.texi
/doc/guix-cookbook.*.texi
/doc/guix.aux
/doc/guix.cp
/doc/guix.cps
/doc/guix.fn
/doc/guix.fns
/doc/guix.html
/doc/guix.info
/doc/guix.info-[0-9]
/doc/guix.ky
/doc/guix.pg
/doc/guix.toc
/doc/guix.t2p
/doc/guix.tp
/doc/guix.vr
/doc/guix.vrs
/doc/os-config-bare-bones.texi
/doc/os-config-desktop.texi
/doc/stamp-vti
/doc/version.texi
/doc/version-*.texi
/etc/committer.scm
/etc/teams.scm
/etc/gnu-store.mount
/etc/guix-daemon.cil
/etc/guix-daemon.conf
/etc/guix-daemon.service
/etc/guix-publish.conf
/etc/guix-publish.service
/etc/guix-gc.service
/etc/init.d/guix-daemon
/etc/openrc/guix-daemon
/guix-*
/guix/config.scm
/libformat.a
/libstore.a
/libutil.a
/m4/*
/m4/ChangeLog
/m4/gettext.m4
/m4/iconv.m4
/m4/lib-ld.m4
/m4/lib-link.m4
/m4/lib-prefix.m4
/m4/nls.m4
/m4/po.m4
/m4/progtest.m4
/nix/config.h
/nix/config.h.in
/po/doc/*.mo
/po/doc/*.pot
/po/guix/*.gmo
/po/guix/*.insert-header
/po/guix/*.mo
/po/guix/ChangeLog
/po/guix/Makefile.in.in
/po/guix/Makevars.template
/po/guix/POTFILES
/po/guix/Rules-quot
/po/guix/boldquot.sed
/po/guix/en@boldquot.*
/po/guix/en@quot.*
/po/guix/guix.pot
/po/guix/insert-header.sin
/po/guix/quot.sed
/po/guix/remove-potcdate.sed
/po/guix/remove-potcdate.sin
/po/guix/stamp-po
/po/packages/*.gmo
/po/packages/*.insert-header
/po/packages/*.mo
/po/packages/ChangeLog
/po/packages/Makefile.in.in
/po/packages/Makevars.template
/po/packages/POTFILES
/po/packages/Rules-quot
/po/packages/boldquot.sed
/po/packages/en@boldquot.*
/po/packages/en@quot.*
/po/packages/guix-packages.pot
/po/packages/insert-header.sin
/po/packages/quot.sed
/po/packages/remove-potcdate.sed
/po/packages/remove-potcdate.sin
/po/packages/stamp-po
/pre-inst-env
/release-*
/scripts/guix
/t-*/
/test-env
/test-tmp
/tests/*.trs
/tests/services/*.trs
GPATH
GRTAGS
GTAGS
Makefile
Makefile.in
config.cache
stamp-h[0-9]
.am[0-9]*/
.dirstamp
.deps
tmp
/doc/os-config-lightweight-desktop.texi
/nix/scripts/download
/.tarball-version
/.version
/doc/stamp-*
/gnu/packages/bootstrap
/gnu/packages/aux-files/guile-guile-launcher.o
/guile
.DS_Store
generated by cgit
5-12
- clean up the remnants of LibreJS -- DONE 2021-05-12
diff --git a/background/main.js b/background/main.js
index f4b01f8..6b636c4 100644
--- a/background/main.js
+++ b/background/main.js
@@ -116,10 +116,10 @@
text: "console.log(\"hello, every1!\");\n"
};
await storage.set(TYPE_PREFIX.SCRIPT, "hello", hello_script);
- await storage.set(TYPE_PREFIX.BUNDLE, "hello",
+ await storage.set(TYPE_PREFIX.BAG, "hello",
[[TYPE_PREFIX.SCRIPT, "hello"]]);
await storage.set(TYPE_PREFIX.PAGE, "https://my.fsf.org/", {
- components: [[TYPE_PREFIX.BUNDLE, "hello"]],
+ components: [[TYPE_PREFIX.BAG, "hello"]],
allow: true
});
diff --git a/background/page_actions_server.js b/background/page_actions_server.js
index fbb672e..2a0b858 100644
--- a/background/page_actions_server.js
+++ b/background/page_actions_server.js
@@ -29,31 +29,31 @@
return;
let components = settings.components;
- let processed_bundles = new Set();
+ let processed_bags = new Set();
- send_scripts_rec(components, port, processed_bundles);
+ send_scripts_rec(components, port, processed_bags);
}
// TODO: parallelize script fetching
- async function send_scripts_rec(components, port, processed_bundles)
+ async function send_scripts_rec(components, port, processed_bags)
{
for (let [prefix, name] of components) {
- if (prefix === TYPE_PREFIX.BUNDLE) {
- if (processed_bundles.has(name)) {
- console.log(`preventing recursive inclusion of bundle ${name}`);
+ if (prefix === TYPE_PREFIX.BAG) {
+ if (processed_bags.has(name)) {
+ console.log(`preventing recursive inclusion of bag ${name}`);
continue;
}
- var bundle = storage.get(TYPE_PREFIX.BUNDLE, name);
+ var bag = storage.get(TYPE_PREFIX.BAG, name);
- if (bundle === undefined) {
- console.log(`no bundle in storage for key ${name}`);
+ if (bag === undefined) {
+ console.log(`no bag in storage for key ${name}`);
continue;
}
- processed_bundles.add(name);
- await send_scripts_rec(bundle, port, processed_bundles);
- processed_bundles.delete(name);
+ processed_bags.add(name);
+ await send_scripts_rec(bag, port, processed_bags);
+ processed_bags.delete(name);
} else {
let script_text = await get_script_text(name);
if (script_text === undefined)
diff --git a/background/reverse_use_info.js b/background/reverse_use_info.js
index 3399285..688cd64 100644
--- a/background/reverse_use_info.js
+++ b/background/reverse_use_info.js
@@ -1,5 +1,5 @@
/**
-* Myext scripts and bundles usage index
+* Myext scripts and bags usage index
*
* Copyright (C) 2021 Wojtek Kosior
*
@@ -11,7 +11,7 @@
"use strict";
/*
- * We want to count referenes to scripts and bundles in order to know,
+ * We want to count referenes to scripts and bags in order to know,
* for example, whether one can be safely deleted.
*/
@@ -83,7 +83,7 @@
{
storage = await get_storage();
- prefixes = [TYPE_PREFIX.PAGE, TYPE_PREFIX.BUNDLE];
+ prefixes = [TYPE_PREFIX.PAGE, TYPE_PREFIX.BAG];
for (let prefix of prefixes)
build_reverse_uses_info(prefix);
diff --git a/background/storage.js b/background/storage.js
index ea390ef..5578109 100644
--- a/background/storage.js
+++ b/background/storage.js
@@ -104,7 +104,7 @@
}
var pages;
- var bundles;
+ var bags;
var scripts;
var list_by_prefix = {};
@@ -310,8 +310,8 @@
*/
/*
- * For bundles, item name is chosen by user, data is an array of 2-element
- * arrays with type prefix and script/bundle names.
+ * For bags, item name is chosen by user, data is an array of 2-element
+ * arrays with type prefix and script/bag names.
*/
/*
diff --git a/background/storage_server.js b/background/storage_server.js
index 05f616b..a4b292c 100644
--- a/background/storage_server.js
+++ b/background/storage_server.js
@@ -41,7 +41,7 @@
port.postMessage({
[TYPE_PREFIX.SCRIPT] : storage.get_all(TYPE_PREFIX.SCRIPT),
- [TYPE_PREFIX.BUNDLE] : storage.get_all(TYPE_PREFIX.BUNDLE),
+ [TYPE_PREFIX.BAG] : storage.get_all(TYPE_PREFIX.BAG),
[TYPE_PREFIX.PAGE] : storage.get_all(TYPE_PREFIX.PAGE)
});
diff --git a/common/storage_client.js b/common/storage_client.js
index 39ece44..f1ae272 100644
--- a/common/storage_client.js
+++ b/common/storage_client.js
@@ -55,12 +55,12 @@
}
var scripts = list("scripts", TYPE_PREFIX.SCRIPT);
- var bundles = list("bundles", TYPE_PREFIX.BUNDLE);
+ var bags = list("bags", TYPE_PREFIX.BAG);
var pages = list("pages", TYPE_PREFIX.PAGE);
const list_by_prefix = {
[TYPE_PREFIX.SCRIPT] : scripts,
- [TYPE_PREFIX.BUNDLE] : bundles,
+ [TYPE_PREFIX.BAG] : bags,
[TYPE_PREFIX.PAGE] : pages
};
diff --git a/common/stored_types.js b/common/stored_types.js
index de0ec71..31254a9 100644
--- a/common/stored_types.js
+++ b/common/stored_types.js
@@ -21,20 +21,20 @@
(() => {
const TYPE_PREFIX = {
PAGE : "p",
- BUNDLE : "b",
+ BAG : "b",
SCRIPT : "s",
VAR : "_"
};
const TYPE_NAME = {
[TYPE_PREFIX.PAGE] : "page",
- [TYPE_PREFIX.BUNDLE] : "bundle",
+ [TYPE_PREFIX.BAG] : "bag",
[TYPE_PREFIX.SCRIPT] : "script"
}
const list_prefixes = [
TYPE_PREFIX.PAGE,
- TYPE_PREFIX.BUNDLE,
+ TYPE_PREFIX.BAG,
TYPE_PREFIX.SCRIPT
];
diff --git a/html/options.html b/html/options.html
index 0bce6fc..cb39090 100644
--- a/html/options.html
+++ b/html/options.html
@@ -30,13 +30,13 @@
/* tabbed view */
#show_pages:not(:checked) ~ #pages,
- #show_bundles:not(:checked) ~ #bundles,
+ #show_bags:not(:checked) ~ #bags,
#show_scripts:not(:checked) ~ #scripts {
display: none;
}
#show_pages:checked ~ #pages_lbl,
- #show_bundles:checked ~ #bundles_lbl,
+ #show_bags:checked ~ #bags_lbl,
#show_scripts:checked ~ #scripts_lbl {
border-left: 2px solid green;
border-right: 2px solid green;
@@ -89,12 +89,12 @@
</div>
<input type="radio" name="tabs" id="show_pages" checked></input>
- <input type="radio" name="tabs" id="show_bundles"></input>
+ <input type="radio" name="tabs" id="show_bags"></input>
<input type="radio" name="tabs" id="show_scripts"></input>
<label for="show_pages" id="pages_lbl"
class="tab_head"> Pages </label>
- <label for="show_bundles" id="bundles_lbl"
- class="tab_head"> Bundles </label>
+ <label for="show_bags" id="bags_lbl"
+ class="tab_head"> Bags </label>
<label for="show_scripts" id="scripts_lbl"
class="tab_head"> Scripts </label>
@@ -119,23 +119,23 @@
<button id="add_page_but" type="button"> Add page </button>
</div>
- <div id="bundles">
- <ul id="bundles_ul">
- <li id="work_bundle_li" class="hide">
- <label for="bundle_name_field"> Name: </label>
- <input id="bundle_name_field"></input>
- <ul id="bundle_components_ul">
- <li id="empty_bundle_component_li" class="hide"></li>
+ <div id="bags">
+ <ul id="bags_ul">
+ <li id="work_bag_li" class="hide">
+ <label for="bag_name_field"> Name: </label>
+ <input id="bag_name_field"></input>
+ <ul id="bag_components_ul">
+ <li id="empty_bag_component_li" class="hide"></li>
</ul>
- <button id="bundle_select_components_but">
+ <button id="bag_select_components_but">
Add scripts
</button>
<br/>
- <button id="bundle_save_but"> Save </button>
- <button id="bundle_discard_but"> Cancel </button>
+ <button id="bag_save_but"> Save </button>
+ <button id="bag_discard_but"> Cancel </button>
</li>
</ul>
- <button id="add_bundle_but" type="button"> Add bundle </button>
+ <button id="add_bag_but" type="button"> Add bag </button>
</div>
<div id="scripts">
diff --git a/html/options_main.js b/html/options_main.js
index ca591d5..104f771 100644
--- a/html/options_main.js
+++ b/html/options_main.js
@@ -92,7 +92,7 @@
/*
* Used to construct and update components list of edited
- * bundle as well as edited page.
+ * bag as well as edited page.
*/
function add_components(ul, components)
{
@@ -114,7 +114,7 @@
components_ul.appendChild(ul.work_empty_component_li);
}
- /* Used to reset edited bundle as well as edited page. */
+ /* Used to reset edited bag as well as edited page. */
function generic_reset_work_li(ul, item, components)
{
if (item === undefined) {
@@ -138,7 +138,7 @@
generic_reset_work_li(ul, item, settings?.components);
}
- /* Used to get edited bundle as well as edited page data for saving. */
+ /* Used to get edited bag as well as edited page data for saving. */
function generic_work_li_data(ul)
{
let components_ul = ul.work_name_input.nextElementSibling;
@@ -305,11 +305,11 @@
state : UL_STATE.IDLE,
edited_item : undefined,
},
- [TYPE_PREFIX.BUNDLE] : {
- ul : by_id("bundles_ul"),
- work_li : by_id("work_bundle_li"),
- work_name_input : by_id("bundle_name_field"),
- work_empty_component_li : by_id("empty_bundle_component_li"),
+ [TYPE_PREFIX.BAG] : {
+ ul : by_id("bags_ul"),
+ work_li : by_id("work_bag_li"),
+ work_name_input : by_id("bag_name_field"),
+ work_empty_component_li : by_id("empty_bag_component_li"),
reset_work_li : generic_reset_work_li,
get_work_li_data : generic_work_li_data,
state : UL_STATE.IDLE,
generated by cgit