diff --git a/assets/js/index.utils.js b/assets/js/index.utils.js index 68be07e8..4c1046f2 100644 --- a/assets/js/index.utils.js +++ b/assets/js/index.utils.js @@ -2,15 +2,11 @@ * @Author: prpr * @Date: 2016-01-21 13:55:44 * @Last Modified by: prpr -* @Last Modified time: 2016-01-22 10:34:42 +* @Last Modified time: 2016-01-22 11:14:09 */ 'use strict'; -function showMsg(type, msg) { - $("[id=msg]").removeClass().addClass("alert").addClass(type).html(msg); -} - $('#login').click(function(){ $('[data-remodal-id=login-modal]').remodal().open(); }) @@ -41,11 +37,10 @@ $("body").on("click", "#login-button", function(){ // 设置长效 token （7天） docCookies.setItem("token", json.token, 604800, '/'); } - showMsg("alert-success", "Logging succeed!"); - window.setTimeout("$('[data-remodal-id=login-modal]').remodal().close(); window.location = './user/index.php'", 1000); - + showAlert("Logging succeed!"); + window.setTimeout("window.location = './user/index.php'", 1000); } else { - showMsg("alert-danger", json.msg); + showAlert(json.msg); } } }); @@ -67,10 +62,9 @@ $("body").on("click", "#register-button", function(){ }, success: function(json) { if (json.errno == 0) { - showMsg("alert-success", json.msg); - window.setTimeout("$('[data-remodal-id=register-modal]').remodal().close(); window.location = './index.php?action=login&msg=Successfully Registered, please log in.'", 1000); + showAlert(json.msg + " Please log in."); } else { - showMsg("alert-danger", json.msg); + showAlert(json.msg); } } }); diff --git a/assets/js/user.utils.js b/assets/js/user.utils.js index c54dfcb0..ffd7e1f4 100644 --- a/assets/js/user.utils.js +++ b/assets/js/user.utils.js @@ -2,135 +2,131 @@ * @Author: prpr * @Date: 2016-01-21 13:56:40 * @Last Modified by: prpr -* @Last Modified time: 2016-01-21 22:58:32 +* @Last Modified time: 2016-01-22 11:23:48 */ 'use strict'; $("body").on("change", "#skininput", function(){ - var files = $("#skininput").prop("files"); - handleFiles(files, "skin"); + var files = $("#skininput").prop("files"); + handleFiles(files, "skin"); }); $("body").on("change", "#capeinput", function(){ - var files = $("#capeinput").prop("files"); - handleFiles(files, "cape"); + var files = $("#capeinput").prop("files"); + handleFiles(files, "cape"); }); -function showMsg(type, msg) { - $("#msg").removeClass().addClass("alert").addClass(type).html(msg); -} - var handleFiles = function (files, type) { - if(files.length > 0) { - var file = files[0]; - if(file.type === 'image/png') { - var fr = new FileReader(); - fr.onload = function (e) { - var img = new Image(); - img.onload = function () { - if (type == "skin") { - MSP.changeSkin(img.src); - } else { - MSP.changeCape(img.src); - } - }; - img.onerror = function () { - alert("Error: Not an image or unknown file format"); - }; - img.src = this.result; - }; - fr.readAsDataURL(file); - } else { - alert("Error: This is not a PNG image!"); - } - } + if(files.length > 0) { + var file = files[0]; + if(file.type === 'image/png') { + var fr = new FileReader(); + fr.onload = function (e) { + var img = new Image(); + img.onload = function () { + if (type == "skin") { + MSP.changeSkin(img.src); + } else { + MSP.changeCape(img.src); + } + }; + img.onerror = function () { + showMsg("alert-danger", "Error: Not an image or unknown file format"); + }; + img.src = this.result; + }; + fr.readAsDataURL(file); + } else { + showMsg("alert-danger", "Error: This is not a PNG image!"); + } + } }; var canvas = MSP.get3dSkinCanvas(500, 500); $("#skinpreview").append($(canvas).prop("id", "canvas3d")); $("[title='Movements']").click(function(){ - if (MSP.getStatus("movements")) { - MSP.setStatus("movements", false); - } else { - MSP.setStatus("movements", true); - } + if (MSP.getStatus("movements")) { + MSP.setStatus("movements", false); + } else { + MSP.setStatus("movements", true); + } }); $("[title='Running']").click(function(){ - if (MSP.getStatus("running")) { - MSP.setStatus("running", false); - } else { - MSP.setStatus("running", true); - } + if (MSP.getStatus("running")) { + MSP.setStatus("running", false); + } else { + MSP.setStatus("running", true); + } }); $("[title='Rotation']").click(function(){ - if (MSP.getStatus("rotation")) { - MSP.setStatus("rotation", false); - } else { - MSP.setStatus("rotation", true); - } + if (MSP.getStatus("rotation")) { + MSP.setStatus("rotation", false); + } else { + MSP.setStatus("rotation", true); + } }); $("#logout").click(function(){ - $.ajax({ - type: "POST", - url: "../ajax.php?action=logout", - dataType: "json", - data: {"uname": docCookies.getItem('uname')}, - success: function(json) { - var path = "/" + document.URL.split("/").slice(-3)[0]; - docCookies.removeItem("uname", path); - docCookies.removeItem("token", path); - showMsg('alert-success', json.msg); - window.setTimeout(function(){ - window.location = "../index.php?msg=Successfully logged out."; - }, 1000); - } - }); + $.ajax({ + type: "POST", + url: "../ajax.php?action=logout", + dataType: "json", + data: {"uname": docCookies.getItem('uname')}, + success: function(json) { + var path = "/" + document.URL.split("/").slice(-3)[0]; + docCookies.removeItem("uname", path); + docCookies.removeItem("token", path); + showAlert(json.msg + " Successfully logged out."); + window.setTimeout(function(){ + window.location = "../index.php"; + }, 1000); + } + }); }); $("#upload").click(function(){ - var skin_file = $("#skininput").get(0).files[0]; - var cape_file = $("#capeinput").get(0).files[0]; + var skin_file = $("#skininput").get(0).files[0]; + var cape_file = $("#capeinput").get(0).files[0]; - var form_data = new FormData(); - if (skin_file) { - form_data.append('skin_file', skin_file); - } - if (cape_file) { - form_data.append('cape_file', cape_file); - } - form_data.append('uname', docCookies.getItem('uname')); - if (skin_file || cape_file) { - $.ajax({ - type: 'POST', - url: '../ajax.php?action=upload', - contentType: false, - dataType: "json", - data: form_data, - processData: false, - beforeSend: function() { - showMsg("alert-info", "Uploading..."); - }, - success: function(json) { - console.log(json); - if (json[0].errno == 0 && json[1].errno == 0) { - showMsg("alert-success", "Successfully uploaded."); - } - if (json[0].errno != 0) { - showMsg("alert-danger", "Error when uploading skin:\n"+json[0].msg); - } - if (json[1].errno != 0) { - showMsg("alert-danger", "Error when uploading cape:\n"+json[1].msg); - } - } - }); - } else { - showMsg("alert-warning", "No input file selected"); - } + var form_data = new FormData(); + if (skin_file) { + form_data.append('skin_file', skin_file); + } + if (cape_file) { + form_data.append('cape_file', cape_file); + } + form_data.append('uname', docCookies.getItem('uname')); + if (skin_file || cape_file) { + $.ajax({ + type: 'POST', + url: '../ajax.php?action=upload', + contentType: false, + dataType: "json", + data: form_data, + processData: false, + beforeSend: function() { + showMsg("alert-info", "Uploading..."); + }, + success: function(json) { + console.log(json); + if (json[0].errno == 0 && json[1].errno == 0) { + showMsg("alert-success", "Successfully uploaded."); + } + if (json[0].errno != 0) { + showMsg("alert-danger", "Error when uploading skin:\n"+json[0].msg); + } + if (json[1].errno != 0) { + showMsg("alert-danger", "Error when uploading cape:\n"+json[1].msg); + } + } + }); + } else { + showMsg("alert-warning", "No input file selected"); + } }); diff --git a/index.php b/index.php index 063ad4c6..db1d5560 100755 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ * @Author: printempw * @Date: 2016-01-17 13:55:20 * @Last Modified by: prpr - * @Last Modified time: 2016-01-22 10:33:36 + * @Last Modified time: 2016-01-22 11:14:35 */ session_start(); function __autoload($classname) { @@ -120,7 +120,7 @@ function getValue($key, $array) { diff --git a/libs/cookie.js b/libs/cookie.js index 2be5f14e..6aeb9b50 100644 --- a/libs/cookie.js +++ b/libs/cookie.js @@ -41,3 +41,11 @@ var docCookies = { return aKeys; } }; + +function showMsg(type, msg) { + $("[id=msg]").removeClass().addClass("alert").addClass(type).html(msg); +} + +function showAlert(msg) { + Ply.dialog("alert", msg); +} diff --git a/user/index.php b/user/index.php index cacae4fa..dbe5b2e3 100644 --- a/user/index.php +++ b/user/index.php @@ -42,6 +42,7 @@ if (isset($_SESSION['uname'])) { + @@ -156,9 +157,10 @@ if (isset($_SESSION['uname'])) { - - - + + + + getTexture('skin');