fixed import bug

themexpert · Oct 13, 2015 · f36ba21 · f36ba21
1 parent cc065e2
commit f36ba21
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/app/Assets/BlocksScripts.php b/app/Assets/BlocksScripts.php
@@ -57,9 +57,8 @@ protected function enqueueBlockScripts( $block ) {
 
     $blockUrl = $block['url'];
 
-    $this->enqueueBlockCss( $block, $blockUrl );
-
     $enqueueCb( $blockUrl );
+    $this->enqueueBlockCss( $block, $blockUrl );
   }
 
   /**

diff --git a/app/Assets/Traits/FormEngineScripts.php b/app/Assets/Traits/FormEngineScripts.php
@@ -27,7 +27,6 @@ protected function formEngineScripts() {
 
     $asset->style( 'tx-colorpicker', op_asset( "assets/css/bootstrap-colorpicker.css" ) );
 
-
     if ( is_super_admin() ) {
       $asset->style( 'tx-lithium-ui', op_asset( 'assets/css/lithium-builder.css' ) );
     }

diff --git a/engine/shared/lib/transformer/controls/prepareRepeaterControl.js b/engine/shared/lib/transformer/controls/prepareRepeaterControl.js
@@ -1,4 +1,5 @@
 import prepareSimpleControl from './prepareSimpleControl.js';
+import _ from 'underscore';
 
 function prepareMergedRepeatGroups(groups, serializedGroups) {
   return groups.map(function (group, index) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,6 @@ protected function formEngineScripts() { @@
         $asset->style( 'tx-colorpicker', op_asset( "assets/css/bootstrap-colorpicker.css" ) );
         if ( is_super_admin() ) {
           $asset->style( 'tx-lithium-ui', op_asset( 'assets/css/lithium-builder.css' ) );
         }
@@ Expand Down @@