Skip to content

Commit

Permalink
Bump jquery from 3.4.1 to 3.5.0 (elastic#64884)
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/kbn-ui-shared-deps/package.json
#	src/plugins/visualize/public/application/editor/editor.html
#	x-pack/plugins/monitoring/public/directives/main/index.html
  • Loading branch information
dependabot[bot] authored and jportner committed May 5, 2020
1 parent bdb54bb commit 2a861ce
Show file tree
Hide file tree
Showing 14 changed files with 442 additions and 21 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"inert": "^5.1.0",
"inline-style": "^2.0.0",
"joi": "^13.5.2",
"jquery": "^3.4.1",
"jquery": "^3.5.0",
"js-yaml": "3.13.1",
"json-stable-stringify": "^1.0.1",
"json-stringify-pretty-compact": "1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-ui-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"html": "1.0.0",
"html-loader": "^0.5.5",
"imports-loader": "^0.8.0",
"jquery": "^3.4.1",
"jquery": "^3.5.0",
"keymirror": "0.1.1",
"moment": "^2.24.0",
"node-sass": "^4.13.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-ui-shared-deps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"core-js": "^3.2.1",
"custom-event-polyfill": "^0.3.0",
"elasticsearch-browser": "^16.5.0",
"jquery": "^3.4.1",
"jquery": "^3.5.0",
"moment": "^2.24.0",
"moment-timezone": "^0.5.27",
"monaco-editor": "~0.17.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
listing-limit="listingLimit"
hide-write-controls="hideWriteControls"
initial-filter="initialFilter"
/>
></dashboard-listing>
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
/>
</form>
<button ng-disabled="migration.isMigrating || !migration.newTitle.trim()" class="kuiButton kuiButton--primary kuiButton--iconText" ng-click="migrate()">
<span ng-if="migration.isMigrating" class="euiLoadingSpinner euiLoadingSpinner--medium" />
<span ng-if="migration.isMigrating" class="euiLoadingSpinner euiLoadingSpinner--medium"></span>
<span i18n-id="kbn.management.editIndexPattern.migrate"
i18n-default-message="Migrate"></span>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
filters="filters"
query="query"
app-state="appState"
/>
></visualization-embedded>

<h1
class="euiScreenReaderOnly"
Expand All @@ -99,6 +99,6 @@
filters="filters"
query="query"
class="visEditor__content"
/>
></visualization-editor>

</visualize-app>
104 changes: 104 additions & 0 deletions src/plugins/visualize/public/application/editor/editor.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<visualize-app class="app-container visEditor visEditor--{{ vis.type.name }}">

<!--
Local nav.
Most visualizations have all search bar components enabled
Some visualizations have fewer options but all visualizations have a search bar
which is why show-search-baris set to "true".
All visualizaions also have least a timepicker \ autorefresh component, which is why
show-query-bar is set to "true".
-->
<kbn-top-nav
ng-if="isVisible"
app-name="'visualize'"
config="topNavMenu"
show-search-bar="true"
show-query-bar="true"
show-query-input="showQueryInput()"
show-filter-bar="showFilterBar() && isVisible"
show-date-picker="showQueryBarTimePicker()"
show-auto-refresh-only="!showQueryBarTimePicker()"
query="query"
saved-query="savedQuery"
screen-title="vis.title"
on-query-submit="updateQueryAndFetch"
index-patterns="[indexPattern]"
filters="filters"
on-filters-updated="onFiltersUpdated"
date-range-from="timeRange.from"
date-range-to="timeRange.to"
is-refresh-paused="refreshInterval.pause"
refresh-interval="refreshInterval.value"
on-refresh-change="onRefreshChange"
show-save-query="showSaveQuery"
on-saved="updateSavedQuery"
on-saved-query-updated="updateSavedQuery"
on-clear-saved-query="onClearSavedQuery"
>
</kbn-top-nav>

<!--
The top nav is hidden in embed mode but the filter bar must still be present so
we show the filter bar on its own here if the chrome is not visible.
-->
<kbn-top-nav
ng-if="showFilterBar() && !isVisible"

app-name="'visualize'"
show-search-bar="true"
show-filter-bar="true"
show-save-query="false"
show-date-picker="false"

filters="filters"
on-filters-updated="onFiltersUpdated"
index-patterns="[indexPattern]"
>
</kbn-top-nav>

<div
class="euiCallOut euiCallOut--primary euiCallOut--small hide-for-sharing"
ng-if="vis.type.shouldMarkAsExperimentalInUI()"
data-test-subj="experimentalVisInfo"
>
<div class="euiText">
<p ng-bind-html="getAdditionalMessage()"></p>
</div>
</div>

<visualization-embedded
ng-if="!isVisible"
class="visualize"
vis="vis"
embeddable-handler="embeddableHandler"
ui-state="uiState"
time-range="timeRange"
filters="filters"
query="query"
app-state="appState"
></visualization-embedded>

<h1
class="euiScreenReaderOnly"
i18n-id="visualize.pageHeading"
i18n-default-message="{chartName} {chartType} visualization"
i18n-values="{
chartName: savedVis.title,
chartType: vis.type.title
}"
>
</h1>
<visualization-editor
ng-if="isVisible"
vis="vis"
saved-search="savedSearch"
embeddable-handler="embeddableHandler"
event-emitter="eventEmitter"
ui-state="uiState"
time-range="timeRange"
filters="filters"
query="query"
class="visEditor__content"
></visualization-editor>

