TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(protocolEngine) Stop adding Array.prototype.move, since it is interfering with other code

Browse Source
This commit is contained in:
Erik Ziegler 2018-05-22 10:32:54 +02:00
parent 847e693a2f
commit 5b4550edb2
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Packages/ohif-hanging-protocols/client/components/stageSortable/stageSortable.js
View File

@ -6,18 +6,17 @@ import { OHIF } from 'meteor/ohif:core';
import 'meteor/ohif:viewerbase'; import 'meteor/ohif:viewerbase';
/** /**
* Extend the Array prototype with a Swap function * Add an array index swapping function so we can swap stages more easily
* so we can swap stages more easily
*/ */
Array.prototype.move = function(oldIndex, newIndex) { move = function(array, oldIndex, newIndex) {
var value = this[oldIndex]; var value = array[oldIndex];
newIndex = Math.max(0, newIndex); newIndex = Math.max(0, newIndex);
newIndex = Math.min(this.length, newIndex); newIndex = Math.min(array.length, newIndex);
this.splice(oldIndex, 1); array.splice(oldIndex, 1);
this.splice(newIndex, 0, value); array.splice(newIndex, 0, value);
return this; return array;
}; };
/** /**
@ -227,7 +226,7 @@ Template.stageSortable.events({
// Swap the stages in the current Protocol's display set sequence // Swap the stages in the current Protocol's display set sequence
// using our addition to the Array prototype // using our addition to the Array prototype
ProtocolEngine.protocol.stages = ProtocolEngine.protocol.stages.move(oldIndex, newIndex); ProtocolEngine.protocol.stages = move(ProtocolEngine.protocol.stages, oldIndex, newIndex);
// If the currently displayed stage was reordered into a new position, // If the currently displayed stage was reordered into a new position,
// update the value for the stage index in the displayed Protocol // update the value for the stage index in the displayed Protocol
@ -247,7 +246,7 @@ Template.stageSortable.events({
// Swap the stages in the current Protocol's display set sequence // Swap the stages in the current Protocol's display set sequence
// using our addition to the Array prototype // using our addition to the Array prototype
ProtocolEngine.protocol.stages = ProtocolEngine.protocol.stages.move(oldIndex, newIndex); ProtocolEngine.protocol.stages = move(ProtocolEngine.protocol.stages.move, oldIndex, newIndex);
// If the currently displayed stage was reordered into a new position, // If the currently displayed stage was reordered into a new position,
// update the value for the stage index in the displayed Protocol // update the value for the stage index in the displayed Protocol