Skip to content
This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Options not applied within transcluded directive #123

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Options not applied within transcluded directive #123

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a192000
Fix wrong options object given to initial updateOptions()
VanTanev Sep 12, 2015
6835a49
Do not short-circuit updateOptions() on first call from $watch
VanTanev Sep 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/ui-ace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,8 @@ angular.module('ui.ace', [])
}

// Listen for option updates
var updateOptions = function (current, previous) {
if (current === previous) return;
opts = angular.extend({}, options, scope.$eval(attrs.uiAce));
var updateOptions = function (newOptions) {
opts = angular.extend({}, options, newOptions);

opts.callbacks = [ opts.onLoad ];
if (opts.onLoad !== options.onLoad) {
Expand Down Expand Up @@ -309,7 +308,7 @@ angular.module('ui.ace', [])

// set the options here, even if we try to watch later, if this
// line is missing things go wrong (and the tests will also fail)
updateOptions(options);
updateOptions(opts);

elm.on('$destroy', function () {
acee.session.$stopWorker();
Expand Down