diff --git a/assets/js/user.utils.js b/assets/js/user.utils.js index 1e88b1f6..d76bb66b 100644 --- a/assets/js/user.utils.js +++ b/assets/js/user.utils.js @@ -2,7 +2,7 @@ * @Author: prpr * @Date: 2016-01-21 13:56:40 * @Last Modified by: prpr -* @Last Modified time: 2016-02-05 11:16:43 +* @Last Modified time: 2016-02-05 11:38:39 */ 'use strict'; @@ -17,7 +17,7 @@ $("body").on("change", "#capeinput", function(){ handleFiles(files, "cape"); }); -var handleFiles = function (files, type) { +function handleFiles(files, type) { if(files.length > 0) { var file = files[0]; if(file.type === 'image/png') { @@ -43,7 +43,7 @@ var handleFiles = function (files, type) { } }; -function initCanvas() { +function init3dCanvas() { if ($(window).width() < 800) { var canvas = MSP.get3dSkinCanvas($('#skinpreview').width(), $('#skinpreview').width()); $("#skinpreview").append($(canvas).prop("id", "canvas3d")); @@ -52,9 +52,13 @@ function initCanvas() { $("#skinpreview").append($(canvas).prop("id", "canvas3d")); } } +$(document).ready(function(){ + init3dCanvas(); +}); -initCanvas(); -$(window).resize(function(){ initCanvas(); }); +$(window).resize(function(){ + init3dCanvas(); +}); $("[title='Movements']").click(function(){ MSP.setStatus("movements", !MSP.getStatus("movements")); @@ -68,6 +72,11 @@ $("[title='Rotation']").click(function(){ MSP.setStatus("rotation", !MSP.getStatus("rotation")); }); +function show2dPreview() { + $('#canvas3d').remove(); + $("#skinpreview").html($('

Skin for Steve model:

').append($('').css('float', 'right').attr('src', '../skin/admin.png'))); +} + $("#upload").click(function(){ var skin_file = $("#skininput").get(0).files[0]; var cape_file = $("#capeinput").get(0).files[0]; diff --git a/user/index.php b/user/index.php index 0f089885..00906d2f 100644 --- a/user/index.php +++ b/user/index.php @@ -84,7 +84,7 @@ if (isset($_SESSION['uname'])) {
-
3D Preview +
Preview