Commit 38b7feea authored by Kostas Papadimitriou's avatar Kostas Papadimitriou
Browse files

Merge branch 'ui-0.13' into devel-0.13

parents 96e7faee f000d9b8
......@@ -153,10 +153,10 @@
}
// remove predefined for existing keys
var existing_keys = this.current_vm.get_meta();
var existing_keys = this.current_vm.get_meta_keys();
if (!meta) {
this.editor.find(".predefined-meta-key").each(function(i, el){
if (existing_keys[$(el).text()]) {
if (_.contains(existing_keys, $(el).text())) {
$(el).hide();
} else {
$(el).show();
......
......@@ -424,7 +424,7 @@
vm.call("console", function(console_data) {
var url = vm.get_console_url(console_data);
snf.util.open_window(url, "VM_" + vm.get("id") + "_CONSOLE", {});
snf.util.open_window(url, "VM_" + vm.get("id") + "_CONSOLE", {'scrollbars': 1, 'fullscreen': 0});
}, undefined, {async: use_async});
}
......
......@@ -283,10 +283,9 @@
return {del: removed, add: added};
}
synnefo.util.open_window = function(url, name, specs) {
synnefo.util.open_window = function(url, name, opts) {
// default specs
var opts = _.extend({
scrollbars: 'no',
opts = _.extend({
menubar: 'no',
toolbar: 'no',
status: 'no',
......@@ -300,7 +299,8 @@
top: 0
}, opts)
window.open(url, name, opts);
var specs = _.map(opts, function(v,k) {return k + "=" + v}).join(",");
window.open(url, name, specs);
}
synnefo.util.readFileContents = function(f, cb) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment