webmaster/crewsportswear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update_5_2_2019

Browse Source
This commit is contained in:
Frank John Begornia
2019-05-02 22:45:44 +08:00
parent c982366dbd
commit c39fb0a2a4
10 changed files with 114 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
resources/views/designer/designer.blade.php
View File

@@ -387,7 +387,20 @@
<hr style="margin-top: 10px; margin-bottom: 1px;">
</div>
</div>
<h4>Trim {{ $i }}</h4>
@if($template->Type == "Shirts")
@if($i == 1)
<h4>Neck Line</h4>
@endif
@if($i == 2)
<h4>Sleeves</h4>
@endif
@else
<h4>Trim {{ $i }}</h4>
@endif
<ul class="nav nav-pills nav-stacked col-md-4">
<li class="active"><a href="#tab_trim_basecolor{{ $i }}" data-toggle="pill">Base Color</a></li>
<li><a href="#tab_trimpattern{{ $i }}" data-toggle="pill">Pattern</a></li>
@@ -1476,7 +1489,7 @@
canvas = window[$(this).attr('data-canvas-id')];
canvasID = $(this).attr('data-canvas-id');
canvas.calcOffset();
initCanvas();
// initCanvas();
});
//trigger enter ######################################################################
@@ -1738,14 +1751,14 @@
var fontprop = getFontDisplay(obj.fontFamily);
console.log(fontprop)
// $('.btn-show-fonts').html(fontprop.fontNameDisplay);
// $('.btn-show-fonts').css('font-family', obj.fontFamily);
// $('.btn-show-fonts').attr('data-font-size', fontprop.additionalSize);
// $(".text-font-size").val((obj.fontSize / $(".btn-show-fonts").attr('data-font-size')).toFixed(2));
$('.btn-show-fonts').html(fontprop.fontNameDisplay);
$('.btn-show-fonts').css('font-family', obj.fontFamily);
$('.btn-show-fonts').attr('data-font-size', fontprop.additionalSize);
$(".text-font-size").val((obj.fontSize / $(".btn-show-fonts").attr('data-font-size')).toFixed(2));
$('#reverse').prop('checked', obj.get('reverse'));
$('#radius').val(obj.get('radius'));
$('#spacing').val(obj.get('spacing'));
// $('#reverse').prop('checked', obj.get('reverse'));
// $('#radius').val(obj.get('radius'));
// $('#spacing').val(obj.get('spacing'));
//$('#fill').val(obj.getFill());
//$('#effect').val(obj.getEffect());
@@ -1797,6 +1810,7 @@
}
setTimeout(function() {
// event.preventDefault();
getClipartProperties(arrayPathId, randomNumbers);
}, 500);
@@ -2999,7 +3013,7 @@
}
function getClipartProperties(arrayPathId, randomNumbers) {
// console.log(arrayPathId);
console.log(arrayPathId);
$.ajax({ //create an ajax request to load_page.php
type: "POST",