Skip to content
This repository has been archived by the owner on Nov 2, 2021. It is now read-only.

Commit

Permalink
Merge pull request #38 from fxos/bug1164644
Browse files Browse the repository at this point in the history
Bug 1164644 - [Customizer] Update Attributes/Properties inspectors to…
  • Loading branch information
justindarc committed May 29, 2015
2 parents 4ca4c69 + 772fe3d commit be5a0ac
Show file tree
Hide file tree
Showing 6 changed files with 584 additions and 53 deletions.
8 changes: 8 additions & 0 deletions app/js/controllers/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ export default class EditController extends Controller {
generator.opScript(this.changes.script);
}

if (this.changes.createAttributes) {
generator.opCreateAttributes(this.changes.createAttributes);
}

if (this.changes.removeAttributes) {
generator.opRemoveAttributes(this.changes.removeAttributes);
}

if (this.changes.properties) {
generator.opSetProperties(this.changes.properties);
}
Expand Down
5 changes: 3 additions & 2 deletions app/js/elements/fxos-code-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ var template =
}
</style>
<div class="container">
<div class="line-numbers"></div>
<div class="line-numbers">
<div>1</div>
</div>
<textarea wrap="off"></textarea>
</div>`;

Expand Down Expand Up @@ -80,7 +82,6 @@ Object.defineProperty(proto, 'value', {

set: function(value) {
this.textarea.value = value;
this.dispatchEvent(new CustomEvent('change'));
updateLineNumbers(this);
}
});
Expand Down
Loading

0 comments on commit be5a0ac

Please sign in to comment.