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

Add swfobject

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-08-13 02:18:59 +02:00
parent 4a8e1c13ab
commit 89b57730b5
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@@ -211,6 +211,12 @@ module.exports = function(grunt) {
"dest": "www/assets/requirejs/", "dest": "www/assets/requirejs/",
"flatten": true "flatten": true
}, },
"swfobject": {
"expand": true,
"src": "assets/swfobject/swfobject/swfobject.js",
"dest": "www/assets/swfobject",
"flatten": true
},
"underscore": { "underscore": {
"expand": true, "expand": true,
"src": [ "src": [

3
bower.json
View File

@@ -23,6 +23,7 @@
"js-fixtures": "https://github.com/badunk/js-fixtures/archive/master.zip", "js-fixtures": "https://github.com/badunk/js-fixtures/archive/master.zip",
"bootstrap-multiselect": "https://github.com/davidstutz/bootstrap-multiselect.git", "bootstrap-multiselect": "https://github.com/davidstutz/bootstrap-multiselect.git",
"zxcvbn" : "https://github.com/lowe/zxcvbn.git", "zxcvbn" : "https://github.com/lowe/zxcvbn.git",
"geonames-server-jquery-plugin" : "~0.2" "geonames-server-jquery-plugin" : "~0.2",
"swfobject" : "latest"
} }
} }

8
lib/conf.d/minifyGroupsConfig.php
View File

@@ -21,7 +21,7 @@ $groups = array(
'//scripts/apps/login/home/config.js' '//scripts/apps/login/home/config.js'
), ),
'client' => array( 'client' => array(
'//include/jslibs/swfobject/swfobject.js' '//assets/swfobject/swfobject.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js' , '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//include/jslibs/jquery.cookie.js' , '//include/jslibs/jquery.cookie.js'
, '//include/jquery.common.js' , '//include/jquery.common.js'
@@ -66,7 +66,7 @@ $groups = array(
'//assets/jquery.ui/i18n/jquery-ui-i18n.js' '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
), ),
'prod' => array( 'prod' => array(
'//include/jslibs/swfobject/swfobject.js' '//assets/swfobject/swfobject.js'
, '//assets/underscore-amd/underscore.js' , '//assets/underscore-amd/underscore.js'
, '//include/jslibs/json2.js' , '//include/jslibs/json2.js'
, '//include/jslibs/colorpicker/js/colorpicker.js' , '//include/jslibs/colorpicker/js/colorpicker.js'
@@ -117,7 +117,7 @@ $groups = array(
'lightbox' => array( 'lightbox' => array(
'//include/jslibs/jquery.mousewheel.js' '//include/jslibs/jquery.mousewheel.js'
, '//include/jquery.tooltip.js' , '//include/jquery.tooltip.js'
, '//include/jslibs/swfobject/swfobject.js' , '//assets/swfobject/swfobject.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js' , '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//include/jslibs/jquery.cookie.js' , '//include/jslibs/jquery.cookie.js'
, '//include/jslibs/jquery.contextmenu_scroll.js' , '//include/jslibs/jquery.contextmenu_scroll.js'
@@ -129,7 +129,7 @@ $groups = array(
'lightboxie6' => array( 'lightboxie6' => array(
'//include/jslibs/jquery.mousewheel.js' '//include/jslibs/jquery.mousewheel.js'
, '//include/jquery.tooltip.js' , '//include/jquery.tooltip.js'
, '//include/jslibs/swfobject/swfobject.js' , '//assets/swfobject/swfobject.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js' , '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//include/jslibs/jquery.cookie.js' , '//include/jslibs/jquery.cookie.js'
, '//include/jslibs/jquery.contextmenu_scroll.js' , '//include/jslibs/jquery.contextmenu_scroll.js'

2
templates/web/overview.html.twig
View File

@@ -60,7 +60,7 @@
</style> </style>
{% endblock %} {% endblock %}
{% block javascript %} {% block javascript %}
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js,include/jslibs/jquery.mousewheel.js,include/jquery.image_enhancer.js,include/jslibs/swfobject/swfobject.js' }) }}"></script> <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js,include/jslibs/jquery.mousewheel.js,include/jquery.image_enhancer.js,assets/swfobject/swfobject.js' }) }}"></script>
<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery.ui/jquery-ui.js' }) }}"></script> <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery.ui/jquery-ui.js' }) }}"></script>
<script type="text/javascript" src="/include/jslibs/flowplayer/flowplayer-3.2.11.min.js"></script> <script type="text/javascript" src="/include/jslibs/flowplayer/flowplayer-3.2.11.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">