Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/Smarty/templates/admin/design/index.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$(function() {
var page_id = '<!--{$page_id|h}-->';
if (page_id != '1') {
$('.anywhere').attr('disabled', true);
$('.anywhere').prop('disabled', true);
$('.anywhere:checked').each(function() {
$(this).parents('.sort').children('input[type=hidden]').each(function() {
$(this).remove();
Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/admin/order/edit.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
$(document).ready(function() {
var shipping_quantity = '<!--{$tpl_shipping_quantity|escape:javascript}-->';
if (shipping_quantity > 1){
$("input[name^='quantity[']").attr("disabled","disabled");
$("input[name^='quantity[']").prop("disabled", true);
}
});

Expand Down
8 changes: 4 additions & 4 deletions data/Smarty/templates/admin/ownersstore/plugin.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
if(mode === 'disable') {
result = window.confirm('プラグインを無効にしても宜しいですか?');
if(result === false) {
$(event.target).attr("checked", "checked");
$(event.target).prop("checked", true);
}
} else if(mode === 'enable') {
result = window.confirm('プラグインを有効にしても宜しいですか?');
if(result === false) {
$(event.target).attr("checked", "");
$(event.target).prop("checked", false);
}
}
if(result === true){
Expand Down Expand Up @@ -70,8 +70,8 @@
* アップデート対象ファイル以外はPOSTされない様にdisabled属性を付与
*/
function removeUpdateFile(select_id) {
$('input[name="update_plugin_file"]').attr("disabled", "disabled");
$('input[id="' + select_id + '"]').removeAttr("disabled");
$('input[name="update_plugin_file"]').prop("disabled", true);
$('input[id="' + select_id + '"]').prop("disabled", false);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,11 @@
if(value === '0') {
result = window.confirm('無効にしても宜しいですか?');
if(result === false) {
//$(event.target).attr("checked", "checked");
event.target.value = '1';
}
} else if(value === '1') {
result = window.confirm('有効にしても宜しいですか?');
if(result === false) {
//$(event.target).attr("checked", "checked");
event.target.value = '0';
}
}
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/admin/products/product.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
// (移動元セレクトボックス)
function fnInitSelect(select) {
var selectedOptions = <!--{$tpl_json_category_id}-->;
$('#' + select + ' option').attr('selected', false);
$('#' + select + ' option').prop('selected', false);
for (var i = 0; i < selectedOptions.length; i++) {
$('#' + select + ' option[value="' + selectedOptions[i] + '"]')
.prop('selected', 'selected');
.prop('selected', true);
}
}

Expand Down
12 changes: 6 additions & 6 deletions data/Smarty/templates/admin/products/product_class.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@

// 1行目をコピーボタン
$('#copy_from_first').click(function() {
var check = $('#check_0').attr('checked');
$('input[id^=check_]').attr('checked', check);
var check = $('#check_0').prop('checked');
$('input[id^=check_]').prop('checked', check);

var product_code = $('#product_code_0').val();
$('input[id^=product_code_]').val(product_code);

var stock = $('#stock_0').val();
$('input[id^=stock_]').val(stock);

var stock_unlimited = $('#chk_stock_unlimited_0').attr('checked');
var stock_unlimited = $('#chk_stock_unlimited_0').prop('checked');
$('input[id^=chk_stock_unlimited_]').each(function() {
var checked = stock_unlimited;
var index = $(this).attr('id').replace(/^chk_stock_unlimited_/ig, '');
$(this).attr('checked', checked);
$(this).prop('checked', checked);
if (checked) {
$('#stock_' + index)
.attr('readonly', true)
Expand All @@ -90,13 +90,13 @@

var product_type_id_value = '';
$('input[id^=product_type_id_0_]').each(function() {
if ($(this).attr('checked')) {
if ($(this).prop('checked')) {
product_type_id_value = $(this).val();
}
});
$('input[id^=product_type_id_]').each(function() {
if ($(this).val() == product_type_id_value) {
$(this).attr('checked', true);
$(this).prop('checked', true);
}
});

Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/default/products/detail.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
favoriteButton.tooltip();

<!--{if $just_added_favorite == true}-->
favoriteButton.load(function(){ $(this).tooltip("open") });
favoriteButton.on('load', function(){ $(this).tooltip("open") });
$(function(){
var tid = setTimeout('favoriteButton.tooltip("close")',5000);
});
Expand Down
9 changes: 5 additions & 4 deletions data/eccube.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import $ from "jquery";
window.$ = window.jQuery = $;

// jquery-migrate は EC-CUBE 本体・同梱プラグインからは jQuery 4 ネイティブ API
// に置換済みのため不要だが、ユーザーカスタムテンプレートでレガシー API を
// 使っているケースに対する後方互換シムとして残置する。
// 警告は意図的に mute しない (deprecated API の早期発見のため)。
import "jquery-migrate";

/* 警告を無効にする */
$.migrateMute = true;

import "jquery-colorbox";
import "jquery-colorbox/example2/colorbox.css";
import "jquery-easing";
Expand Down Expand Up @@ -512,7 +513,7 @@ import "slick-carousel/slick/slick-theme.css";
.val(id || "")
.text(name);
if (id === selected_id2) {
option.attr("selected", true);
option.prop("selected", true);
}
$sele2.append(option);
}
Expand Down
2 changes: 1 addition & 1 deletion html/install/templates/step1.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $(function() {
});
function changeSmtpDisabled() {
let disabled = $('input[name=mail_backend]:checked').val() != 'smtp';
$('.smtp').attr('disabled', disabled);
$('.smtp').prop('disabled', disabled);
}
});
</script>
Expand Down
8 changes: 4 additions & 4 deletions html/js/eccube.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion html/js/eccube.css.map

Large diffs are not rendered by default.

40 changes: 21 additions & 19 deletions html/js/eccube.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions html/js/eccube.js.map

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@

// SELECT FIRST LEFT ITEM
if (!(navigator.userAgent.toLowerCase().indexOf('msie 6') != -1))
leftSel.find("option").eq(0).attr("selected", true);
leftSel.find("option").eq(0).prop("selected", true);

// ON CHANGE REFRESH ALL BUTTON STATUS
allSel.change(function() {
Expand All @@ -117,34 +117,34 @@
var selectedSx = leftSel.find("option:selected");
var selectedDx = rightSel.find("option:selected");

if (selectedSx.size() == 0 ||
(o.maxSelected >= 0 && (selectedSx.size() + selectDx.size()) > o.maxSelected))
if (selectedSx.length == 0 ||
(o.maxSelected >= 0 && (selectedSx.length + selectDx.length) > o.maxSelected))
div.find(".AddOne").addClass('ms2side__hide');
else
div.find(".AddOne").removeClass('ms2side__hide');

// FIRST HIDE ALL
div.find(".RemoveOne, .MoveUp, .MoveDown, .MoveTop, .MoveBottom, .SelSort").addClass('ms2side__hide');
if (selectDx.size() > 1)
if (selectDx.length > 1)
div.find(".SelSort").removeClass('ms2side__hide');
if (selectedDx.size() > 0) {
if (selectedDx.length > 0) {
div.find(".RemoveOne").removeClass('ms2side__hide');
// ALL SELECTED - NO MOVE
if (selectedDx.size() < selectDx.size()) { // FOR NOW (JOE) && selectedDx.size() == 1
if (selectedDx.length < selectDx.length) { // FOR NOW (JOE) && selectedDx.length == 1
if (selectedDx.val() != selectDx.val()) // FIRST OPTION, NO UP AND TOP BUTTON
div.find(".MoveUp, .MoveTop").removeClass('ms2side__hide');
if (selectedDx.last().val() != selectDx.last().val()) // LAST OPTION, NO DOWN AND BOTTOM BUTTON
div.find(".MoveDown, .MoveBottom").removeClass('ms2side__hide');
}
}

if (selectSx.size() == 0 ||
(o.maxSelected >= 0 && selectSx.size() >= o.maxSelected))
if (selectSx.length == 0 ||
(o.maxSelected >= 0 && selectSx.length >= o.maxSelected))
div.find(".AddAll").addClass('ms2side__hide');
else
div.find(".AddAll").removeClass('ms2side__hide');

if (selectDx.size() == 0)
if (selectDx.length == 0)
div.find(".RemoveAll").addClass('ms2side__hide');
else
div.find(".RemoveAll").removeClass('ms2side__hide');
Expand All @@ -154,9 +154,9 @@
leftSel.dblclick(function () {
$(this).find("option:selected").each(function(i, selected){

if (o.maxSelected < 0 || rightSel.children().size() < o.maxSelected) {
if (o.maxSelected < 0 || rightSel.children().length < o.maxSelected) {
$(this).remove().appendTo(rightSel);
el.find("[value=" + $(selected).val() + "]").attr("selected", true).remove().appendTo(el);
el.find("[value=" + $(selected).val() + "]").prop("selected", true).remove().appendTo(el);
}
});
$(this).trigger('change');
Expand All @@ -166,7 +166,7 @@
rightSel.dblclick(function () {
$(this).find("option:selected").each(function(i, selected){
$(this).remove().appendTo(leftSel);
el.find("[value=" + $(selected).val() + "]").attr("selected", false).remove().appendTo(el);
el.find("[value=" + $(selected).val() + "]").prop("selected", false).remove().appendTo(el);
});
$(this).trigger('change');
});
Expand All @@ -177,26 +177,26 @@
if ($(this).hasClass("AddOne")) {
leftSel.find("option:selected").each(function(i, selected){
$(this).remove().appendTo(rightSel);
el.find("[value=" + $(selected).val() + "]").attr("selected", true).remove().appendTo(el);
el.find("[value=" + $(selected).val() + "]").prop("selected", true).remove().appendTo(el);
});
}
else if ($(this).hasClass("AddAll")) { // ALL SELECTED
leftSel.children().appendTo(rightSel);
leftSel.children().remove();
el.find('option').attr("selected", true);
// el.children().attr("selected", true); -- PROBLEM WITH OPTGROUP
el.find('option').prop("selected", true);
// el.children().prop("selected", true); -- PROBLEM WITH OPTGROUP
}
else if ($(this).hasClass("RemoveOne")) {
rightSel.find("option:selected").each(function(i, selected){
$(this).remove().appendTo(leftSel);
el.find("[value=" + $(selected).val() + "]").attr("selected", false).remove().appendTo(el);
el.find("[value=" + $(selected).val() + "]").prop("selected", false).remove().appendTo(el);
});
}
else if ($(this).hasClass("RemoveAll")) { // ALL REMOVED
rightSel.children().appendTo(leftSel);
rightSel.children().remove();
el.find('option').attr("selected", false);
//el.children().attr("selected", false); -- PROBLEM WITH OPTGROUP
el.find('option').prop("selected", false);
//el.children().prop("selected", false); -- PROBLEM WITH OPTGROUP
}
}

Expand All @@ -220,8 +220,8 @@
el.find("option:selected").remove();
// AFTER ADD ON ORIGINAL AND RIGHT SELECT
selectDx.each(function() {
rightSel.append($(this).clone().attr("selected", true));
el.append($(this).attr("selected", true));
rightSel.append($(this).clone().prop("selected", true));
el.append($(this).prop("selected", true));
});
}
else if ($(this).hasClass("MoveUp")) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ $.fn.autoResizeTextAreaQ = function(options) {
resize(ta, orig);

// check resize on key input
ta.bind('keyup', function(e) {
ta.on('keyup', function(e) {
resize(ta, orig);
});
}); // end each()
Expand Down
10 changes: 5 additions & 5 deletions html/user_data/packages/sphone/js/jquery.biggerlink.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@
window.status = '';
$(this).removeClass(settings.hoverclass);
})
.bind('click',function(){
.on('click',function(){
$(this).find('a:first').trigger('click');
})

// triggerable events on anchor itself

.find('a').bind('focus',function(){
.find('a').on('focus',function(){
$(this).parents('.'+ settings.clickableclass).addClass(settings.hoverclass);
}).bind('blur',function(){
}).on('blur',function(){
$(this).parents('.'+ settings.clickableclass).removeClass(settings.hoverclass);
}).end()

.find('a:first').bind('click',function(e){
.find('a:first').on('click',function(e){
if(settings.follow == true)
{
window.location = this.href;
}
e.stopPropagation(); // stop event bubbling to parent
}).end()

.find('a',this).not(':first').bind('click',function(){
.find('a',this).not(':first').on('click',function(){
$(this).parents('.'+ settings.clickableclass).find('a:first').trigger('click');
return false;
});
Expand Down
Loading
Loading