Merge pull request #74 from ahasnawi/move-light-carousel

Move light carousel logic to the sdk

Author: NenoR96

control/content/index.html

@@ -12,7 +12,6 @@
   <script src="../../../../scripts/jquery/jquery-1.11.2.min.js"></script>
   <script src="../../../../scripts/buildfire.js"></script>
   <script src="../../../../scripts/sortable.min.js"></script>
-  <script src="../../../../scripts/buildfire/components/carousel/carousel.js"></script>
   <script src="../../../../scripts/angular/angular.min.js"></script>
   <script src="../../../../scripts/angular/angular-route.min.js"></script>
   <script src="../../../../scripts/buildfire/components/carouselLight/carouselLightEditor.js"></script>

widget/controllers/widget.home.controller.js

@@ -297,154 +297,33 @@
             itemListLayout: LAYOUTS.itemListLayout[0].name
           }
         };
-        var lastImage=null;
-        var changeTimer;
-
-      function shuffle(a,first,last) {
-          var j, x, i;
-          for (i = a.length - 1; i > 0; i--) {
-              j = Math.floor(Math.random() * (i + 1));
-              x = a[i];
-              a[i] = a[j];
-              a[j] = x;
-          }
-          if(last==a[0]||first==a[a.length-1]) return shuffle(a,first,last);
-          else return a;
-      }
-
-
-      function randomizeArray(sent){
-          shuffle(sent,null,null);
-          var dup=Array.from(sent);
-          shuffle(dup,null,sent[sent.length - 1]);
-          sent.push(...dup);
-          shuffle(dup,sent[0],sent[sent.length - 1]);
-          sent.push(...dup);
-      }
-
-      function changeImage(carouselImages,random){
-          var oldState=carouselImages;
-          if(random){
-              carouselImages=[carouselImages[Math.floor(Math.random() * carouselImages.length)]];
-  
-              if(carouselImages[0]!=lastImage[0]){
-                  lastImage=carouselImages;
-                  appendOneImage(carouselImages);
-              }else changeImage(oldState);
-          }else{
-              var index=carouselImages.indexOf(lastImage[0]);
-              var sendIndex=0;
-              if(index==-1||index==carouselImages.length-1)carouselImages=[carouselImages[0]];
-              else {carouselImages=[carouselImages[index+1]];sendIndex=index+1;}
-              lastImage=carouselImages;
-              var isHome=(new URLSearchParams(window.location.search).get('fid').split("=")[0]=="launcherPluginv");
-              var storagePlace=(isHome)?"carouselLastImageHome":"carouselLastImage";
-              buildfire.localStorage.setItem(storagePlace,sendIndex, function(e,r){
-                  appendOneImage(carouselImages);
-              });
-          }
-  
-      }
-      function appendOneImage(carouselImages){
-        var carouselContainer = document.getElementById("carousel");
-          var myImg=document.getElementById("one_img_home");
-          
-          if(myImg==null){
-              carouselContainer.innerHTML = '';
-              var img = document.createElement('img');
-              img.setAttribute("id", "one_img_home");
-              img.setAttribute("src", buildfire.imageLib.cropImage(carouselImages[0].iconUrl, {
-                  width: window.innerWidth,
-                  height: Math.ceil(9 * (window.innerWidth) / 16)
-              }));
-              carouselContainer.appendChild(img);
-              img.addEventListener("click", function () {
-                  buildfire.actionItems.execute(carouselImages[0], function (err, result) {
-                      if (err) {
-                          console.warn('Error openning slider action: ', err);
-                      }
-                  });
-              });
-          }else{
-              myImg.setAttribute("src", buildfire.imageLib.cropImage(carouselImages[0].iconUrl, {
-                  width: window.innerWidth,
-                  height: Math.ceil(9 * (window.innerWidth) / 16)
-              }));
-              myImg.removeEventListener("click",function(){});
-              myImg.addEventListener("click", function () {
-                  buildfire.actionItems.execute(carouselImages[0], function (err, result) {
-                      if (err) {
-                          console.warn('Error openning slider action: ', err);
-                      }
-                  });
-              });
-          }
-      }
+
       WidgetHome.renderCarousel = function(){
         carouselContainer =  document.getElementById("carousel");
-        if(changeTimer) clearInterval(changeTimer);
-          if(carouselContainer != null){
+          if (carouselContainer != null){
             if ( WidgetHome.data.content && WidgetHome.data.content.carouselImages) {
               var speed = WidgetHome.data.content.speed ? WidgetHome.data.content.speed : 5000 
               var order = WidgetHome.data.content.order ? WidgetHome.data.content.order : 0 
               var display = WidgetHome.data.content.display ? WidgetHome.data.content.display : 0 
               var carouselImages = WidgetHome.data.content.carouselImages;
-              var isHome=(new URLSearchParams(window.location.search).get('fid').split("=")[0]=="launcherPluginv");
-              var storagePlace=(isHome)?"carouselLastImageHome":"carouselLastImage";
-              if(order == 0 && display== 1 && carouselImages.length > 1){
-                buildfire.localStorage.getItem(storagePlace, function(e,r) {
-                    var images=carouselImages;
-                    var sendIndex=0;
-                    if(r==null){
-                        carouselImages=[carouselImages[0]];
-                    }else{
-                        var index=Number(r);
-                        if(index==-1||index==carouselImages.length-1)carouselImages=[carouselImages[0]];
-                        else {carouselImages=[carouselImages[index+1]];sendIndex=index+1;}
-                    }
-                    buildfire.localStorage.setItem(storagePlace,sendIndex, function(e,r){
-                            lastImage=carouselImages;
-                            if(speed!=0)changeTimer=setInterval(changeImage, speed,images,false);
-                        });
-                });
-            }
-            else if(order == 1 && display== 1 && carouselImages.length > 1){
-                if(speed!=0){
-                    changeTimer=setInterval(changeImage, speed,carouselImages,true);
-                }
-                carouselImages=[carouselImages[Math.floor(Math.random() * carouselImages.length)]];
-                lastImage=carouselImages;
-                buildfire.localStorage.removeItem(storagePlace);
-  
-            }else if(order == 1 && display== 0 && carouselImages.length > 1){
-                randomizeArray(carouselImages);
-                buildfire.localStorage.removeItem(storagePlace);
-            }
-  
-              if (carouselImages.length > 1) {
                 setTimeout(()=>{
                   WidgetHome.view = new buildfire.components.carousel.view({
                     selector: carouselContainer,
                     items: carouselImages,
-                    loop: (speed!=0),
-                    infinite:false,
-                    autoInterval:speed
+                    loop: (speed != 0),
+                    infinite: false,
+                    autoInterval: speed,
+                    order: order,
+                    display: display
                   });
-                },100)
-                
-              } else {
-                  appendOneImage(carouselImages);
-              }
-              
+                }, 100)
               carouselContainer.classList.remove('hide');
             } else {
               carouselContainer.classList.add('hide');
             }
           }
