hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix galleria loading

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-02-14 12:34:33 +01:00
parent c3c0110b7d
commit 9bb0d5892b
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Gruntfile.js
View File

@@ -135,6 +135,16 @@ module.exports = function(grunt) {
"dest": "<%= path.asset %>/jquery/", "dest": "<%= path.asset %>/jquery/",
"flatten": true "flatten": true
}, },
"jquery-galleria": {
"expand": true,
"cwd": "<%= path.bower %>/jquery-galleria/src",
"src": [
"galleria.js",
"themes/classic/!(classic-demo.html)*",
],
"dest": "<%= path.asset %>/jquery-galleria/",
"flatten": true
},
"jquery-file-upload": { "jquery-file-upload": {
"expand": true, "expand": true,
"src": [ "src": [
@@ -350,6 +360,7 @@ module.exports = function(grunt) {
"copy:humane-js", "copy:humane-js",
"copy:i18next", "copy:i18next",
"copy:jquery", "copy:jquery",
"copy:jquery-galleria",
"copy:jquery-file-upload", "copy:jquery-file-upload",
"copy:jquery-mobile", "copy:jquery-mobile",
"copy:jquery.cookie", "copy:jquery.cookie",

4
templates/web/login/include/galleria.html.twig
View File

@@ -7,7 +7,7 @@
<script type="text/javascript"> <script type="text/javascript">
requirejs.config({ requirejs.config({
paths: { paths: {
'galleria' : '../assets/jquery-galleria/src/galleria' 'galleria' : '../assets/jquery-galleria/galleria'
}, },
shim: { shim: {
'galleria': { 'galleria': {
@@ -18,7 +18,7 @@
}); });
require(["jquery", "galleria"], function($, Galleria) { require(["jquery", "galleria"], function($, Galleria) {
Galleria.loadTheme('/assets/jquery-galleria/src/themes/classic/galleria.classic.js'); Galleria.loadTheme('/assets/jquery-galleria/galleria.classic.js');
Galleria.run("#galleria"); Galleria.run("#galleria");
$("#galleria").removeClass("hidden"); $("#galleria").removeClass("hidden");
}); });