Skip to content

Commit c51abc9

Browse files
committed
Move mpve function to be on ManageIQ instead of global
1 parent 0f8c328 commit c51abc9

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

app/assets/javascripts/components/generic_object/assign-buttons.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ ManageIQ.angular.app.component('assignButtons', {
1414
templateUrl: '/static/generic_object/assign-buttons.html.haml',
1515
});
1616

17-
18-
// move comes from app/javascript/helpers/move.js
1917
function assignButtonsController() {
2018
var vm = this;
2119

@@ -25,7 +23,7 @@ function assignButtonsController() {
2523
};
2624

2725
vm.leftButtonClicked = function() {
28-
var ret = move.between({
26+
var ret = ManageIQ.move.between({
2927
from: [].concat(vm.assignedButtons),
3028
to: [].concat(vm.unassignedButtons),
3129
selected: vm.model.selectedAssignedButtons,
@@ -35,7 +33,7 @@ function assignButtonsController() {
3533
};
3634

3735
vm.rightButtonClicked = function() {
38-
var ret = move.between({
36+
var ret = ManageIQ.move.between({
3937
from: [].concat(vm.unassignedButtons),
4038
to: [].concat(vm.assignedButtons),
4139
selected: vm.model.selectedUnassignedButtons,
@@ -55,9 +53,9 @@ function assignButtonsController() {
5553
};
5654
}
5755

58-
vm.topButtonClicked = wrap(move.top);
59-
vm.bottomButtonClicked = wrap(move.bottom);
56+
vm.topButtonClicked = wrap(ManageIQ.move.top);
57+
vm.bottomButtonClicked = wrap(ManageIQ.move.bottom);
6058

61-
vm.upButtonClicked = wrap(move.up);
62-
vm.downButtonClicked = wrap(move.down);
59+
vm.upButtonClicked = wrap(ManageIQ.move.up);
60+
vm.downButtonClicked = wrap(ManageIQ.move.down);
6361
}

app/assets/javascripts/miq_global.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ if (!window.ManageIQ) {
5252
x: null, // mouse X coordinate for popup menu
5353
y: null, // mouse Y coordinate for popup menu
5454
},
55+
move: { //methods to move elements between Arrays or in an Array
56+
},
5557
noCollapseEvent: false, // enable/disable events fired after collapsing an accordion
5658
observe: { // keeping track of data-miq_observe requests
5759
processing: false, // is a request currently being processed?

app/javascript/packs/application-common.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,6 @@ window.Spinner = Spinner;
6161

6262
// Overview > Optimization
6363
miqOptimizationInit();
64+
65+
import * as move from '../helpers/move.js';
66+
ManageIQ.move = move;

app/javascript/packs/globals.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,3 @@ require('codemirror/mode/xml/xml.js');
5757
require('codemirror/mode/yaml/yaml.js');
5858
require('codemirror/lib/codemirror.css');
5959
require('codemirror/theme/eclipse.css');
60-
import * as move from '../helpers/move.js';
61-
window.move = move;

0 commit comments

Comments
 (0)