Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade jquery ui 1.8.24 -> 1.10.3 #729

Merged
merged 2 commits into from
Sep 11, 2013
Merged

Upgrade jquery ui 1.8.24 -> 1.10.3 #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd7961d
Upgrade jquery ui 1.8.24 -> 1.10.3
thezoggy Aug 27, 2013
f9697e3
Fix 'Edit' for fileBrowser
thezoggy Sep 11, 2013
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
Binary file added data/css/lib/images/animated-overlay.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/css/lib/images/ui-bg_flat_0_000000_40x100.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/css/lib/images/ui-bg_flat_0_ffffff_40x100.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/css/lib/images/ui-bg_glass_55_fbf9ee_1x400.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/css/lib/images/ui-bg_glass_95_fef1ec_1x400.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/css/lib/images/ui-bg_highlight-soft_75_dcdcdc_1x100.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/css/lib/images/ui-bg_highlight-soft_75_dddddd_1x100.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/css/lib/images/ui-bg_highlight-soft_75_efefef_1x100.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/css/lib/images/ui-bg_inset-soft_75_dfdfdf_1x100.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/css/lib/images/ui-icons_222222_256x240.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/css/lib/images/ui-icons_2e83ff_256x240.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/css/lib/images/ui-icons_8c291d_256x240.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/css/lib/images/ui-icons_cd0a0a_256x240.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
855 changes: 855 additions & 0 deletions data/css/lib/jquery-ui-1.10.3.custom.css
View file
Open in desktop

Large diffs are not rendered by default.

461 changes: 0 additions & 461 deletions data/css/lib/jquery-ui-1.8.24.custom.css
View file
Open in desktop

This file was deleted.

