1
0
Fork 0
mirror of https://github.com/Oreolek/undum.git synced 2024-05-03 17:49:21 +03:00

Merge pull request #34 from TranquilMarmot/master

Upgrade to jQuery 2.1.3
This commit is contained in:
Ian Millington 2015-01-19 21:47:29 +00:00
commit c3a1266e47
6 changed files with 12 additions and 12 deletions

File diff suppressed because one or more lines are too long

4
games/media/js/jquery-2.1.3.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -885,7 +885,7 @@
// Add the data block, if we need it.
var qualityBlock = $("#q_"+quality);
if (qualityBlock.size() <= 0) {
if (qualityBlock.length <= 0) {
if (newDisplay === null) return;
qualityBlock = addQualityBlock(quality).hide().fadeIn(500);
} else {
@ -898,7 +898,7 @@
// it is the last quality in the group.
var toRemove = null;
var groupBlock = qualityBlock.parents('.quality_group');
if (groupBlock.find('.quality').size() <= 1) {
if (groupBlock.find('.quality').length <= 1) {
toRemove = groupBlock;
} else {
toRemove = qualityBlock;
@ -1336,7 +1336,7 @@
/* Fades in and out a highlight on the given element. */
var showHighlight = function(domElement) {
var highlight = domElement.find(".highlight");
if (highlight.size() <= 0) {
if (highlight.length <= 0) {
highlight = $('<div>').addClass('highlight');
domElement.append(highlight);
}
@ -1353,7 +1353,7 @@
var insertAtCorrectPosition = function(parent, newItem) {
var newPriority = newItem.attr('data-priority');
var children = parent.children();
for (var i = 0; i < children.size(); i++) {
for (var i = 0; i < children.length; i++) {
var child = children.eq(i);
if (newPriority < child.attr('data-priority')) {
child.before(newItem);
@ -1426,7 +1426,7 @@
var group = game.qualityGroups[groupId];
assert(group, "no_group_definition".l({id: groupId}));
groupBlock = $("#g_"+groupId);
if (groupBlock.size() <= 0) {
if (groupBlock.length <= 0) {
groupBlock = addGroupBlock(groupId);
}
}

View file

@ -199,7 +199,7 @@
</div>
<!-- Diese Anweisungen laden die noetigen Javascript-Bibliotheken -->
<script type="text/javascript" src="media/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="media/js/jquery-2.1.3.min.js"></script>
<script type="text/javascript" src="media/js/undum.js"></script>
<script type="text/javascript" src="media/js/lang/de.js"></script>

View file

@ -237,7 +237,7 @@
</div>
<!-- Load the libraries we depend on -->
<script type="text/javascript" src="media/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="media/js/jquery-2.1.3.min.js"></script>
<script type="text/javascript" src="media/js/undum.js"></script>
<!-- Change the name of this file. It is your main game file. -->

View file

@ -214,7 +214,7 @@
</div>
<!-- Загружаем необходимые библиотеки -->
<script type="text/javascript" src="media/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="media/js/jquery-2.1.3.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/hyphenator/4.2.0/hyphenator.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/hyphenator/4.2.0/patterns/ru.js"></script>
<script type="text/javascript" src="media/js/undum.js"></script>