</visualize-app>
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
delete="delete"
listing-limit="listingLimit"
read-only="readOnly"
/>
></map-listing>
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
i18n-id="xpack.monitoring.logstashNavigation.pipelinesLinkText"
i18n-default-message="Pipelines"
></span>
<span class="kuiIcon fa-flask monTabs--icon" tooltip="Beta feature" />
<span class="kuiIcon fa-flask monTabs--icon" tooltip="Beta feature"></span>
</a>
<a
ng-if="!monitoringMain.instance && !monitoringMain.pipelineId && monitoringMain.isDisabledTab('logstash')"
Expand All @@ -251,7 +251,7 @@
i18n-id="xpack.monitoring.logstashNavigation.pipelinesLinkText"
i18n-default-message="Pipelines"
></span>
<span class="kuiIcon fa-flask monTabs--icon" tooltip="Beta feature" />
<span class="kuiIcon fa-flask monTabs--icon" tooltip="Beta feature"></span>
</a>
<a
ng-if="monitoringMain.instance"
Expand All @@ -272,7 +272,7 @@
i18n-id="xpack.monitoring.logstashNavigation.instance.pipelinesLinkText"
i18n-default-message="Pipelines"
></span>
<span class="kuiIcon fa-flask fa-sm monTabs--icon" tooltip="Beta feature" />
<span class="kuiIcon fa-flask fa-sm monTabs--icon" tooltip="Beta feature"></span>
</a>
<a
ng-if="monitoringMain.instance"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@
"io-ts": "^2.0.5",
"isbinaryfile": "4.0.2",
"joi": "^13.5.2",
"jquery": "^3.4.1",
"jquery": "^3.5.0",
"js-search": "^1.4.3",
"js-yaml": "3.13.1",
"json-stable-stringify": "^1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/graph/public/angular/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
ng-click="selectSelected(n)">
<svg width="24" height="24">
<circle class="gphNode__circle " r="10" cx="12" cy="12" ng-attr-style="fill:{{n.color}}"
ng-click="workspace.deselectNode(n)" />
ng-click="workspace.deselectNode(n)" ></circle>

<text
ng-if="n.icon"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
capabilities="capabilities"
initial-filter="initialFilter"
core-start="coreStart"
/>
></graph-listing>
Loading

0 comments on commit 2a861ce

Please sign in to comment.