Merge branch 'master' into image-module

This commit is contained in:
khaydarov 2017-01-26 03:10:12 +03:00
commit fc43d6a4f9
3 changed files with 8 additions and 3 deletions

View file

@ -678,7 +678,9 @@ var codex =
if (typeof codex.tools[tool].prepare != 'function') continue;
codex.tools[tool].prepare();
if (codex.tools[tool].config) {
codex.tools[tool].prepare(codex.tools[tool].config);
}
}
};

File diff suppressed because one or more lines are too long

View file

@ -311,7 +311,10 @@ var ui = (function(ui){
if (typeof codex.tools[tool].prepare != 'function')
continue;
codex.tools[tool].prepare();
if (codex.tools[tool].config) {
codex.tools[tool].prepare(codex.tools[tool].config);
}
}
};