You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/12/06 06:18:31 UTC
[1/2] incubator-guacamole-client git commit: GUACAMOLE-136: Make
$element available to field type controllers.
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/master b4ea239b5 -> 718e4dab0
GUACAMOLE-136: Make $element available to field type controllers.
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/567df5a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/567df5a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/567df5a4
Branch: refs/heads/master
Commit: 567df5a467c88871880a4a4cbf99300d379b3ae5
Parents: b4ea239
Author: Michael Jumper <mj...@apache.org>
Authored: Mon Dec 5 22:08:15 2016 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Dec 5 22:09:52 2016 -0800
----------------------------------------------------------------------
guacamole/src/main/webapp/app/form/services/formService.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/567df5a4/guacamole/src/main/webapp/app/form/services/formService.js
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/form/services/formService.js b/guacamole/src/main/webapp/app/form/services/formService.js
index d761480..0d12259 100644
--- a/guacamole/src/main/webapp/app/form/services/formService.js
+++ b/guacamole/src/main/webapp/app/form/services/formService.js
@@ -249,7 +249,10 @@ angular.module('form').provider('formService', function formServiceProvider() {
// Populate scope using defined controller
if (fieldType.module && fieldType.controller) {
var $controller = angular.injector(['ng', fieldType.module]).get('$controller');
- $controller(fieldType.controller, {'$scope' : scope});
+ $controller(fieldType.controller, {
+ '$scope' : scope,
+ '$element' : angular.element(fieldContainer.childNodes)
+ });
}
// Compile DOM with populated scope
[2/2] incubator-guacamole-client git commit: GUACAMOLE-136: Merge new
$element functionality for field controllers.
Posted by jm...@apache.org.
GUACAMOLE-136: Merge new $element functionality for field controllers.
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/718e4dab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/718e4dab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/718e4dab
Branch: refs/heads/master
Commit: 718e4dab00746ce75f26a72e0099d4a53cb225ad
Parents: b4ea239 567df5a
Author: James Muehlner <ja...@guac-dev.org>
Authored: Mon Dec 5 22:16:29 2016 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Mon Dec 5 22:17:57 2016 -0800
----------------------------------------------------------------------
guacamole/src/main/webapp/app/form/services/formService.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------