You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/10/24 20:31:26 UTC
[48/50] [abbrv] Merge branch 'master' into ui-restyle
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/500c798f/ui/scripts/ui-custom/instanceWizard.js
----------------------------------------------------------------------
diff --cc ui/scripts/ui-custom/instanceWizard.js
index c99155f,a246051..6aa93ff
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@@ -1014,21 -1031,25 +1031,25 @@@
// Setup tabs and slider
$wizard.find('.section.custom-size .size.max span').html(maxCustomDiskSize);
$wizard.find('.tab-view').tabs();
- $wizard.find('.slider').slider({
+ $wizard.find('.slider').each(function() {
+ var $slider = $(this);
+
+ $slider.slider({
- min: 1,
- max: maxCustomDiskSize,
- start: function(event) {
+ min: 1,
+ max: maxCustomDiskSize,
+ start: function(event) {
- $wizard.find('div.data-disk-offering div.custom-size input[type=radio]').click();
+ $slider.closest('.section.custom-size').find('input[type=radio]').click();
- },
- slide: function(event, ui) {
+ },
+ slide: function(event, ui) {
- $wizard.find('div.data-disk-offering div.custom-size input[type=text]').val(
+ $slider.closest('.section.custom-size').find('input[type=text]').val(
- ui.value
- );
+ ui.value
+ );
- $wizard.find('div.data-disk-offering span.custom-disk-size').html(
+ $slider.closest('.step').find('span.custom-disk-size').html(
- ui.value
- );
- }
- });
+ ui.value
+ );
+ }
+ });
+ });
$wizard.find('div.data-disk-offering div.custom-size input[type=text]').bind('change', function() {
var old = $wizard.find('div.data-disk-offering div.custom-size input[type=text]').val();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/500c798f/ui/scripts/ui/dialog.js
----------------------------------------------------------------------
diff --cc ui/scripts/ui/dialog.js
index 4de8423,3d34203..fdcf9ff
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@@ -385,8 -376,14 +385,14 @@@
name: key,
type: 'checkbox'
}).appendTo($value);
- if (field.isChecked) {
+ var isChecked;
+ if (typeof (field.isChecked) == 'function') {
+ isChecked = field.isChecked();
+ } else {
+ isChecked = field.isChecked;
+ }
+ if (isChecked) {
- $input.attr('checked', strOrFunc(field.isChecked));
+ $input.attr('checked', strOrFunc(field.isChecked));
} else {
// This is mainly for IE compatibility
setTimeout(function() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/500c798f/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/500c798f/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------