@worksafevictoria/wcl7.5 1.7.1 → 1.7.3-beta.1
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.
package/package.json
CHANGED
|
@@ -10,9 +10,7 @@
|
|
|
10
10
|
<img class="app-search__close-icon" width="22" height="18" :src="Close" />
|
|
11
11
|
</button>
|
|
12
12
|
<form @submit.prevent>
|
|
13
|
-
<label
|
|
14
|
-
class="app-search__label font-weight-bold"
|
|
15
|
-
for="app-search--search-input-box"
|
|
13
|
+
<label class="app-search__label font-weight-bold" for="app-search--search-input-box"
|
|
16
14
|
>Search WorkSafe</label
|
|
17
15
|
>
|
|
18
16
|
<search
|
|
@@ -32,40 +30,40 @@
|
|
|
32
30
|
</template>
|
|
33
31
|
|
|
34
32
|
<script>
|
|
35
|
-
import Close from
|
|
36
|
-
import Search from
|
|
33
|
+
import Close from "../../../../assets/icons/close.svg?url";
|
|
34
|
+
import Search from "../../../SubComponents/Search/index.vue";
|
|
37
35
|
|
|
38
36
|
export default {
|
|
39
|
-
name:
|
|
37
|
+
name: "ModalSearch",
|
|
40
38
|
components: { Search },
|
|
41
39
|
props: {
|
|
42
40
|
searchQuery: {
|
|
43
41
|
type: String,
|
|
44
|
-
default:
|
|
42
|
+
default: "",
|
|
45
43
|
},
|
|
46
44
|
contentParser: {
|
|
47
45
|
type: Function,
|
|
48
|
-
required: true
|
|
46
|
+
required: true,
|
|
49
47
|
},
|
|
50
48
|
googleSearchFlag: {
|
|
51
49
|
type: String,
|
|
52
|
-
default:
|
|
53
|
-
}
|
|
50
|
+
default: "solar",
|
|
51
|
+
},
|
|
54
52
|
},
|
|
55
53
|
data() {
|
|
56
54
|
return {
|
|
57
55
|
pageLimit: 20,
|
|
58
56
|
pageNumber: 1,
|
|
59
57
|
searchResults: null,
|
|
60
|
-
Close
|
|
61
|
-
}
|
|
58
|
+
Close,
|
|
59
|
+
};
|
|
62
60
|
},
|
|
63
61
|
mounted() {
|
|
64
|
-
this.$refs.searchInputBox.$el.querySelector(
|
|
65
|
-
}
|
|
66
|
-
}
|
|
62
|
+
this.$refs.searchInputBox.$el.querySelector("input").focus();
|
|
63
|
+
},
|
|
64
|
+
};
|
|
67
65
|
</script>
|
|
68
66
|
|
|
69
67
|
<style lang="scss" scoped>
|
|
70
|
-
@import
|
|
68
|
+
@import "./styles";
|
|
71
69
|
</style>
|
|
@@ -10,9 +10,7 @@
|
|
|
10
10
|
<img class="app-search__close-icon" width="22" height="18" :src="Close" />
|
|
11
11
|
</button>
|
|
12
12
|
<form @submit.prevent>
|
|
13
|
-
<label
|
|
14
|
-
class="app-search__label font-weight-bold"
|
|
15
|
-
for="app-search--search-input-box"
|
|
13
|
+
<label class="app-search__label font-weight-bold" for="app-search--search-input-box"
|
|
16
14
|
>Search WorkSafe</label
|
|
17
15
|
>
|
|
18
16
|
<search
|
|
@@ -32,40 +30,40 @@
|
|
|
32
30
|
</template>
|
|
33
31
|
|
|
34
32
|
<script>
|
|
35
|
-
import Close from
|
|
36
|
-
import Search from
|
|
33
|
+
import Close from "../../../../assets/icons/close.svg?url";
|
|
34
|
+
import Search from "../../../SubComponents/Search/index.vue";
|
|
37
35
|
|
|
38
36
|
export default {
|
|
39
|
-
name:
|
|
37
|
+
name: "ModalSearch",
|
|
40
38
|
components: { Search },
|
|
41
39
|
props: {
|
|
42
40
|
searchQuery: {
|
|
43
41
|
type: String,
|
|
44
|
-
default:
|
|
42
|
+
default: "",
|
|
45
43
|
},
|
|
46
44
|
contentParser: {
|
|
47
45
|
type: Function,
|
|
48
|
-
required: true
|
|
46
|
+
required: true,
|
|
49
47
|
},
|
|
50
48
|
googleSearchFlag: {
|
|
51
49
|
type: String,
|
|
52
|
-
default:
|
|
53
|
-
}
|
|
50
|
+
default: "solar",
|
|
51
|
+
},
|
|
54
52
|
},
|
|
55
53
|
data() {
|
|
56
54
|
return {
|
|
57
55
|
pageLimit: 20,
|
|
58
56
|
pageNumber: 1,
|
|
59
57
|
searchResults: null,
|
|
60
|
-
Close
|
|
61
|
-
}
|
|
58
|
+
Close,
|
|
59
|
+
};
|
|
62
60
|
},
|
|
63
61
|
mounted() {
|
|
64
|
-
this.$refs.searchInputBox.$el.querySelector(
|
|
65
|
-
}
|
|
66
|
-
}
|
|
62
|
+
this.$refs.searchInputBox.$el.querySelector("input").focus();
|
|
63
|
+
},
|
|
64
|
+
};
|
|
67
65
|
</script>
|
|
68
66
|
|
|
69
67
|
<style lang="scss" scoped>
|
|
70
|
-
@import
|
|
68
|
+
@import "./styles";
|
|
71
69
|
</style>
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
@pagechanged="pageChanged($event)"
|
|
57
57
|
/>
|
|
58
58
|
</div>
|
|
59
|
-
<
|
|
59
|
+
<h4 v-if="filteredRecords.length === 0">No records found</h4>
|
|
60
60
|
|
|
61
61
|
</section-group>
|
|
62
62
|
|
|
@@ -261,11 +261,11 @@ export default {
|
|
|
261
261
|
if (this.searchOrg.length || this.searchSub.length || this.searchCourse.length || this.searchThemes.length) {
|
|
262
262
|
// don't set focus
|
|
263
263
|
} else {
|
|
264
|
+
// set focus to top element - used instead of scrollTo
|
|
265
|
+
console.log('setting focus.')
|
|
264
266
|
linksArr[0].focus()
|
|
265
|
-
}
|
|
266
|
-
|
|
267
|
+
}
|
|
267
268
|
}
|
|
268
|
-
|
|
269
269
|
},
|
|
270
270
|
}
|
|
271
271
|
}
|