Browse Source

colorpicker update / colorpicker form functionality minor update

razvanaldea89 6 years ago
parent
commit
ebf515264b
5 changed files with 12 additions and 7 deletions
  1. 1 1
      build/js/custom.js
  2. 0 0
      build/js/custom.min.js
  3. 2 2
      production/form.html
  4. 8 3
      production/form_advanced.html
  5. 1 1
      src/js/custom.js

+ 1 - 1
build/js/custom.js

@@ -1158,7 +1158,7 @@ function init_InputMask() {
 }
 
 function init_ColorPicker() {
-    "undefined" != typeof $.fn.colorpicker && (console.log("init_ColorPicker"), $(".demo1").colorpicker(), $(".demo2").colorpicker(), $("#demo_forceformat").colorpicker({
+    "undefined" != typeof $.fn.colorpicker && (console.log("init_ColorPicker"), $(".demo1").colorpicker(), $(".demo2").colorpicker( {format: 'auto'}), $("#demo_forceformat").colorpicker({
         format: "rgba",
         horizontal: !0
     }), $("#demo_forceformat3").colorpicker({

File diff suppressed because it is too large
+ 0 - 0
build/js/custom.min.js


+ 2 - 2
production/form.html

@@ -24,7 +24,7 @@
     <!-- Switchery -->
     <link href="../vendors/switchery/dist/switchery.min.css" rel="stylesheet">
     <!-- Colorpicker -->
-    <link href="../vendors/mjolnic-bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css" rel="stylesheet">
+    <link href="../vendors/farbelous-bootstrap-colorpicker/css/bootstrap-colorpicker.min.css" rel="stylesheet">
     <!-- starrr -->
     <link href="../vendors/starrr/dist/starrr.css" rel="stylesheet">
     <!-- bootstrap-daterangepicker -->
@@ -1663,7 +1663,7 @@
 <script src="../vendors/moment/min/moment.min.js"></script>
 <script src="../vendors/bootstrap-daterangepicker/daterangepicker.js"></script>
 <!--  Colorpicker -->
-<script src="../vendors/mjolnic-bootstrap-colorpicker/dist/js/bootstrap-colorpicker.min.js"></script>
+<script src="../vendors/farbelous-bootstrap-colorpicker/js/bootstrap-colorpicker.min.js"></script>
 <!-- bootstrap-wysiwyg -->
 <script src="../vendors/bootstrap-wysiwyg/js/bootstrap-wysiwyg.min.js"></script>
 <script src="../vendors/jquery.hotkeys/jquery.hotkeys.js"></script>

+ 8 - 3
production/form_advanced.html

@@ -24,7 +24,7 @@
     <link href="../vendors/ion.rangeSlider/css/ion.rangeSlider.css" rel="stylesheet">
     <link href="../vendors/ion.rangeSlider/css/ion.rangeSlider.skinFlat.css" rel="stylesheet">
     <!-- Bootstrap Colorpicker -->
-    <link href="../vendors/mjolnic-bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css" rel="stylesheet">
+    <link href="../vendors/farbelous-bootstrap-colorpicker/css/bootstrap-colorpicker.min.css" rel="stylesheet">
 
     <link href="../vendors/cropper/dist/cropper.min.css" rel="stylesheet">
 
@@ -476,6 +476,7 @@
                                                         </div>
                                                     </div>
                                                 </div>
+
                                                 <div class="form-group">
                                                     <div class="row">
                                                         <label class="control-label col-md-3 col-sm-3 col-12">Styled</label>
@@ -483,7 +484,11 @@
                                                             <div class="input-group demo2">
                                                                 <input type="text" value="#e01ab5"
                                                                        class="form-control"/>
-                                                                <span class="input-group-prepend input-group-text"><i></i></span>
+                                                                <span class="input-group-append">
+                                                                    <span class="input-group-text colorpicker-input-addon">
+                                                                        <i></i>
+                                                                    </span>
+                                                                </span>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -2649,7 +2654,7 @@
 <!-- Ion.RangeSlider -->
 <script src="../vendors/ion.rangeSlider/js/ion.rangeSlider.min.js"></script>
 <!-- Bootstrap Colorpicker -->
-<script src="../vendors/mjolnic-bootstrap-colorpicker/dist/js/bootstrap-colorpicker.min.js"></script>
+<script src="../vendors/farbelous-bootstrap-colorpicker/js/bootstrap-colorpicker.min.js"></script>
 <!-- jquery.inputmask -->
 <script src="../vendors/jquery.inputmask/dist/min/jquery.inputmask.bundle.min.js"></script>
 <!-- jQuery Knob -->

+ 1 - 1
src/js/custom.js

@@ -1123,7 +1123,7 @@ function init_InputMask() {
 }
 
 function init_ColorPicker() {
-    "undefined" != typeof $.fn.colorpicker && (console.log("init_ColorPicker"), $(".demo1").colorpicker(), $(".demo2").colorpicker(), $("#demo_forceformat").colorpicker({
+    "undefined" != typeof $.fn.colorpicker && (console.log("init_ColorPicker"), $(".demo1").colorpicker(), $(".demo2").colorpicker( {format: 'auto'}), $("#demo_forceformat").colorpicker({
         format: "rgba",
         horizontal: !0
     }), $("#demo_forceformat3").colorpicker({

Some files were not shown because too many files changed in this diff