Skip to content

Commit

Permalink
Merge pull request #5025 from w33ble/farewell-zeroclipboard-and-thank…
Browse files Browse the repository at this point in the history
…s-for-all-the-fish

Remove ng-clip and zeroclipboard
  • Loading branch information
jbudz committed Sep 23, 2015
2 parents 9e70e02 + a22719d commit f74eafe
Show file tree
Hide file tree
Showing 14 changed files with 3 additions and 187 deletions.
3 changes: 1 addition & 2 deletions docs/dashboard.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ in your Web page.
NOTE: A user must have Kibana access in order to view embedded dashboards.

Click the *Share* button to display HTML code to embed the dashboard in another Web page, along with a direct link to
the dashboard. Click the copy button image:images/Clipboard.png[Copy to Clipboard button] next to either option to copy
the code or the link to your clipboard.
the dashboard. You can select the text in either option to copy the code or the link to your clipboard.

[float]
[[embedding-dashboards]]
Expand Down
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
"minimatch": "2.0.10",
"mkdirp": "0.5.1",
"moment": "2.10.6",
"ng-clip": "0.2.6",
"raw-loader": "0.5.1",
"request": "2.61.0",
"requirefrom": "0.2.0",
Expand All @@ -120,8 +119,7 @@
"url-loader": "0.5.6",
"webpack": "1.12.1",
"webpack-directory-name-as-main": "1.0.0",
"whatwg-fetch": "0.9.0",
"zeroclipboard": "2.2.0"
"whatwg-fetch": "0.9.0"
},
"devDependencies": {
"Nonsense": "0.1.2",
Expand Down
1 change: 0 additions & 1 deletion src/plugins/devMode/public/visDebugSpyPanel.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<div class="form-group">
<label>
Vis State
<kbn-clipboard copy="visStateJson"></kbn-clipboard>
</label>
<pre>{{visStateJson}}</pre>
</div>
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/devMode/public/visDebugSpyPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ define(function (require) {
require('ui/registry/spy_modes').register(VisDetailsSpyProvider);

function VisDetailsSpyProvider(Notifier, $filter, $rootScope, config) {
require('ui/clipboard');

return {
name: 'debug',
display: 'Debug',
Expand Down
1 change: 0 additions & 1 deletion src/plugins/kibana/public/dashboard/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ define(function (require) {
require('ui/config');
require('ui/notify');
require('ui/typeahead');
require('ui/clipboard');

require('plugins/kibana/dashboard/directives/grid');
require('plugins/kibana/dashboard/components/panel/panel');
Expand Down
4 changes: 1 addition & 3 deletions src/plugins/kibana/public/dashboard/partials/share.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<p>
<div class="input-group">
<label>
Embed this dashboard.
<kbn-clipboard copy="opts.shareData().embed"></kbn-clipboard>
Embed this dashboard
<small>Add to your html source. Note all clients must still be able to access kibana</small>
</label>
<div class="form-control" disabled>{{opts.shareData().embed}}</div>
Expand All @@ -15,7 +14,6 @@
<div class="input-group">
<label>
Share a link
<kbn-clipboard copy="opts.shareData().link"></kbn-clipboard>
</label>
<div class="form-control" disabled>{{opts.shareData().link}}</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion src/plugins/kibana/public/visualize/editor/editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ define(function (require) {
require('plugins/kibana/visualize/editor/agg_filter');

require('ui/visualize');
require('ui/clipboard');
require('ui/collapsible_sidebar');

require('ui/routes')
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/kibana/public/visualize/editor/panels/share.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<div class="form-group">
<label>
Embed this visualization.
<kbn-clipboard copy="conf.shareData().embed"></kbn-clipboard>
<small>Add to your html source. Note all clients must still be able to access kibana</small>
</label>
<div class="form-control" disabled>{{conf.shareData().embed}}</div>
Expand All @@ -15,7 +14,6 @@
<div class="form-group">
<label>
Share a link
<kbn-clipboard copy="conf.shareData().link"></kbn-clipboard>
</label>
<div class="form-control" disabled>{{conf.shareData().link}}</div>
</div>
Expand Down
100 changes: 0 additions & 100 deletions src/ui/public/clipboard/__tests__/clipboard.js

This file was deleted.

11 changes: 0 additions & 11 deletions src/ui/public/clipboard/clipboard.html

This file was deleted.

47 changes: 0 additions & 47 deletions src/ui/public/clipboard/clipboard.js

This file was deleted.

1 change: 0 additions & 1 deletion tasks/config/licenses.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ module.exports = function (grunt) {
'[email protected]': ['Public-Domain'],
'[email protected]': ['MIT'],
'[email protected]': ['BSD'],
'[email protected]': ['MIT'],
}
}
};
Expand Down
4 changes: 0 additions & 4 deletions webpackShims/ng-clip.js

This file was deleted.

9 changes: 0 additions & 9 deletions webpackShims/zeroclipboard.js

This file was deleted.

0 comments on commit f74eafe

Please sign in to comment.