GUACAMOLE-136: Merge template compilation ordering fix for custom field types.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/b4ea239b Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/b4ea239b Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/b4ea239b Branch: refs/heads/master Commit: b4ea239b5f1ce9776616ddbe748e43934e323579 Parents: 18565d1 6eda36c Author: James Muehlner <[email protected]> Authored: Mon Dec 5 20:53:04 2016 -0800 Committer: James Muehlner <[email protected]> Committed: Mon Dec 5 20:53:04 2016 -0800 ---------------------------------------------------------------------- .../webapp/app/form/directives/formField.js | 6 +-- .../webapp/app/form/services/formService.js | 54 ++++++++++++-------- 2 files changed, 35 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
