Permalink
Browse files

Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into dev

  • Loading branch information...
2 parents bde567e + d2fd370 commit 6423418a07bcfe86ab09025e8d233c043bad0665 @Jotschi Jotschi committed Apr 4, 2012
Showing with 4 additions and 6 deletions.
  1. +1 −0 build/release-changelog.md
  2. +3 −6 src/plugins/extra/browser/lib/browser.js
@@ -1 +1,2 @@
- **BUG** table-plugin: fixed a javascript error when the block plugin wasn't loaded.
+- **BUG** browser-plugin: fixed a bug that caused only a single root-node to be displayed.
@@ -527,12 +527,9 @@ var Browser = Class.extend({
repositoryId : obj.repositoryId
},
function (data) {
- if (obj.loaded === false) {// should not be called twice
- obj.loaded = true;
-
- if (typeof callback === 'function') {
- callback(data);
- }
+ obj.loaded = true;
+ if (typeof callback === 'function') {
+ callback(data);
}
}
);

0 comments on commit 6423418

Please sign in to comment.