Skip to content

Commit

Permalink
#6371 get rid of the OK button (#6487)
Browse files Browse the repository at this point in the history
* #6371 remove OK button from template

* commit contains following changes:

- #6371 refactor
- #6371 sync options continuously
- #6371 fix some load quirks:
  - loading twice
  - loading on tab click when tab is active
  - last version not loaded in some cases
- #6478 heap size must be positive

* #6371 remove invalid if statement

* #6371 use _.debounce, implement synchronization indicator

* #6371 change sync indicator place in template

* #6371 fix losing focus after sync, and tabing issue

* #6371 sync empty values; add only missing inputs when loading settings

* #6371 fix code style (jscs)

* #6371 do not send invalid heap size

* #6371 add additional check when validating heap size

* #6371 do not sync data when heap size is invalid
  • Loading branch information
piorek authored and scottdraves committed Jan 5, 2018
1 parent 326f545 commit d86effc
Show file tree
Hide file tree
Showing 2 changed files with 272 additions and 177 deletions.
21 changes: 17 additions & 4 deletions beakerx/beakerx/static/html/settings_tab.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@
#beakerx_info .beakerx_site_link img {
height: 35px;
}

#sync_indicator .saving {
color: #f0ad4e;
}

#sync_indicator .saved {
color: #5cb85c;
}
</style>
<div id="beakerx_env_toolbar" class="list_toolbar row">
<div class="col-xs-12 no-padding">
Expand Down Expand Up @@ -73,8 +81,11 @@
<div class="col-xs-8">
<div class="pull-right">
<label for="add_option_jvm_sett">add option: </label>
<button type="button" id="add_option_jvm_sett" title="" class="btn btn-default btn-xs"
data-original-title="add new"><i class="fa fa-plus"></i></button>
<button type="button"
id="add_option_jvm_sett"
class="btn btn-default btn-xs"
data-original-title="add new">
<i class="fa fa-plus"></i>
</button>
</div>
</div>
Expand All @@ -83,10 +94,12 @@
</div>
</fieldset>
<div class="form-group text-primary">
<span>Result: java </span><span id="result"></span>
<span id="sync_indicator">
<span class="saving hidden"><i class="fa fa-spinner"></i></span>
<span class="saved hidden"><i class="fa fa-check"></i></span>
</span><span>Result: java </span><span id="result"></span>
</div>
<div id="errors" style="color: red"></div>
<button type="button" id="jvm_settings_submit" class="btn btn-primary">OK</button>
</form>
</div>
</div>
Loading

0 comments on commit d86effc

Please sign in to comment.