Permalink
Browse files

release 1.10

  • Loading branch information...
1 parent 5e28f51 commit 6168f58922b24080ec691042a2d8db19a2de285d @nightwing nightwing committed Jul 18, 2012
@@ -10679,8 +10679,8 @@ var Text = function(parentEl) {
var replaceFunc = function(c, a, b, tabIdx, idx4) {
if (a) {
return self.showInvisibles
- ? new Array(c.length+1).join(" ")
- : "<span class='ace_invisible'>" + new Array(c.length+1).join(self.SPACE_CHAR) + "</span>";
+ ? "<span class='ace_invisible'>" + new Array(c.length+1).join(self.SPACE_CHAR) + "</span>"
+ : new Array(c.length+1).join("&#160;");
} else if (c == "&") {
return "&#38;";
} else if (c == "<") {
@@ -198,7 +198,7 @@ Firebug.Ace = {
},
"-",
{
- label: $ACESTR("acebug options"),
+ label: "Acebug Options",
command: function() {
openDialog('chrome://acebug/content/options.xul','','resizable,centerscreen')
}
@@ -760,6 +760,10 @@ var acebugPrefObserver = {
var env2 = Firebug.Ace.win2.env;
switch (aData) {
+ case "fontsize":
+ env1 && env1.editor.setFontSize(this._branch.getCharPref(aData));
+ env2 && env2.editor.setFontSize(this._branch.getCharPref(aData));
+ break;
case "highlightactiveline":
env1 && env1.editor.setHighlightActiveLine(this._branch.getBoolPref(aData));
env2 && env2.editor.setHighlightActiveLine(this._branch.getBoolPref(aData));
@@ -882,8 +886,13 @@ var HTMLPanelEditor = function() {
this.onInput = FBL.bind(this.onInput, this);
this.session.on('change', this.onInput);
this.session.owner = 'htmlEditor';
+ this.session.saveCmd = this.hide.bind(this);
//
- this.cmdID = "cmd_toggleHTMLEditing";
+ this.cmdID = "cmd_firebug_toggleHTMLEditing";
+ if (!Firebug.chrome.$(this.cmdID)) {
+ this.cmdID = this.cmdID.replace("firebug_", "")
+ }
+
};
HTMLPanelEditor.prototype = {
@@ -1012,12 +1021,17 @@ var StyleSheetEditor = function() {
this.aceWindow = Firebug.Ace.win1;
this.editor = this.aceWindow.editor;
this.session = this.aceWindow.createSession('', '.css');
+ this.session.saveCmd = this.hide.bind(this);
this.onInput = FBL.bind(this.onInput, this);
this.session.on('change', this.onInput);
+
this.session.owner = 'stylesheetEditor';
this.session.autocompletionType = 'css';
- this.cmdID = 'cmd_togglecssEditMode';
+ this.cmdID = 'cmd_firebug_togglecssEditMode';
+ if (!Firebug.chrome.$(this.cmdID)) {
+ this.cmdID = this.cmdID.replace("firebug_", "")
+ }
};
StyleSheetEditor.prototype = FBL.extend(HTMLPanelEditor.prototype, {
@@ -569,7 +569,11 @@ Firebug.Ace.JSAutocompleter = FBL.extend(Firebug.Ace.BaseAutocompleter, {
} else if (fu == 'require') {
descr = "loaded module";
var req = FBL.unwrapObject(this.object).require
- var modules = req.modules || req.s.contexts._.loaded
+ if (req.s) {
+ var modules = req.s.contexts._.loaded || req.s.contexts._.defined
+ } else {
+ var modules = req.modules || FBL.unwrapObject(this.object).define.modules
+ }
for (var i in modules)
createItem(i);
}
@@ -16,6 +16,7 @@
<preference id="acebug-showinvisiblecharacters" name="extensions.acebug.showinvisiblecharacters" type="bool" />
<preference id="acebug-softtabs" name="extensions.acebug.softtabs" type="bool" />
<preference id="acebug-tabsize" name="extensions.acebug.tabsize" type="int" />
+ <preference id="acebug-fontsize" name="extensions.acebug.fontsize" type="string" />
<preference id="acebug-wordwrap" name="extensions.acebug.wordwrap" type="bool" />
<preference id="acebug-theme" name="extensions.acebug.theme" type="string" />
<preference id="acebug-keybinding" name="extensions.acebug.keybinding" type="string" />
@@ -41,8 +42,10 @@
<checkbox id="abWordwrap" preference="acebug-wordwrap"
label="&acebug.options.wraptext;" />
<checkbox id="abSoftTabs" preference="acebug-softtabs"
- label="&acebug.options.spacesinsteadoftabs;" onclick="softTabsClicked(false);" />
+ label="&acebug.options.spacesinsteadoftabs;" onclick="/*softTabsClicked(false);*/" />
<hbox>
+ <label id="abFontSizeLbl" value="font size" control="abFontSize" />
+ <textbox id="abFontSize" size="2" cols="2" preference="acebug-fontsize" />
<spacer flex="1" />
<label id="abTabSizeLbl" value="&acebug.options.tabsize;" control="abTabSize" />
<textbox id="abTabSize" size="2" cols="2" preference="acebug-tabsize" />
@@ -7,5 +7,6 @@ pref("extensions.acebug.validateasyoutype", true);
pref("extensions.acebug.softtabs", true);
pref("extensions.acebug.tabsize", 4);
pref("extensions.acebug.wordwrap", true);
+pref("extensions.acebug.fontsize", "12px");
pref("extensions.acebug.theme", "ace/theme/textmate");
pref("extensions.acebug.autopair", true);
View
@@ -7,7 +7,7 @@
<em:name>Acebug</em:name>
<em:description>Syntax highlighting for the Firebug command line using Ace. Firebug 1.9 or above must be installed in order to use this extension.</em:description>
<em:id>acebug@mozilla.org</em:id>
- <em:version>1.9.4</em:version>
+ <em:version>1.10.0</em:version>
<em:type>2</em:type>
<em:creator>Harutyun Amirjanyan &amp; Michael Ratcliffe</em:creator>
<em:iconURL>chrome://acebug/content/acebug.png</em:iconURL>
@@ -20,7 +20,7 @@
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>1.9.0.*</em:minVersion>
- <em:maxVersion>14.0a1</em:maxVersion>
+ <em:maxVersion>17.0a1</em:maxVersion>
</Description>
</em:targetApplication>
@@ -29,7 +29,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>8.0</em:minVersion>
- <em:maxVersion>14.0a1</em:maxVersion>
+ <em:maxVersion>17.0a1</em:maxVersion>
</Description>
</em:targetApplication>

0 comments on commit 6168f58

Please sign in to comment.