-          
         }
 
-        
         WidgetHome.init = function (cb) {
           Buildfire.spinner.show();
           var success = function (result) {

widget/index.html

@@ -6,21 +6,17 @@
   <!-- CSS -->
   <link rel="stylesheet" href="../../../styles/siteIcons.css">
   <link rel="stylesheet" href="../../../styles/helper.css">
-  <link rel="stylesheet" href="../../../scripts/owlCarousel/owlCarousel.css">
 
   <!-- <link rel="stylesheet" href="assets/css/appThemeTemp.css"> -->
 
   <!-- JS -->
-  <script src="../../../scripts/buildfire.js"></script>
-  <script src="../../../scripts/buildfire/components/toast/toast.js"></script>
   <script src="../../../scripts/_bundles/buildfire_lightcarousel.min.js"></script>
+  <script src="../../../scripts/buildfire/components/toast/toast.js"></script>
 
   <script src="../../../scripts/buildfire/services/notifications/pushNotifications.js"></script>
   <!-- Angular, jQuery & Owl Carousel-->
 
   <script src="../../../scripts/jquery/jquery-1.11.2.min.js"></script>
-  <script src="../../../scripts/smartcrop.js"></script>
-  <script src="../../../scripts/owlCarousel/owlCarousel.js"></script>
   <script src="../../../scripts/angular/angular.min.js"></script>
   <script src="../../../scripts/angular/angular-route.min.js"></script>
   <script src="../../../scripts/angular/ui-bootstrap.min.js"></script>