Skip to content

Commit 4bccde2

Browse files
committed
fix issues with element picker
* the target website is now loaded again * fixed display issue with long selectors
1 parent 800f1a5 commit 4bccde2

File tree

2 files changed

+27
-25
lines changed

2 files changed

+27
-25
lines changed

frontend/src/main/javascript/src/js/components/html-element-picker/html-element-picker.component.html

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<div id="html-element-picker-wrapper">
22
<div id="html-element-picker">
3-
<div class="header">
3+
<div class="header d-flex flex-row">
44

5-
<div ng-if="vm.corsDisabled !== null && !vm.corsDisabled" style="flex: 1 0; display: flex">
6-
<div class="header-element" style="flex: 0 0 320px">
5+
<div ng-if="vm.corsDisabled !== null && !vm.corsDisabled" class="d-flex flex-row w-100">
6+
<div class="header-element" style="min-width: 320px; max-width: 320px">
77
<form ng-submit="vm.loadUrl()">
88
<div class="form-group">
99
<div class="input-group">
@@ -19,7 +19,7 @@
1919
</form>
2020
</div>
2121

22-
<div class="header-element" style="flex: 0 0">
22+
<div class="header-element">
2323
<div class="btn-group d-flex">
2424
<button class="btn btn-default" ng-click="vm.toggleSelection()"
2525
tooltip-placement="right"
@@ -32,44 +32,52 @@
3232
</div>
3333
</div>
3434

35-
<div class="header-element" style="flex: 1 0; overflow: hidden">
36-
<div class="btn btn-block btn-default disabled"
37-
style="overflow: hidden; text-overflow: ellipsis; word-wrap: break-word; text-align: left">
35+
<div class="header-element w-100" style="overflow: hidden">
36+
<div class="btn btn-block btn-default disabled" style="overflow: hidden; text-overflow: ellipsis; word-wrap: break-word; text-align: left">
3837
<span ng-if="vm.node.selector" ng-bind="vm.node.selector"></span>
3938
<span ng-if="!vm.node.selector">Enable the selection mode</span>
4039
</div>
4140
</div>
4241

43-
<div class="header-element" style="flex: 0 0" ng-if="!vm.isSelectable && vm.node.selector">
42+
<div class="header-element" ng-if="!vm.isSelectable && vm.node.selector">
4443
<button class="btn btn-success" ng-click="vm.ok()">
4544
<i class="fa fa-check"></i>
4645
</button>
4746
</div>
47+
48+
<div class="header-element">
49+
<button class="btn btn-default" ng-click="vm.closePicker()">
50+
<i class="fa fa-close"></i>
51+
</button>
52+
</div>
4853
</div>
4954

50-
<div ng-if="vm.corsDisabled !== null && vm.corsDisabled" style="flex: 1 0; display: flex">
51-
<div class="header-element" style="flex: 1 0">
55+
<div ng-if="vm.corsDisabled !== null && vm.corsDisabled" class="d-flex flex-row w-100">
56+
<div class="header-element w-100">
5257
<div class="alert alert-warning alert-condensed">
5358
Your browser has an active <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS" target="_blank" rel="nofollow">CORS</a> rule for iframes.
5459
Please disable this feature to use the Element Picker.
5560
</div>
5661
</div>
62+
<div class="header-element">
63+
<button class="btn btn-default" ng-click="vm.closePicker()">
64+
<i class="fa fa-close"></i>
65+
</button>
66+
</div>
5767
</div>
5868

59-
<div ng-if="vm.corsDisabled === null" style="flex: 1 0; display: flex">
60-
<div class="header-element" style="flex: 1 0">
69+
<div ng-if="vm.corsDisabled === null" class="d-flex flex-row w-100">
70+
<div class="header-element w-100">
6171
<div class="alert alert-info alert-condensed">
6272
<i class="fa fa-spin fa-circle-o-notch"></i> Loading...
6373
</div>
6474
</div>
75+
<div class="header-element">
76+
<button class="btn btn-default" ng-click="vm.closePicker()">
77+
<i class="fa fa-close"></i>
78+
</button>
79+
</div>
6580
</div>
66-
67-
<div class="header-element" style="flex: 0 0">
68-
<button class="btn btn-default" ng-click="vm.closePicker()">
69-
<i class="fa fa-close"></i>
70-
</button>
71-
</div>
72-
7381
</div>
7482
<div class="body">
7583

frontend/src/main/javascript/src/js/components/html-element-picker/html-element-picker.component.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,6 @@ class HtmlElementPickerComponent {
6767
*/
6868
this.url = null;
6969

70-
/**
71-
* The project in the session
72-
* @type {null|Project}
73-
*/
74-
this.project = null;
75-
7670
/**
7771
* If cors rules are disabled in the browser.
7872
* @type {null}

0 commit comments

Comments
 (0)