Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193048 => 193049)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:35:10 UTC (rev 193048)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:35:16 UTC (rev 193049)
@@ -1,5 +1,26 @@
2015-12-01 Timothy Hatcher <[email protected]>
+ Merge r187732. rdar://problem/23221163
+
+ 2015-08-02 Matt Baker <[email protected]>
+
+ Web Inspector: Unnamespaced Formatter classes break CSSStyleDeclarationTextEditor
+ https://bugs.webkit.org/show_bug.cgi?id=147544
+
+ Reviewed by Brian Burg.
+
+ Added Formatter and FormatterContentBuilder to WebInspector namespace.
+
+ * UserInterface/Controllers/Formatter.js:
+ * UserInterface/Controllers/FormatterContentBuilder.js:
+ * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._formattedContentFromEditor):
+ * UserInterface/Views/TextEditor.js:
+ (WebInspector.TextEditor.prototype.prettyPrint.prettyPrintAndUpdateEditor):
+ (WebInspector.TextEditor.prototype.prettyPrint):
+
+2015-12-01 Timothy Hatcher <[email protected]>
+
Merge r187730. rdar://problem/23221163
2015-08-02 Matt Baker <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/Formatter.js (193048 => 193049)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/Formatter.js 2015-12-03 18:35:10 UTC (rev 193048)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/Formatter.js 2015-12-03 18:35:16 UTC (rev 193049)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-class Formatter
+WebInspector.Formatter = class Formatter
{
constructor(codeMirror, builder)
{
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/FormatterContentBuilder.js (193048 => 193049)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/FormatterContentBuilder.js 2015-12-03 18:35:10 UTC (rev 193048)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/FormatterContentBuilder.js 2015-12-03 18:35:16 UTC (rev 193049)
@@ -24,7 +24,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-class FormatterContentBuilder
+WebInspector.FormatterContentBuilder = class FormatterContentBuilder
{
constructor(mapping, originalLineEndings, formattedLineEndings, originalOffset, formattedOffset, indentString)
{
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (193048 => 193049)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-12-03 18:35:10 UTC (rev 193048)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-12-03 18:35:16 UTC (rev 193049)
@@ -1470,8 +1470,8 @@
var mapping = {original: [0], formatted: [0]};
// FIXME: <rdar://problem/10593948> Provide a way to change the tab width in the Web Inspector
var indentString = " ";
- var builder = new FormatterContentBuilder(mapping, [], [], 0, 0, indentString);
- var formatter = new Formatter(this._codeMirror, builder);
+ var builder = new WebInspector.FormatterContentBuilder(mapping, [], [], 0, 0, indentString);
+ var formatter = new WebInspector.Formatter(this._codeMirror, builder);
var start = {line: 0, ch: 0};
var end = {line: this._codeMirror.lineCount() - 1};
formatter.format(start, end);
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TextEditor.js (193048 => 193049)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2015-12-03 18:35:10 UTC (rev 193048)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2015-12-03 18:35:16 UTC (rev 193049)
@@ -738,8 +738,8 @@
var originalLineEndings = [];
var formattedLineEndings = [];
var mapping = {original: [0], formatted: [0]};
- var builder = new FormatterContentBuilder(mapping, originalLineEndings, formattedLineEndings, 0, 0, indentString);
- var formatter = new Formatter(this._codeMirror, builder);
+ var builder = new WebInspector.FormatterContentBuilder(mapping, originalLineEndings, formattedLineEndings, 0, 0, indentString);
+ var formatter = new WebInspector.Formatter(this._codeMirror, builder);
formatter.format(start, end);
this._formatterSourceMap = WebInspector.FormatterSourceMap.fromBuilder(builder);
