diff --git a/configs/client-default.js b/configs/client-default.js index a3dbe949..5a423efa 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -712,7 +712,7 @@ module.exports = function(options) { "plugins/c9.ide.scm/log", "plugins/c9.ide.scm/git", "plugins/c9.ide.scm/editor", - "plugins/c9.ide.scm/mergetool", + "plugins/c9.ide.scm/mergetool" ]; if (!options.sdk) { diff --git a/configs/standalone.js b/configs/standalone.js index 01115eb1..6ebce587 100644 --- a/configs/standalone.js +++ b/configs/standalone.js @@ -155,7 +155,9 @@ module.exports = function(config, optimist) { "c9.cli.bridge": true, "c9.nodeapi": true, "c9.ide.experiment": true, - "saucelabs.preview": true + "saucelabs.preview": true, + "salesforce.sync": true, + "salesforce.language": true } }, "./c9.preview/statics", diff --git a/package.json b/package.json index c0a63e67..4f86ba9d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.23", + "version": "3.1.34", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", @@ -62,7 +62,7 @@ "c9.ide.language.html.diff": "#24f3608d26", "c9.ide.language.javascript": "#2b77bdb96a", "c9.ide.language.javascript.immediate": "#0535804ada", - "c9.ide.language.javascript.eslint": "#df7e424b54", + "c9.ide.language.javascript.eslint": "#3ec4557969", "c9.ide.language.javascript.tern": "#40cf04bded", "c9.ide.language.javascript.infer": "#8478e3c702", "c9.ide.language.jsonalyzer": "#8401c240b3", diff --git a/plugins/c9.ide.ui/lib_apf.js b/plugins/c9.ide.ui/lib_apf.js index c6715caf..25988dc1 100644 --- a/plugins/c9.ide.ui/lib_apf.js +++ b/plugins/c9.ide.ui/lib_apf.js @@ -33555,7 +33555,9 @@ apf.splitbutton = function(struct, tagName) { var diff = apf.getAbsolutePosition(split.$button2.$ext)[0] - apf.getAbsolutePosition(split.$button1.$ext)[0]; - this.$ext.style.marginLeft = "-" + diff + "px"; + this.$ext.style.marginLeft = ~this.$ext.className.indexOf("moveleft") + ? 0 + : "-" + diff + "px"; }); menu.$splitInited = true; } @@ -33568,6 +33570,8 @@ apf.splitbutton = function(struct, tagName) { var _self = this; this.$ext = this.$pHtmlNode.appendChild(document.createElement("div")); this.$ext.className = "splitbutton"; + if (this.getAttribute("style")) + this.$ext.setAttribute("style", this.getAttribute("style")); var skin = this["button-skin"] || this.getAttribute("skin") || this.localName; diff --git a/plugins/c9.ide.ui/menus.js b/plugins/c9.ide.ui/menus.js index 57206a7b..256a678d 100644 --- a/plugins/c9.ide.ui/menus.js +++ b/plugins/c9.ide.ui/menus.js @@ -951,6 +951,9 @@ define(function(require, exports, module) { aml = new ui.menu({ id: options.id, zindex: options.zindex, + visible: options.visible, + width: options.width, + height: options.height, "onprop.visible" : function(e) { emit(e.value ? "show" : "hide", lastCoords); checkItems.call(this, e); @@ -1057,6 +1060,18 @@ define(function(require, exports, module) { */ get zindex(){ return aml && ui.getStyle(aml.$ext, "z-index"); }, set zindex(value) { aml && aml.setAttribute("zindex", value); }, + /** + * Specifies the width of the menu + * @property {Number} width + */ + get width(){ return aml && aml.getWidth(); }, + set width(value) { aml && aml.setAttribute("width", value); }, + /** + * Specifies the height of the menu + * @property {Number} height + */ + get height(){ return aml && aml.getHeight(); }, + set height(value) { aml && aml.setAttribute("height", value); }, /** * The menu items appended to this menu * @property {MenuItem[]} items