tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUG Fix frameworkpath

Browse Source
This commit is contained in:
Damian Mooyman 2017-01-11 11:49:28 +13:00
parent dcee7c99d3
commit ae2861d487
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/client/dist/js/bundle.js vendored
View File

@ -1250,7 +1250,7 @@ return{core:{initially_open:["record-0"],animation:0,html_titles:!0},html_data:{
f&&r.attr("class").match(/VirtualPage-([^\s]*)/)&&(s=RegExp.$1),f&&(c="undefined"!=typeof f.disallowedChildren?f.disallowedChildren:[]) f&&r.attr("class").match(/VirtualPage-([^\s]*)/)&&(s=RegExp.$1),f&&(c="undefined"!=typeof f.disallowedChildren?f.disallowedChildren:[])
var p=!(0===r.data("id")||r.hasClass("status-archived")||a&&"inside"!=i.p||o.hasClass("nochildren")||c.length&&e.inArray(s,c)!=-1) var p=!(0===r.data("id")||r.hasClass("status-archived")||a&&"inside"!=i.p||o.hasClass("nochildren")||c.length&&e.inArray(s,c)!=-1)
return p}}},dnd:{drop_target:!1,drag_target:!1},checkbox:{two_state:!0},themes:{theme:"apple",url:e("body").data("frameworkpath")+"/thirdparty/jstree/themes/apple/style.css"},plugins:["html_data","ui","dnd","crrm","themes","checkbox"] return p}}},dnd:{drop_target:!1,drag_target:!1},checkbox:{two_state:!0},themes:{theme:"apple",url:e("body").data("frameworkpath")+"/admin/thirdparty/jstree/themes/apple/style.css"},plugins:["html_data","ui","dnd","crrm","themes","checkbox"]
}},search:function a(e,t){e?this.data("searchparams",e):this.removeData("searchparams"),this.jstree("refresh",-1,t)},getNodeByID:function s(e){return this.find("*[data-id="+e+"]")},createNode:function l(t,n,i){ }},search:function a(e,t){e?this.data("searchparams",e):this.removeData("searchparams"),this.jstree("refresh",-1,t)},getNodeByID:function s(e){return this.find("*[data-id="+e+"]")},createNode:function l(t,n,i){
var r=this,o=void 0!==n.ParentID&&r.getNodeByID(n.ParentID),a=e(t),s={data:""} var r=this,o=void 0!==n.ParentID&&r.getNodeByID(n.ParentID),a=e(t),s={data:""}
a.hasClass("jstree-open")?s.state="open":a.hasClass("jstree-closed")&&(s.state="closed"),this.jstree("create_node",o.length?o:-1,"last",s,function(e){for(var t=e.attr("class"),n=0;n<a[0].attributes.length;n++){ a.hasClass("jstree-open")?s.state="open":a.hasClass("jstree-closed")&&(s.state="closed"),this.jstree("create_node",o.length?o:-1,"last",s,function(e){for(var t=e.attr("class"),n=0;n<a[0].attributes.length;n++){

2
admin/client/src/legacy/LeftAndMain.Tree.js
View File

@ -207,7 +207,7 @@ $.entwine('ss.tree', function($){
}, },
'themes': { 'themes': {
'theme': 'apple', 'theme': 'apple',
'url': $('body').data('frameworkpath') + '/thirdparty/jstree/themes/apple/style.css' 'url': $('body').data('frameworkpath') + '/admin/thirdparty/jstree/themes/apple/style.css'
}, },
// Caution: SilverStripe has disabled $.vakata.css.add_sheet() for performance reasons, // Caution: SilverStripe has disabled $.vakata.css.add_sheet() for performance reasons,
// which means you need to add any CSS manually to framework/admin/scss/_tree.css // which means you need to add any CSS manually to framework/admin/scss/_tree.css

2
admin/templates/SilverStripe/Admin/LeftAndMain.ss
View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=720, maximum-scale=1.0" /> <meta name="viewport" content="width=720, maximum-scale=1.0" />
<title>$Title</title> <title>$Title</title>
</head> </head>
<body class="loading cms"data-frameworkpath="$ModulePath(framework)" <body class="loading cms" data-frameworkpath="$ModulePath(framework)"
data-member-tempid="$CurrentMember.TempIDHash.ATT" data-member-tempid="$CurrentMember.TempIDHash.ATT"
> >
<% include SilverStripe\\Admin\\CMSLoadingScreen %> <% include SilverStripe\\Admin\\CMSLoadingScreen %>