12 changes: 10 additions & 2 deletions data/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,22 @@ browser.css
.ui-menu .ui-menu-item {
background-color: #eee;
}
.ui-menu .ui-menu-item-alternate{
.ui-menu .ui-menu-item-alternate {
background-color: #fff;
}
.ui-menu a.ui-state-hover{
.ui-autocomplete .ui-menu-item .ui-state-focus {
color: #fff;
background: none;
background-color: #0a246a;
}
/* restore 1.8.x resize handle on dialog button pane */
.ui-dialog .ui-resizable-se {
width: 14px;
height: 14px;
right: 3px;
bottom: 3px;
background-position: -80px -224px;
}

/* =======================================================================
formWizard.css
Expand Down
38 changes: 19 additions & 19 deletions data/interfaces/default/inc_top.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/bootstrap.css?$sbPID"/>
<link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/jquery.pnotify.default.css?$sbPID" />
<link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/jquery-ui-1.8.24.custom.css?$sbPID" />
<link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/jquery-ui-1.10.3.custom.css?$sbPID" />
<link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/jquery.qtip.css?$sbPID"/>
<link rel="stylesheet" type="text/css" href="$sbRoot/css/style.css?$sbPID"/>

Expand All @@ -33,30 +33,30 @@

.ui-autocomplete-loading { background: white url("$sbRoot/images/loading16.gif") right center no-repeat; }
.browserDialog.busy .ui-dialog-buttonpane { background: url("$sbRoot/images/loading.gif") 10px 50% no-repeat !important; }
.ui-progressbar .ui-progressbar-overlay { background: url("$sbRoot/css/lib/images/animated-overlay.gif"); }
.ui-dialog, .ui-dialog-buttonpane { background: #eceadf url("$sbRoot/css/lib/images/ui-bg_fine-grain_10_eceadf_60x60.png") 50% 50% repeat !important; }
.ui-accordion-content, .ui-tabs-panel { background: #ededed !important; background-image: none !important; }

.ui-widget-content { border: 1px solid #aaaaaa; background: #dcdcdc url("$sbRoot/css/lib/images/ui-bg_highlight-soft_75_dcdcdc_1x100.png") 50% top repeat-x; color: #222222; }
.ui-widget-header { border: 1px solid #aaaaaa; background: #ffffff url("$sbRoot/css/lib/images/ui-bg_flat_0_ffffff_40x100.png") 50% 50% repeat-x; color: #222222; font-weight: bold; }
.ui-widget-content { background: #dcdcdc url("$sbRoot/css/lib/images/ui-bg_highlight-soft_75_dcdcdc_1x100.png") 50% top repeat-x; }
.ui-widget-header { background: #ffffff url("$sbRoot/css/lib/images/ui-bg_flat_0_ffffff_40x100.png") 50% 50% repeat-x; }

.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #aaaaaa; background: #efefef url("$sbRoot/css/lib/images/ui-bg_highlight-soft_75_efefef_1x100.png") 50% 50% repeat-x; font-weight: bold; color: #222222; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dddddd url("$sbRoot/css/lib/images/ui-bg_highlight-soft_75_dddddd_1x100.png") 50% 50% repeat-x; font-weight: bold; color: #222222; }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #dfdfdf url("$sbRoot/css/lib/images/ui-bg_inset-soft_75_dfdfdf_1x100.png") 50% 50% repeat-x; font-weight: bold; color: #140f06; }
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { background: #efefef url("$sbRoot/css/lib/images/ui-bg_highlight-soft_75_efefef_1x100.png") 50% 50% repeat-x; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { background: #dddddd url("$sbRoot/css/lib/images/ui-bg_highlight-soft_75_dddddd_1x100.png") 50% 50% repeat-x; }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { background: #dfdfdf url("$sbRoot/css/lib/images/ui-bg_inset-soft_75_dfdfdf_1x100.png") 50% 50% repeat-x; }

.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #aaaaaa; background: #fbf9ee url("$sbRoot/css/lib/images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x; color: #363636; }
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #aaaaaa; background: #fef1ec url("$sbRoot/css/lib/images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x; color: #8c291d; }
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { background: #fbf9ee url("$sbRoot/css/lib/images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x; }
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error { background: #fef1ec url("$sbRoot/css/lib/images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x; }

.ui-icon { width: 16px; height: 16px; background-image: url("$sbRoot/css/lib/images/ui-icons_222222_256x240.png"); }
.ui-widget-content .ui-icon {background-image: url("$sbRoot/css/lib/images/ui-icons_222222_256x240.png"); }
.ui-widget-header .ui-icon {background-image: url("$sbRoot/css/lib/images/ui-icons_222222_256x240.png"); }
.ui-icon, .ui-widget-content .ui-icon { background-image: url("$sbRoot/css/lib/images/ui-icons_222222_256x240.png"); }
.ui-widget-header .ui-icon { background-image: url("$sbRoot/css/lib/images/ui-icons_222222_256x240.png"); }
.ui-state-default .ui-icon { background-image: url("$sbRoot/css/lib/images/ui-icons_8c291d_256x240.png"); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url("$sbRoot/css/lib/images/ui-icons_222222_256x240.png"); }
.ui-state-active .ui-icon {background-image: url("$sbRoot/css/lib/images/ui-icons_8c291d_256x240.png"); }
.ui-state-highlight .ui-icon {background-image: url("$sbRoot/css/lib/images/ui-icons_2e83ff_256x240.png"); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url("$sbRoot/css/lib/images/ui-icons_cd0a0a_256x240.png"); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon { background-image: url("$sbRoot/css/lib/images/ui-icons_222222_256x240.png"); }
.ui-state-active .ui-icon { background-image: url("$sbRoot/css/lib/images/ui-icons_8c291d_256x240.png"); }
.ui-state-highlight .ui-icon { background-image: url("$sbRoot/css/lib/images/ui-icons_2e83ff_256x240.png"); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon { background-image: url("$sbRoot/css/lib/images/ui-icons_cd0a0a_256x240.png"); }

.ui-widget-overlay { background: #aaaaaa url("$sbRoot/css/lib/images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; opacity: .35;filter:Alpha(Opacity=35); }
.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #000000 url("$sbRoot/css/lib/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; opacity: .35;filter:Alpha(Opacity=35); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
.ui-widget-overlay { background: #aaaaaa url("$sbRoot/css/lib/images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; }
.ui-widget-shadow { background: #000000 url("$sbRoot/css/lib/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; }

#if $sickbeard.NEWEST_VERSION_STRING:
.ui-pnotify { top: 30px !important; }
Expand All @@ -65,8 +65,8 @@
</style>

<script type="text/javascript" src="$sbRoot/js/lib/jquery-1.7.2.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery-ui-1.8.24.custom.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/bootstrap.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery-ui-1.10.3.custom.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.cookie.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.selectboxes.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter-2.1.19.min.js?$sbPID"></script>
Expand All @@ -87,7 +87,7 @@
<script type="text/javascript" src="$sbRoot/js/ajaxNotifications.js?$sbPID"></script>
<script type="text/javascript">
<!--
\$(document).ready(function(){
\$(document).ready(function() {
\$("#NAV$topmenu").addClass("active");

\$("a.confirm").bind("click",function(e) {
Expand Down
14 changes: 7 additions & 7 deletions data/js/browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

function browse(path, endpoint) {

if (currentBrowserPath === path) {
if (currentBrowserPath == path) {
return;
}

Expand Down Expand Up @@ -50,7 +50,6 @@
}

$.fn.nFileBrowser = function (callback, options) {

options = $.extend({}, $.Browser.defaults, options);

// make a fileBrowserDialog object if one doesn't exist already
Expand All @@ -74,14 +73,14 @@
click: function() {
// store the browsed path to the associated text field
callback(currentBrowserPath, options);
fileBrowserDialog.dialog("close");
$(this).dialog("close");
}
},
{
text: "Cancel",
"class": "btn btn-large",
click: function() {
fileBrowserDialog.dialog("close");
$(this).dialog("close");
}
}
]
Expand All @@ -107,6 +106,7 @@
if (options.field.autocomplete && options.autocompleteURL) {
var query = '';
options.field.autocomplete({
position: { my : "top", at: "bottom", collision: "flipfit" },
source: function (request, response) {
//keep track of user submitted search term
query = $.ui.autocomplete.escapeRegex(request.term);
Expand All @@ -129,15 +129,15 @@
$(".ui-autocomplete li.ui-menu-item:odd a").addClass("ui-menu-item-alternate");
}
})
.data("autocomplete")._renderItem = function (ul, item) {
.data("ui-autocomplete")._renderItem = function (ul, item) {
//highlight the matched search term from the item -- note that this is global and will match anywhere
var result_item = item.label;
var x = new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + query + ")(?![^<>]*>)(?![^&;]+;)", "gi");
result_item = result_item.replace(x, function (FullMatch, n) {
return '<b>' + FullMatch + '</b>';
});
return $("<li></li>")
.data("item.autocomplete", item)
.data("ui-autocomplete-item", item)
.append("<a class='nowrap'>" + result_item + "</a>")
.appendTo(ul);
};
Expand Down Expand Up @@ -168,7 +168,7 @@

options = $.extend(options, {initialDir: initialDir});

// append the browse button and give it a click behavior
// append the browse button and give it a click behaviour
return options.field.addClass('fileBrowserField').after($('<input type="button" value="Browse&hellip;" class="btn fileBrowser" />').click(function () {
$(this).nFileBrowser(callback, options);
return false;
Expand Down
5 changes: 5 additions & 0 deletions data/js/lib/jquery-ui-1.10.3.custom.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading