glib-web 0.11.14 → 0.11.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7,9 +7,9 @@
7
7
  :row="spec.row"
8
8
  @change="onChange"
9
9
  >
10
- <div v-for="(item, index) in spec.childViews" :key="index">
11
- <div @click="updateValue(item)">
12
- <glib-component :spec="item" />
10
+ <div v-for="(childView, index) in spec.childViews" :key="index">
11
+ <div :class="activeClass(childView)" @click="updateValue(childView)">
12
+ <glib-component :spec="childView" />
13
13
  </div>
14
14
  </div>
15
15
 
@@ -39,6 +39,16 @@ export default {
39
39
  if (variable.value) {
40
40
  this.fieldModel = variable.value;
41
41
  }
42
+ },
43
+ activeClass(childView) {
44
+ if (
45
+ childView.view.includes("fields/radio") &&
46
+ this.fieldModel == childView.value
47
+ ) {
48
+ return "radio--active";
49
+ } else {
50
+ return "";
51
+ }
42
52
  }
43
53
  }
44
54
  };
package/nav/dialog.vue CHANGED
@@ -60,6 +60,7 @@ export default {
60
60
  footer: null,
61
61
  model: null,
62
62
  url: null,
63
+ urlLoaded: false,
63
64
  showClose: false
64
65
  };
65
66
  },
@@ -74,8 +75,9 @@ export default {
74
75
  $ready() {
75
76
  this.$root.vueApp = this.vueApp;
76
77
 
77
- this.show();
78
+ this.show(false);
78
79
  this.stack.push(this);
80
+ console.log("DIALOG READY1", this.stack.length);
79
81
  },
80
82
  $tearDown() {
81
83
  console.log("Dialog destroyed");
@@ -91,23 +93,31 @@ export default {
91
93
  },
92
94
  reload(newSpec) {
93
95
  this.spec = newSpec;
94
- this.show();
96
+ this.urlLoaded = false;
97
+ this.show(true);
95
98
  },
96
- show() {
99
+ show(reload) {
97
100
  const spec = this.spec;
98
101
  this.url = spec.url;
99
102
  this.showClose = Utils.type.isString(this.url);
100
103
 
101
104
  if (Utils.type.isString(this.url)) {
102
- this.message = "Loading...";
103
- const url = Utils.url.appendParams(this.url, { _dialog: "v1" });
104
- Http.execute({ url: url }, "GET", this, response => {
105
- this.title = response.title;
106
- this.message = "";
107
- this.body = response.body;
108
- this.footer = response.footer;
109
- this.showClose = this.spec.showClose || false;
110
- });
105
+ if (!this.urlLoaded) {
106
+ if (!reload) {
107
+ this.message = "Loading...";
108
+ }
109
+ const url = Utils.url.appendParams(this.url, { _dialog: "v1" });
110
+ Http.execute({ url: url }, "GET", this, response => {
111
+ Utils.http.forceComponentUpdate(() => {
112
+ this.urlLoaded = true;
113
+ this.title = response.title;
114
+ this.message = "";
115
+ this.body = response.body;
116
+ this.footer = response.footer;
117
+ this.showClose = this.spec.showClose || false;
118
+ });
119
+ });
120
+ }
111
121
  } else {
112
122
  this.title = this.spec.title;
113
123
  this.message = this.spec.message;
package/nav/drawer.vue CHANGED
@@ -13,7 +13,7 @@
13
13
  :mini-variant.sync="mini"
14
14
  @input="updateState"
15
15
  >
16
- <template v-if="mini" v-slot:prepend>
16
+ <template v-if="mini != null" v-slot:prepend>
17
17
  <v-list-item>
18
18
  <v-list-item-icon>
19
19
  <v-icon v-if="!mini">mdi-chevron-left</v-icon>
@@ -39,7 +39,7 @@
39
39
  <v-list-item>
40
40
  <!-- Display the first line when the drawer is shrunk. Display the second line when the drawer is expanded -->
41
41
  <div style="display: none">Show if expand</div>
42
- <panels-responsive :spec="spec.footer" />
42
+ <panels-responsive v-if="!mini" :spec="spec.footer" />
43
43
  </v-list-item>
44
44
  </template>
45
45
  </v-navigation-drawer>
@@ -167,7 +167,7 @@ export default {
167
167
  },
168
168
  methods: {
169
169
  $ready() {
170
- this.mini = !this.cssClasses.includes("maxi");
170
+ // this.mini = !this.cssClasses.includes("maxi");
171
171
  this.updateNavigationStyle(window.location);
172
172
 
173
173
  // this.$el.addEventListener('drawers/clickButton', () => { this.updateState(false) }, false)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "glib-web",
3
- "version": "0.11.14",
3
+ "version": "0.11.18",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -9,21 +9,21 @@
9
9
  "author": "",
10
10
  "license": "ISC",
11
11
  "dependencies": {
12
+ "@fortawesome/fontawesome-free": "^5.0.0",
12
13
  "@mdi/font": "^4.5.95",
13
14
  "@rails/actioncable": "^6.0.0",
14
15
  "@rails/activestorage": "^6.0.0-alpha",
15
16
  "awesome-phonenumber": "2.15.0",
16
- "@fortawesome/fontawesome-free": "^5.0.0",
17
17
  "chart.js": "^2.8.0",
18
18
  "chartjs-plugin-annotation": "^0.5.7",
19
19
  "driver.js": "^0.9.8",
20
- "json-logic-js": "^1.2.2",
21
- "marked": "^0.7.0",
20
+ "json-logic-js": "^2.0.0",
21
+ "marked": "^4.0.0",
22
22
  "phoenix": "^1.5.3",
23
23
  "push.js": "^1.0.12",
24
- "sass": "^1.23.6",
25
- "sass-loader": "^8.0.0",
26
- "vue": "2.6.10",
24
+ "sass": "^1.38.0",
25
+ "sass-loader": "^10.0.0",
26
+ "vue": "2.6.14",
27
27
  "vue-chartkick": "^0.6.1",
28
28
  "vue-gtag": "^1.1.2",
29
29
  "vue-social-sharing": "^3.0.9",
@@ -31,7 +31,7 @@
31
31
  "vue2-editor": "^2.9.1",
32
32
  "vue2-google-maps": "^0.10.6",
33
33
  "vuedraggable": "^2.24.1",
34
- "vuetify": "2.3.9"
34
+ "vuetify": "2.6.7"
35
35
  },
36
36
  "devDependencies": {
37
37
  "@types/chart.js": "^2.9.34",
package/utils/format.js CHANGED
@@ -1,4 +1,4 @@
1
- import marked from "marked";
1
+ import { marked } from "marked";
2
2
 
3
3
  export default class {
4
4
  static markdown(text) {