shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

B #5311: IE11 doesn't support optional function parameters (#540)

Browse Source
This commit is contained in:
Abel Coronado 2017-10-26 11:26:13 +02:00 committed by Ruben S. Montero
parent 7e74a08989
commit 224524e3bc
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/vmgroup.js
View File

@ -25,7 +25,7 @@ define(function(require) {
var Tips = require('utils/tips');
var WizardFields = require('utils/wizard-fields');
var UniqueId = require('utils/unique-id');
var vmgroupSection = require('utils/vmgroup-section')
var vmgroupSection = require('utils/vmgroup-section');
var VMGroupsTable = require('tabs/vmgroup-tab/datatable');

5
src/sunstone/public/app/utils/custom-tags-table.js
View File

@ -29,7 +29,10 @@ define(function(require) {
return TemplateHTML();
}
function _setup(context, hide_vector_button = false, resourceType = undefined, element = undefined, elementID = undefined){
function _setup(context, hide_vector_button, resourceType, element, elementID){
if (!hide_vector_button) {
hide_vector_button = false;
}
context.off("click", ".add_custom_tag");
context.on("click", ".add_custom_tag", function(){
$("tbody.custom_tags", context).append(RowTemplateHTML());

7
src/sunstone/public/app/utils/panel/template-table.js
View File

@ -32,7 +32,10 @@ define(function(require) {
@param {String} tableName Header of the table (i.e: Locale.tr("Attributes"))
@returns {String} HTML table
*/
function _html(templateJSON, resourceType, tableName, modify=true) {
function _html(templateJSON, resourceType, tableName, modify) {
if (!modify) {
modify = true;
}
var str =
'<table id="' + resourceType.toLowerCase() + '_template_table" class="dataTable configuration_attrs">\
<thead>\
@ -42,7 +45,7 @@ define(function(require) {
'</th>\
</tr>\
</thead>' +
fromJSONtoHTMLTable(templateJSON, resourceType, undefined, undefined,modify);
fromJSONtoHTMLTable(templateJSON, resourceType, undefined, undefined, modify);
if (modify) {
str += '<tr>\
<td class="key_td"><input type="text" name="new_key" id="new_key" /></td>\

16
src/sunstone/public/app/utils/vmgroup-section.js
View File

@ -56,7 +56,7 @@ define(function(require) {
});
}
function _onShow(context,vmGroupTable=undefined){
function _onShow(context, vmGroupTable){
if(vmGroupTable)
vmGroupTable.refreshResourceTableSelect();
$("#role_section",context).hide();
@ -98,14 +98,14 @@ define(function(require) {
}
}
function _fill(context, templateJSON, vmGroupTable=undefined){
function _fill(context, templateJSON, vmGroupTable){
if(templateJSON.VMGROUP){
var element = templateJSON.VMGROUP;
vmGroupTable.selectResourceTableSelect({ids:element.VMGROUP_ID});
_generate_provision_role_table(context,element.VMGROUP_ID, element.ROLE);
}
}
function _retrieve(context, vmGroupTable=undefined) {
function _retrieve(context, vmGroupTable) {
if(!vmGroupTable){
$.each($('.role_table_section',context), function(){
if(this.innerText != ""){
@ -134,7 +134,7 @@ define(function(require) {
return false;
}
function _generate_provision_role_table(context, idvmgroup, fill=undefined) {
function _generate_provision_role_table(context, idvmgroup, fill) {
OpenNebula.VMGroup.show({
data : {
id: idvmgroup,
@ -143,18 +143,18 @@ define(function(require) {
$(".role_table_section").empty();
var roles = template_json["VM_GROUP"].ROLES.ROLE;
$(".title_roles",context).text(Locale.tr("Roles")+" "+ template_json["VM_GROUP"].NAME);
if(roles){
if(Array.isArray(roles)){
if (roles){
if (Array.isArray(roles)){
$.each(roles, function(){
$("<option value='"+this.NAME+"'><label>"+ this.NAME + "</label></option><br/>").appendTo(".role_table_section",context);
});
}
else{
else {
$("<option value='"+roles.NAME+"'><label>"+ roles.NAME + "</label></option>").appendTo(".role_table_section",context);
}
$("#role_section",context).show();
$(".role_table_section", context).prop('required', true);
if(fill){
if (fill){
$('.role_table_section option[value="'+fill+'"]').attr("selected",true);
}
}