Completed
Pull Request — 2.0 (#106)
by Jason
05:17
created
code/FlexSlider.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
     public function getCustomScript()
124 124
     {
125 125
         // Flexslider options
126
-        $sync = ($this->owner->ThumbnailNav == true) ? "sync: '.carousel:eq('+index+')'," : '';
126
+        $sync = ($this->owner->ThumbnailNav==true) ? "sync: '.carousel:eq('+index+')'," : '';
127 127
 
128 128
         $before = (method_exists($this->owner->ClassName, 'flexSliderBeforeAction'))
129 129
             ? $this->owner->flexSliderBeforeAction()
@@ -144,18 +144,18 @@  discard block
 block discarded – undo
144 144
 					 
145 145
                          if(jQuery('.carousel').eq(index).length) {
146 146
                              jQuery('.carousel').eq(index).flexslider({
147
-                                slideshow: " . $this->owner->obj('Animate')->NiceAsBoolean() . ",
148
-                                animation: '" . $this->owner->Animation . "',
149
-                                animationLoop: " . $this->owner->obj('Loop')->NiceAsBoolean() . ",
150
-                                controlNav: " . $this->owner->obj('CarouselControlNav')->NiceAsBoolean() . ", 
151
-                                directionNav: " . $this->owner->obj('CarouselDirectionNav')->NiceAsBoolean() . ",
147
+                                slideshow: " . $this->owner->obj('Animate')->NiceAsBoolean().",
148
+                                animation: '" . $this->owner->Animation."',
149
+                                animationLoop: " . $this->owner->obj('Loop')->NiceAsBoolean().",
150
+                                controlNav: " . $this->owner->obj('CarouselControlNav')->NiceAsBoolean().", 
151
+                                directionNav: " . $this->owner->obj('CarouselDirectionNav')->NiceAsBoolean().",
152 152
                                 prevText: '',
153 153
                                 nextText: '',
154 154
                                 pausePlay: false,
155 155
                                 asNavFor: '.flexslider:eq('+index+')',
156
-                                minItems: " . $this->owner->obj('CarouselThumbnailCt') . ",
157
-                                maxItems: " . $this->owner->obj('CarouselThumbnailCt') . ",
158
-                                move: " . $this->owner->obj('CarouselThumbnailCt') . ",
156
+                                minItems: " . $this->owner->obj('CarouselThumbnailCt').",
157
+                                maxItems: " . $this->owner->obj('CarouselThumbnailCt').",
158
+                                move: " . $this->owner->obj('CarouselThumbnailCt').",
159 159
                                 itemWidth: 100,
160 160
                                 itemMargin: 10
161 161
                               });
@@ -163,22 +163,22 @@  discard block
 block discarded – undo
163 163
  
164 164
                         if(jQuery('.flexslider').eq(index).length){
165 165
                             jQuery('.flexslider').eq(index).flexslider({
166
-                                slideshow: " . $this->owner->obj('Animate')->NiceAsBoolean() . ",
167
-                                animation: '" . $this->owner->Animation . "',
168
-                                animationLoop: " . $this->owner->obj('Loop')->NiceAsBoolean() . ",
169
-                                controlNav: " . $this->owner->obj('SliderControlNav')->NiceAsBoolean() . ",
170
-                                directionNav: " . $this->owner->obj('SliderDirectionNav')->NiceAsBoolean() . ",
166
+                                slideshow: " . $this->owner->obj('Animate')->NiceAsBoolean().",
167
+                                animation: '" . $this->owner->Animation."',
168
+                                animationLoop: " . $this->owner->obj('Loop')->NiceAsBoolean().",
169
+                                controlNav: " . $this->owner->obj('SliderControlNav')->NiceAsBoolean().",
170
+                                directionNav: " . $this->owner->obj('SliderDirectionNav')->NiceAsBoolean().",
171 171
                                 prevText: '',
172 172
                                 nextText: '',
173 173
                                 pauseOnAction: true,
174 174
                                 pauseOnHover: true,
175
-                                " . $sync . "
175
+                                " . $sync."
176 176
                                 start: function(slider){
177 177
                                   $('body').removeClass('loading');
178 178
                                 },
179
-                                before: " . $before . ',
180
-                                after: ' . $after . ',
181
-                                slideshowSpeed: ' . $speed . ' 
179
+                                before: " . $before.',
180
+                                after: ' . $after.',
181
+                                slideshowSpeed: ' . $speed.' 
182 182
                             });
183 183
                         }
184 184
                     })
Please login to merge, or discard this patch.
code/SlidePublishTask.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
         $slides = SlideImage::get();
30 30
         $ct = 0;
31 31
         foreach ($slides as $slide) {
32
-            if ($slide->ShowSlide == 1) {
32
+            if ($slide->ShowSlide==1) {
33 33
                 $title = $slide->Title;
34 34
                 $slide->writeToStage('Stage');
35 35
                 $slide->publish('Stage', 'Live');
Please login to merge, or discard this patch.