fixing a lot of plumbing code to use pure rust models
This commit is contained in:
parent
433ccf345b
commit
146f2df0c3
1 changed files with 8 additions and 8 deletions
|
@ -217,11 +217,11 @@ Controls.Page {
|
|||
|
||||
function changeServiceItem(index) {
|
||||
console.log("change-service-item: " + index);
|
||||
const item = ServiceItemC.getRust(index, ServiceItemModel);
|
||||
const item = ServiceItemModel.getItem(index);
|
||||
currentServiceItem = index;
|
||||
const slideId = SlideModel.getSlideFromService(index);
|
||||
currentSlide = slideId;
|
||||
const slide = SlideMod.getItemRust(slideId, SlideModel);
|
||||
const slide = SlideModel.getItem(slideId);
|
||||
console.log("index grabbed: " + index);
|
||||
console.log(slideId);
|
||||
console.log("Time to start changing");
|
||||
|
@ -233,8 +233,8 @@ Controls.Page {
|
|||
ServiceItemModel.activate(index);
|
||||
console.log("%%%%%%%%%");
|
||||
console.log(slideId);
|
||||
/* SlideObject.changeSlide(slide, slideId); */
|
||||
slideHelper.chngSlide(slide, slideId, SlideObject);
|
||||
SlideObject.changeSlide(slide, slideId);
|
||||
/* slideHelper.chngSlide(slide, slideId, SlideObject); */
|
||||
console.log("%%%%%%%%%");
|
||||
/* SlideObject.changeSlide(slide, slideId); */
|
||||
|
||||
|
@ -252,8 +252,8 @@ Controls.Page {
|
|||
|
||||
function changeSlide(index) {
|
||||
console.log("index grabbed: " + index);
|
||||
const currentItem = SlideMod.getItemRust(currentServiceItem, SlideModel);
|
||||
const item = SlideMod.getItemRust(index, SlideModel);
|
||||
const currentItem = SlideModel.getItem(currentServiceItem);
|
||||
const item = SlideModel.getItem(index);
|
||||
const isMoveDown = currentSlide < index;
|
||||
console.log(item + " " + currentItem);
|
||||
currentSlide = index;
|
||||
|
@ -283,8 +283,8 @@ Controls.Page {
|
|||
console.log("Time to start changing");
|
||||
|
||||
ServiceItemModel.activate(currentServiceItem);
|
||||
/* SlideObject.changeSlide(slide, slideId); */
|
||||
slideHelper.chngSlide(item, index, SlideObject);
|
||||
SlideObject.changeSlide(item, index);
|
||||
/* slideHelper.chngSlide(item, index, SlideObject); */
|
||||
/* SlideModel.activate(index); */
|
||||
presentation.textIndex = 0;
|
||||
console.log("Slide changed to: ", item.imageBackground);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue