code.onehippo.org is currently readonly. We are migrating to code.bloomreach.com, please continue working there on Monday 14/12. See: https://docs.bloomreach.com/display/engineering/GitLab

Commit 004a632a authored by Tobias Jeger's avatar Tobias Jeger

ESSENTIALS-525: Restore folder picker tree functionality by using older...

ESSENTIALS-525: Restore folder picker tree functionality by using older version of angular-ui-tree.js.
parent cda0c338
......@@ -221,6 +221,7 @@ dashboard/src/main/webapp/js/Essentials.js -text
dashboard/src/main/webapp/js/app.js -text
dashboard/src/main/webapp/js/controllers.js -text
dashboard/src/main/webapp/js/directives.js -text
dashboard/src/main/webapp/js/lib/angular-ui-tree.js -text
dashboard/src/main/webapp/js/loader.js -text
dashboard/src/main/webapp/js/routes.js -text
dashboard/src/main/webapp/pages/build.html -text
......
......@@ -204,6 +204,30 @@ For both the above listed sub-components or other bundled sub-components also ad
and license terms may apply. Your use of the code for these sub-components is also subject to the terms and conditions
as described below:
------------------------------------------------------------------------------------------------------------------------
dashboard/src/main/webapp/js/lib/angular-ui-tree.js
The MIT License (MIT)
Copyright (c) 2014
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------------------------------
plugins/skeleton-package/src/main/resources/instructions/bootstrap/*
plugins/skeleton-package/src/main/resources/instructions/js/bootstrap.min.js
......
......@@ -211,3 +211,27 @@ components/jquery/**
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------------------------------
js/lib/angular-ui-tree.js
The MIT License (MIT)
Copyright (c) 2014
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
......@@ -33,7 +33,7 @@
<script src="${pageContext.request.contextPath}/components/angular-sanitize/angular-sanitize.min.js?v=${project.version}"></script>
<%-- HIPPO THEME DEPS --%>
<script src="${pageContext.request.contextPath}/components/angular-ui-tree/dist/angular-ui-tree.js?v=${project.version}"></script>
<script src="${pageContext.request.contextPath}/js/lib/angular-ui-tree.js?v=${project.version}"></script>
<script src="${pageContext.request.contextPath}/components/hippo-theme/dist/js/main.js?v=${project.version}"></script>
<%-- ESSENTIALS --%>
......
......@@ -23,7 +23,7 @@
<h3 class="modal-title">{{title ? title:'Select target'}}</h3>
</div>
<div class="modal-body no-drag">
<div hippo.theme.tree
<div hippo-tree
data-drag-enabled="false"
items="treeItems"
callbacks="callbacks"
......
This diff is collapsed.
......@@ -48,12 +48,12 @@
<label class="control-label">Please select templating language</label>
<div class="radio">
<label>
<input type="radio" ng-model="projectSettings.templateLanguage" required value="jsp"/> JSP template
<input type="radio" ng-model="projectSettings.templateLanguage" required value="freemarker"/> FreeMarker template
</label>
</div>
<div class="radio">
<label>
<input type="radio" ng-model="projectSettings.templateLanguage" required value="freemarker"/> FreeMarker template
<input type="radio" ng-model="projectSettings.templateLanguage" required value="jsp"/> JSP template
</label>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment