From 90af85d00f92659a10ebce1947fad9278d64ed0a Mon Sep 17 00:00:00 2001 From: printempw Date: Fri, 16 Feb 2018 20:15:26 +0800 Subject: [PATCH] Fix using JavaScript protocol in a.href --- resources/assets/src/js/__tests__/skinlib.test.js | 8 ++++---- resources/assets/src/js/skinlib/operations.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/assets/src/js/__tests__/skinlib.test.js b/resources/assets/src/js/__tests__/skinlib.test.js index 3c29e767..7e09eca1 100644 --- a/resources/assets/src/js/__tests__/skinlib.test.js +++ b/resources/assets/src/js/__tests__/skinlib.test.js @@ -513,18 +513,18 @@ describe('tests for "operations" module', () => { const updateTextureStatus = require(modulePath).updateTextureStatus; updateTextureStatus(1, 'add'); - expect($('a[tid=1]').attr('href')).toBe('javascript:removeFromCloset(1);'); + expect($('a[tid=1]').attr('onclick')).toBe('removeFromCloset(1);'); expect($('a[tid=1]').attr('title')).toBe('skinlib.removeFromCloset'); expect($('a[tid=1]').hasClass('liked')).toBe(true); - expect($('#1').attr('href')).toBe('javascript:removeFromCloset(1);'); + expect($('#1').attr('onclick')).toBe('removeFromCloset(1);'); expect($('#1').html()).toBe('skinlib.removeFromCloset'); expect($('div').html()).toBe('6'); updateTextureStatus(1, 'remove'); - expect($('a[tid=1]').attr('href')).toBe('javascript:addToCloset(1);'); + expect($('a[tid=1]').attr('onclick')).toBe('addToCloset(1);'); expect($('a[tid=1]').attr('title')).toBe('skinlib.addToCloset'); expect($('a[tid=1]').hasClass('liked')).toBe(false); - expect($('#1').attr('href')).toBe('javascript:addToCloset(1);'); + expect($('#1').attr('onclick')).toBe('addToCloset(1);'); expect($('#1').html()).toBe('skinlib.addToCloset'); expect($('div').html()).toBe('5'); }); diff --git a/resources/assets/src/js/skinlib/operations.js b/resources/assets/src/js/skinlib/operations.js index 06c6b92d..dc4c962f 100644 --- a/resources/assets/src/js/skinlib/operations.js +++ b/resources/assets/src/js/skinlib/operations.js @@ -142,11 +142,11 @@ function updateTextureStatus(tid, action) { action = (action === 'add') ? 'removeFromCloset' : 'addToCloset'; $(`a[tid=${tid}]`) - .attr('href', `javascript:${action}(${tid});`) + .attr('onclick', `${action}(${tid});`) .attr('title', trans(`skinlib.${action}`)) .toggleClass('liked'); $(`#${tid}`) - .attr('href', `javascript:${action}(${tid});`) + .attr('onclick', `${action}(${tid});`) .html(trans(`skinlib.${action}`)); $('#likes').html(likes); }