@jetbrains/ring-ui 5.0.122 → 5.0.123

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.
@@ -153,8 +153,7 @@ export default class Pager extends PureComponent {
153
153
  }
154
154
  let start = 1;
155
155
  let end = totalPages;
156
- // eslint-disable-next-line @typescript-eslint/no-magic-numbers
157
- if (totalPages >= visiblePagesLimit + 6) {
156
+ if (totalPages >= visiblePagesLimit) {
158
157
  const leftHalfFrameSize = Math.ceil(visiblePagesLimit / 2) - 1;
159
158
  const rightHalfFrameSize = visiblePagesLimit - leftHalfFrameSize - 1;
160
159
  start = currentPage - leftHalfFrameSize;
@@ -47,9 +47,9 @@ import '../loader/loader.js';
47
47
  import '../loader/loader__core.js';
48
48
  import '../_helpers/loader-screen.js';
49
49
  import './background-flow.js';
50
- import '../_helpers/link.js';
51
50
  import 'es6-error';
52
51
  import '../global/url.js';
52
+ import '../_helpers/link.js';
53
53
 
54
54
  class IFrameFlow {
55
55
  constructor(requestBuilder, storage, translations) {
@@ -54,12 +54,12 @@ import '../link/link.js';
54
54
  import '../_helpers/link.js';
55
55
  import '../group/group.js';
56
56
  import '../_helpers/group.js';
57
+ import '../global/listeners.js';
58
+ import '../global/promise-with-timeout.js';
57
59
  import '../storage/storage.js';
58
60
  import '../storage/storage__local.js';
59
61
  import '../storage/storage__fallback.js';
60
62
  import 'deep-equal';
61
- import '../global/listeners.js';
62
- import '../global/promise-with-timeout.js';
63
63
  import './request-builder.js';
64
64
  import 'simply-uuid';
65
65
  import './background-flow.js';
@@ -12,6 +12,8 @@ import '../island/adaptive-island-hoc.js';
12
12
  import '../global/linear-function.js';
13
13
  import '../_helpers/island.js';
14
14
  import '../island/header.js';
15
+ import 'element-resize-detector';
16
+ import '../global/schedule-raf.js';
15
17
  import 'react-dom';
16
18
  import '@jetbrains/icons/close';
17
19
  import '../global/get-uid.js';
@@ -36,8 +38,6 @@ import '../global/memoize.js';
36
38
  import '../link/clickableLink.js';
37
39
  import '../global/controls-height.js';
38
40
  import '../_helpers/button__classes.js';
39
- import 'element-resize-detector';
40
- import '../global/schedule-raf.js';
41
41
 
42
42
  var modules_ae521deb = {"unit":"8px","light":"light_rui_159b","dialog":"dialog_rui_159b","content":"content_rui_159b font_rui_8bff","button":"button_rui_159b","firstButton":"firstButton_rui_159b button_rui_159b","title":"title_rui_159b","logo":"logo_rui_159b","error":"error_rui_159b"};
43
43
 
@@ -1,6 +1,6 @@
1
1
  import angular from 'angular';
2
2
  import pencilIcon from '@jetbrains/icons/pencil';
3
- import MessageBundle from '../message-bundle-ng/message-bundle-ng.js';
3
+ import messageBundleNg from '../message-bundle-ng/message-bundle-ng.js';
4
4
  import alertService from '../alert-service/alert-service.js';
5
5
  import IconNG from '../icon-ng/icon-ng.js';
6
6
  import template from './avatar-editor-ng__template.js';
@@ -48,7 +48,7 @@ import '../alert/container.js';
48
48
  import '../template-ng/template-ng.js';
49
49
  import '../global/ring-angular-component.js';
50
50
 
51
- const angularModule = angular.module('Ring.avatar-editor', [MessageBundle, IconNG]);
51
+ const angularModule = angular.module('Ring.avatar-editor', [messageBundleNg, IconNG]);
52
52
 
53
53
  /**
54
54
  * @name Avatar Editor Ng
@@ -1,6 +1,6 @@
1
1
  import angular from 'angular';
2
2
  import chevronRightIcon from '@jetbrains/icons/chevron-right';
3
- import LinkNG from '../link-ng/link-ng.js';
3
+ import LinkModule from '../link-ng/link-ng.js';
4
4
  import IconNG from '../icon-ng/icon-ng.js';
5
5
  import '../_helpers/link.js';
6
6
  import '../icon/icon__constants.js';
@@ -15,7 +15,7 @@ var modules_2c17c81e = {"unit":"8px","light":"light_rui_91a4","breadcrumb":"brea
15
15
  * @name Breadcrumb Ng
16
16
  */
17
17
 
18
- const angularModule = angular.module('Ring.breadcrumb', [LinkNG, IconNG]);
18
+ const angularModule = angular.module('Ring.breadcrumb', [LinkModule, IconNG]);
19
19
  angularModule.filter('breadcrumbNgChevronIcon', () => () => chevronRightIcon);
20
20
  angularModule.directive('rgBreadcrumb', function rgBreadcrumbDirective() {
21
21
  return {
@@ -175,6 +175,6 @@ function createButtonDirective(tagName) {
175
175
  }
176
176
  angularModule.directive('rgButton', createButtonDirective('button'));
177
177
  angularModule.directive('rgButtonLink', createButtonDirective('a'));
178
- var ButtonNG = angularModule.name;
178
+ var Button = angularModule.name;
179
179
 
180
- export { LOADER_BACKGROUND_SELECTOR, ButtonNG as default };
180
+ export { LOADER_BACKGROUND_SELECTOR, Button as default };
@@ -1,6 +1,6 @@
1
1
  import angular from 'angular';
2
2
  import confirm from '../confirm-service/confirm-service.js';
3
- import MessageBundle from '../message-bundle-ng/message-bundle-ng.js';
3
+ import messageBundleNg from '../message-bundle-ng/message-bundle-ng.js';
4
4
  import 'react';
5
5
  import '../global/react-render-adapter.js';
6
6
  import 'react-dom';
@@ -49,7 +49,7 @@ import '../_helpers/panel.js';
49
49
  * @name Confirm Ng
50
50
  */
51
51
 
52
- const angularModule = angular.module('Ring.confirm', [MessageBundle]);
52
+ const angularModule = angular.module('Ring.confirm', [messageBundleNg]);
53
53
  angularModule.service('confirm', ["$q", "RingMessageBundle", function service($q, RingMessageBundle) {
54
54
  return function showConfirm(message, description, actionTitle, cancelTitle, cancelIsDefault, actionFn) {
55
55
  return $q.when(confirm({
@@ -72,6 +72,7 @@ import 'date-fns/setDay';
72
72
  import './day.js';
73
73
  import 'date-fns/getDate';
74
74
  import 'date-fns/isToday';
75
+ import 'date-fns/add';
75
76
  import './month-names.js';
76
77
  import 'date-fns/isThisMonth';
77
78
  import 'date-fns/startOfYear';
@@ -83,7 +84,6 @@ import 'date-fns/getYear';
83
84
  import 'date-fns/isThisYear';
84
85
  import 'date-fns/setYear';
85
86
  import './weekdays.js';
86
- import 'date-fns/add';
87
87
 
88
88
  const PopupComponent = _ref => {
89
89
  let {
@@ -32,7 +32,6 @@ import '../global/get-uid.js';
32
32
  import '../global/composeRefs.js';
33
33
  import '../_helpers/input.js';
34
34
  import '../input/input-label.js';
35
- import 'date-fns/add';
36
35
  import 'date-fns/addMonths';
37
36
  import 'date-fns/getDay';
38
37
  import 'date-fns/getDaysInMonth';
@@ -48,6 +47,7 @@ import 'date-fns/setDay';
48
47
  import './day.js';
49
48
  import 'date-fns/getDate';
50
49
  import 'date-fns/isToday';
50
+ import 'date-fns/add';
51
51
  import './month-names.js';
52
52
  import 'date-fns/isThisMonth';
53
53
  import 'date-fns/set';
@@ -3,8 +3,8 @@ import angular from 'angular';
3
3
  import { createFocusTrap } from 'focus-trap';
4
4
  import { getStyles, getRect } from '../global/dom.js';
5
5
  import RingAngularComponent from '../global/ring-angular-component.js';
6
- import shortcutsInstance from '../shortcuts/core.js';
7
- import ButtonNG from '../button-ng/button-ng.js';
6
+ import shortcuts from '../shortcuts/core.js';
7
+ import Button from '../button-ng/button-ng.js';
8
8
  import PromisedClick from '../promised-click-ng/promised-click-ng.js';
9
9
  import rgCompilerModuleName from '../compiler-ng/compiler-ng.js';
10
10
  import { m as modules_5e9b8c03, p as preventerFactory } from '../_helpers/dialog__body-scroll-preventer.js';
@@ -32,7 +32,7 @@ rgDialogDirective.$inject = ["$timeout"];
32
32
  * @name Dialog Ng
33
33
  */
34
34
 
35
- const angularModule = angular.module('Ring.dialog', [ButtonNG, PromisedClick, rgCompilerModuleName]);
35
+ const angularModule = angular.module('Ring.dialog', [Button, PromisedClick, rgCompilerModuleName]);
36
36
  class DialogController extends RingAngularComponent {
37
37
  constructor() {
38
38
  super(...arguments);
@@ -44,8 +44,8 @@ class DialogController extends RingAngularComponent {
44
44
  this.content = '';
45
45
  this.focusTrap.deactivate();
46
46
  Reflect.deleteProperty(this, 'DIALOG_NAMESPACE');
47
- if (shortcutsInstance.indexOfScope(this.dialogService.DIALOG_NAMESPACE) > -1) {
48
- shortcutsInstance.setScope(this.currentShortcutsScope);
47
+ if (shortcuts.indexOfScope(this.dialogService.DIALOG_NAMESPACE) > -1) {
48
+ shortcuts.setScope(this.currentShortcutsScope);
49
49
  }
50
50
  this._resetFormState();
51
51
  this.$inject.$scope.$broadcast('dialog.hide');
@@ -78,7 +78,7 @@ class DialogController extends RingAngularComponent {
78
78
  $scope.$on('$destroy', dialogService.unregister);
79
79
  $scope.$watch(() => this.active, () => {
80
80
  if (this.active) {
81
- shortcutsInstance.bindMap(this.getShortcuts(), {
81
+ shortcuts.bindMap(this.getShortcuts(), {
82
82
  scope: this.DIALOG_NAMESPACE
83
83
  });
84
84
  } else {
@@ -174,9 +174,9 @@ class DialogController extends RingAngularComponent {
174
174
  // Backward compatibility with existing templates which use data directly from scope
175
175
  $scope.data = this.data;
176
176
  }
177
- this.currentShortcutsScope = shortcutsInstance.getScope();
177
+ this.currentShortcutsScope = shortcuts.getScope();
178
178
  this.DIALOG_NAMESPACE = this.dialogService.DIALOG_NAMESPACE;
179
- shortcutsInstance.setScope(this.dialogService.DIALOG_NAMESPACE);
179
+ shortcuts.setScope(this.dialogService.DIALOG_NAMESPACE);
180
180
  this.active = true;
181
181
  $scope.$broadcast('dialog.show');
182
182
  return $q((resolve, reject) => {
@@ -1,6 +1,6 @@
1
1
  import angular from 'angular';
2
2
  import IconNG from '../icon-ng/icon-ng.js';
3
- import LinkNG from '../link-ng/link-ng.js';
3
+ import LinkModule from '../link-ng/link-ng.js';
4
4
  import { m as modules_2c5e8509 } from '../_helpers/error-message.js';
5
5
  import '../icon/icon__constants.js';
6
6
  import '../template-ng/template-ng.js';
@@ -13,7 +13,7 @@ import '../_helpers/link.js';
13
13
  * @name Error Message Ng
14
14
  */
15
15
 
16
- const angularModule = angular.module('Ring.error-message', [IconNG, LinkNG]);
16
+ const angularModule = angular.module('Ring.error-message', [IconNG, LinkModule]);
17
17
  angularModule.directive('rgErrorMessage', function rgErrorMessageDirective() {
18
18
  return {
19
19
  replace: true,
@@ -1,11 +1,11 @@
1
1
  import angular from 'angular';
2
- import MessageBundle from '../message-bundle-ng/message-bundle-ng.js';
2
+ import messageBundleNg from '../message-bundle-ng/message-bundle-ng.js';
3
3
 
4
4
  /**
5
5
  * @name Form Ng
6
6
  */
7
7
 
8
- const angularModule = angular.module('Ring.form', [MessageBundle]);
8
+ const angularModule = angular.module('Ring.form', [messageBundleNg]);
9
9
  angularModule.factory('getFormErrorMessages', ["RingMessageBundle", function getFormErrorMessagesDirective(RingMessageBundle) {
10
10
  function msg(id, formError) {
11
11
  const messageBundleId = `form_${id}`;
@@ -4,7 +4,7 @@ import classNames from 'classnames';
4
4
  import closeIcon from '@jetbrains/icons/close';
5
5
  import RingAngularComponent from '../global/ring-angular-component.js';
6
6
  import { m as modules_88cfaf40 } from '../_helpers/input.js';
7
- import ButtonNG from '../button-ng/button-ng.js';
7
+ import Button from '../button-ng/button-ng.js';
8
8
  import '../global/dom.js';
9
9
  import '../icon-ng/icon-ng.js';
10
10
  import '../icon/icon__constants.js';
@@ -16,7 +16,7 @@ import 'react';
16
16
 
17
17
  var modules_c40fa551 = {"errorText":"errorText_rui_d15a","clear":"clear_rui_d15a"};
18
18
 
19
- const angularModule = angular.module('Ring.input', [ButtonNG]);
19
+ const angularModule = angular.module('Ring.input', [Button]);
20
20
  class RingInputComponent extends RingAngularComponent {
21
21
  $onInit() {
22
22
  this.closeIcon = closeIcon;
@@ -18,6 +18,6 @@ function rgLinkDirective() {
18
18
  };
19
19
  }
20
20
  angularModule.directive('rgLink', rgLinkDirective);
21
- var LinkNG = angularModule.name;
21
+ var LinkModule = angularModule.name;
22
22
 
23
- export { LinkNG as default };
23
+ export { LinkModule as default };
@@ -63,6 +63,6 @@ function RingMessageBundle(ringI18n) {
63
63
 
64
64
  angularModule.factory('ringI18n', emptyI18n);
65
65
  angularModule.service('RingMessageBundle', ['ringI18n', RingMessageBundle]);
66
- var MessageBundle = angularModule.name;
66
+ var messageBundleNg = angularModule.name;
67
67
 
68
- export { MessageBundle as default };
68
+ export { messageBundleNg as default };
@@ -250,8 +250,7 @@ class Pager extends PureComponent {
250
250
  }
251
251
  let start = 1;
252
252
  let end = totalPages;
253
- // eslint-disable-next-line @typescript-eslint/no-magic-numbers
254
- if (totalPages >= visiblePagesLimit + 6) {
253
+ if (totalPages >= visiblePagesLimit) {
255
254
  const leftHalfFrameSize = Math.ceil(visiblePagesLimit / 2) - 1;
256
255
  const rightHalfFrameSize = visiblePagesLimit - leftHalfFrameSize - 1;
257
256
  start = currentPage - leftHalfFrameSize;
@@ -1,10 +1,10 @@
1
1
  import angular from 'angular';
2
2
  import '../loader-inline/loader-inline.js';
3
3
  import ButtonSet from '../button-set-ng/button-set-ng.js';
4
- import MessageBundle from '../message-bundle-ng/message-bundle-ng.js';
4
+ import messageBundleNg from '../message-bundle-ng/message-bundle-ng.js';
5
5
  import Form from '../form-ng/form-ng.js';
6
- import ShortcutsNg from '../shortcuts-ng/shortcuts-ng.js';
7
- import ButtonNG from '../button-ng/button-ng.js';
6
+ import Shortcuts from '../shortcuts-ng/shortcuts-ng.js';
7
+ import Button from '../button-ng/button-ng.js';
8
8
  import PromisedClick from '../promised-click-ng/promised-click-ng.js';
9
9
  import template from './save-field-ng__template.js';
10
10
  import '../_helpers/_rollupPluginBabelHelpers.js';
@@ -27,11 +27,11 @@ import '../_helpers/icon.js';
27
27
  import '../_helpers/button__classes.js';
28
28
  import '../global/controls-height.js';
29
29
 
30
- const angularModule = angular.module('Ring.save-field', [MessageBundle,
30
+ const angularModule = angular.module('Ring.save-field', [messageBundleNg,
31
31
  /**
32
32
  * for error-bubble
33
33
  */
34
- Form, ShortcutsNg, ButtonNG, ButtonSet, PromisedClick]);
34
+ Form, Shortcuts, Button, ButtonSet, PromisedClick]);
35
35
  angularModule.constant('rgSaveFieldShortcutsMode', {
36
36
  id: 'ring-save-field',
37
37
  shortcuts: [{
@@ -4,7 +4,7 @@ import React from 'react';
4
4
  import { unmountComponentAtNode, render } from '../global/react-render-adapter.js';
5
5
  import getEventKey from '../global/get-event-key.js';
6
6
  import Select, { RerenderableSelect } from '../select/select.js';
7
- import MessageBundle from '../message-bundle-ng/message-bundle-ng.js';
7
+ import messageBundleNg from '../message-bundle-ng/message-bundle-ng.js';
8
8
  import { ControlsHeight } from '../global/controls-height.js';
9
9
  import SelectNgOptions from './select-ng__options.js';
10
10
  import SelectLazy from './select-ng__lazy.js';
@@ -91,7 +91,7 @@ const DIALOG_NG_SELECTOR = '[data-anchor=dialog-container][data-in-sidebar=false
91
91
  * @name Select Ng
92
92
  */
93
93
 
94
- const angularModule = angular.module('Ring.select', [SelectNgOptions, MessageBundle]);
94
+ const angularModule = angular.module('Ring.select', [SelectNgOptions, messageBundleNg]);
95
95
  angularModule.directive('rgSelect', function rgSelectDirective() {
96
96
  const types = {
97
97
  input: Select.Type.INPUT,
@@ -193,6 +193,6 @@ class Shortcuts {
193
193
  this.combokeys.reset();
194
194
  }
195
195
  }
196
- var shortcutsInstance = new Shortcuts();
196
+ var shortcuts = new Shortcuts();
197
197
 
198
- export { shortcutsInstance as default };
198
+ export { shortcuts as default };
@@ -1,7 +1,7 @@
1
1
  import { _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
2
2
  import { PureComponent } from 'react';
3
3
  import PropTypes from 'prop-types';
4
- import shortcutsInstance from './core.js';
4
+ import shortcuts from './core.js';
5
5
  import 'combokeys';
6
6
  import '../global/sniffer.js';
7
7
  import 'sniffr';
@@ -24,7 +24,7 @@ class Shortcuts extends PureComponent {
24
24
  this.turnShorcutsOn();
25
25
  }
26
26
  if (prevProps.map !== map) {
27
- shortcutsInstance.bindMap(map, this.props);
27
+ shortcuts.bindMap(map, this.props);
28
28
  }
29
29
  }
30
30
  componentWillUnmount() {
@@ -38,15 +38,15 @@ class Shortcuts extends PureComponent {
38
38
  scope,
39
39
  options
40
40
  } = this.props;
41
- shortcutsInstance.bindMap(map, this.props);
42
- shortcutsInstance.pushScope(scope, options);
41
+ shortcuts.bindMap(map, this.props);
42
+ shortcuts.pushScope(scope, options);
43
43
  }
44
44
  turnShorcutsOff() {
45
45
  const {
46
46
  scope
47
47
  } = this.props;
48
- shortcutsInstance.unbindScope(scope);
49
- shortcutsInstance.spliceScope(scope);
48
+ shortcuts.unbindScope(scope);
49
+ shortcuts.spliceScope(scope);
50
50
  }
51
51
  render() {
52
52
  return this.props.children || null;
@@ -2,7 +2,7 @@ import angular from 'angular';
2
2
  import searchIcon from '@jetbrains/icons/search';
3
3
  import RingAngularComponent from '../global/ring-angular-component.js';
4
4
  import DialogNg from '../dialog-ng/dialog-ng.js';
5
- import ShortcutsNg from '../shortcuts-ng/shortcuts-ng.js';
5
+ import Shortcuts from '../shortcuts-ng/shortcuts-ng.js';
6
6
  import RingTemplateNg from '../template-ng/template-ng.js';
7
7
  import IconNG from '../icon-ng/icon-ng.js';
8
8
  import InputNg from '../input-ng/input-ng.js';
@@ -35,7 +35,7 @@ import '../_helpers/input.js';
35
35
  * @name Shortcuts Ng Hint Popup
36
36
  */
37
37
 
38
- const angularModule = angular.module('Ring.shortcuts.hint-popup', [DialogNg, ShortcutsNg, IconNG, InputNg, RingTemplateNg]);
38
+ const angularModule = angular.module('Ring.shortcuts.hint-popup', [DialogNg, Shortcuts, IconNG, InputNg, RingTemplateNg]);
39
39
  const getTitle = title => typeof title === 'function' ? title() : title;
40
40
  class HintPopupService extends RingAngularComponent {
41
41
  show() {
@@ -1,6 +1,6 @@
1
1
  import angular from 'angular';
2
2
  import { getStyles } from '../global/dom.js';
3
- import shortcutsInstance from '../shortcuts/core.js';
3
+ import shortcuts from '../shortcuts/core.js';
4
4
  import '../_helpers/_rollupPluginBabelHelpers.js';
5
5
  import 'combokeys';
6
6
  import '../global/sniffer.js';
@@ -39,7 +39,7 @@ angularModule.provider('shortcuts', function provider() {
39
39
  if (!angular.isFunction(handlers[key.action])) {
40
40
  return;
41
41
  }
42
- shortcutsInstance.bind({
42
+ shortcuts.bind({
43
43
  key: key.key,
44
44
  scope: scope || name,
45
45
  handler: function () {
@@ -58,21 +58,21 @@ angularModule.provider('shortcuts', function provider() {
58
58
  const actions = modes[mode];
59
59
  for (let i = actions.length - 1; i >= 0; i--) {
60
60
  if (actions[i].action === action) {
61
- return shortcutsInstance.trigger(actions[i].key[0] || actions[i].key);
61
+ return shortcuts.trigger(actions[i].key[0] || actions[i].key);
62
62
  }
63
63
  }
64
64
  return undefined;
65
65
  },
66
66
  isMainMode: name => mainModes[name],
67
67
  getRegisteredShortcuts: () => reference,
68
- shortcuts: shortcutsInstance
68
+ shortcuts: shortcuts
69
69
  };
70
70
  }];
71
71
  });
72
72
  angularModule.directive('rgShortcutsApp', function rgShortcutsAppDirective() {
73
73
  return {
74
74
  restrict: 'A',
75
- controller: ["$scope", "$rootScope", "$attrs", "shortcuts", function controller($scope, $rootScope, $attrs, shortcuts) {
75
+ controller: ["$scope", "$rootScope", "$attrs", "shortcuts", function controller($scope, $rootScope, $attrs, shortcuts$1) {
76
76
  $scope.zones = [];
77
77
  $scope.loop = 'shortcutsLoop' in $attrs;
78
78
  function getNext(current, back) {
@@ -104,13 +104,13 @@ angularModule.directive('rgShortcutsApp', function rgShortcutsAppDirective() {
104
104
  return;
105
105
  }
106
106
  if ($scope.current) {
107
- shortcutsInstance.spliceScope($scope.current.scope);
107
+ shortcuts.spliceScope($scope.current.scope);
108
108
  this.deselect();
109
109
  }
110
110
  if (!next) {
111
111
  return;
112
112
  }
113
- shortcutsInstance.pushScope(next.scope);
113
+ shortcuts.pushScope(next.scope);
114
114
  $scope.current = next;
115
115
  };
116
116
  this.route = (action, e, combo, mode) => {
@@ -122,12 +122,12 @@ angularModule.directive('rgShortcutsApp', function rgShortcutsAppDirective() {
122
122
  }
123
123
 
124
124
  // Reset current zone if it's not equal to the current scope
125
- if ($scope.current && $scope.current.scope !== shortcutsInstance.getScope().pop().scopeId) {
125
+ if ($scope.current && $scope.current.scope !== shortcuts.getScope().pop().scopeId) {
126
126
  this.deselect();
127
127
  }
128
128
  if (action === 'main') {
129
129
  $scope.zones.forEach((zone, index) => {
130
- if (shortcuts.isMainMode(zone.name)) {
130
+ if (shortcuts$1.isMainMode(zone.name)) {
131
131
  next = $scope.zones[index];
132
132
  }
133
133
  });
@@ -138,12 +138,12 @@ angularModule.directive('rgShortcutsApp', function rgShortcutsAppDirective() {
138
138
  // Select next zone and trigger same combo there
139
139
  if (next) {
140
140
  this.select(next);
141
- if (shortcutsInstance.hasKey(combo, next.scope)) {
142
- shortcutsInstance.trigger(combo);
141
+ if (shortcuts.hasKey(combo, next.scope)) {
142
+ shortcuts.trigger(combo);
143
143
  }
144
144
  // Otherwise go back
145
145
  } else {
146
- shortcuts.triggerAction(mode, action === 'next' ? 'prev' : 'next');
146
+ shortcuts$1.triggerAction(mode, action === 'next' ? 'prev' : 'next');
147
147
  }
148
148
  return false;
149
149
  };
@@ -155,13 +155,13 @@ angularModule.directive('rgShortcutsApp', function rgShortcutsAppDirective() {
155
155
  $scope.zones.sort((a, b) => a.order - b.order);
156
156
  };
157
157
  this.setup = (zone, keys) => {
158
- shortcuts.bind(zone.name, keys, zone.scope);
158
+ shortcuts$1.bind(zone.name, keys, zone.scope);
159
159
  $scope.zones.push(zone);
160
160
  this.sort();
161
161
  };
162
162
  this.destroy = zone => {
163
- shortcutsInstance.spliceScope(zone.scope);
164
- shortcutsInstance.unbindScope(zone.scope);
163
+ shortcuts.spliceScope(zone.scope);
164
+ shortcuts.unbindScope(zone.scope);
165
165
  const position = $scope.zones.indexOf(zone);
166
166
  if (position !== -1) {
167
167
  $scope.zones.splice(position, 1);
@@ -174,8 +174,8 @@ angularModule.directive('rgShortcutsApp', function rgShortcutsAppDirective() {
174
174
  prev: this.route.bind(this, 'prev'),
175
175
  main: this.route.bind(this, 'main')
176
176
  };
177
- shortcuts.bind('ring-shortcuts', keyMap);
178
- shortcutsInstance.pushScope('ring-shortcuts');
177
+ shortcuts$1.bind('ring-shortcuts', keyMap);
178
+ shortcuts.pushScope('ring-shortcuts');
179
179
  }]
180
180
  };
181
181
  });
@@ -209,23 +209,23 @@ angularModule.directive('rgShortcuts', ["$parse", function rgShortcutsDirective(
209
209
  }
210
210
  };
211
211
  }]);
212
- angularModule.directive('rgShortcutsGlobal', ["shortcuts", function rgShortcutsGlobalDirective(shortcuts) {
212
+ angularModule.directive('rgShortcutsGlobal', ["shortcuts", function rgShortcutsGlobalDirective(shortcuts$1) {
213
213
  return {
214
214
  restrict: 'A',
215
215
  link: function link($scope, iElement, iAttrs) {
216
216
  const name = iAttrs.rgShortcutsGlobal;
217
217
  const scope = `${name}-${$scope.$id}`;
218
218
  $scope.$evalAsync(() => {
219
- shortcuts.bind(name, $scope.$eval(iAttrs.shortcutsMap), scope);
220
- shortcutsInstance.pushScope(scope);
219
+ shortcuts$1.bind(name, $scope.$eval(iAttrs.shortcutsMap), scope);
220
+ shortcuts.pushScope(scope);
221
221
  });
222
222
  $scope.$on('$destroy', () => {
223
- shortcutsInstance.spliceScope(scope);
224
- shortcutsInstance.unbindScope(scope);
223
+ shortcuts.spliceScope(scope);
224
+ shortcuts.unbindScope(scope);
225
225
  });
226
226
  }
227
227
  };
228
228
  }]);
229
- var ShortcutsNg = angularModule.name;
229
+ var Shortcuts = angularModule.name;
230
230
 
231
- export { ShortcutsNg as default };
231
+ export { Shortcuts as default };
@@ -4,7 +4,7 @@ import chevronLeftIcon from '@jetbrains/icons/chevron-left';
4
4
  import PlaceUnder from '../place-under-ng/place-under-ng.js';
5
5
  import IconNG from '../icon-ng/icon-ng.js';
6
6
  import RingAngularComponent from '../global/ring-angular-component.js';
7
- import ButtonNG from '../button-ng/button-ng.js';
7
+ import Button from '../button-ng/button-ng.js';
8
8
  import template from './sidebar-ng__template.js';
9
9
  import buttonTemplate from './sidebar-ng__button-template.js';
10
10
  import 'just-debounce-it';
@@ -23,7 +23,7 @@ import 'react';
23
23
  * @name Sidebar Ng
24
24
  */
25
25
 
26
- const angularModule = angular.module('Ring.sidebar', [PlaceUnder, IconNG, ButtonNG]);
26
+ const angularModule = angular.module('Ring.sidebar', [PlaceUnder, IconNG, Button]);
27
27
  class SidebarController extends RingAngularComponent {
28
28
  constructor() {
29
29
  super(...arguments);