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

Revert fetching tooltip dependency with bower

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-03-04 18:42:58 +01:00
parent 10421b3819
commit f72d102ace
5 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Gruntfile.js
View File

@@ -179,15 +179,6 @@ module.exports = function(grunt) {
],
"dest": "<%= path.asset %>/jquery.treeview/"
},
"jquery.tooltip": {
"expand": true,
"src": [
"<%= path.bower %>/jquery.tooltip/jquery.tooltip.css",
"<%= path.bower %>/jquery.tooltip/jquery.tooltip.js"
],
"dest": "<%= path.asset %>/jquery.tooltip/",
"flatten": true
},
"jquery-mobile": {
"expand": true,
"cwd": "<%= path.bower %>/jquery-mobile/dist",
@@ -411,7 +402,6 @@ module.exports = function(grunt) {
"copy:jquery.cookie",
"copy:jquery-ui",
"copy:jquery.treeview",
"copy:jquery.tooltip",
"copy:json2",
"copy:modernizr",
"copy:normalize",

3
bower.json
View File

@@ -27,8 +27,7 @@
"autobahnjs": "~0.8.0",
"when": "~2.7.0",
"web-socket-js": "~1.0.1",
"jquery.treeview": "1.4.1",
"jquery.tooltip": "https://github.com/meghna/jquery-tooltip.git#master"
"jquery.treeview": "1.4.1"
},
"devDependencies": {
"mocha": "latest",

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

@@ -30,7 +30,7 @@ $groups = [
, '//include/jslibs/jquery.form.2.49.js'
, '//skins/prod/jquery.Dialog.js'
, '//skins/client/jquery.p4client.1.0.js'
, '//assets/jquery.tooltip/jquery.tooltip.js'
, '//include/jquery.tooltip.js'
, '//include/jquery.p4.preview.js'
, '//include/jquery.image_enhancer.js'
, '//include/jslibs/jquery.contextmenu_scroll.js'],
@@ -45,7 +45,7 @@ $groups = [
, '//skins/admin/template-dialogs.js'
, '//skins/admin/editusers.js'
, '//include/jquery.common.js'
, '//assets/jquery.tooltip/jquery.tooltip.js'
, '//include/jquery.tooltip.js'
, '//skins/prod/jquery.Dialog.js'
, '//include/jslibs/jquery.contextmenu_scroll.js'
, '//assets/blueimp-load-image/load-image.js'
@@ -57,7 +57,7 @@ $groups = [
'//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//assets/jquery.cookie/jquery.cookie.js'
, '//include/jquery.common.js'
, '//assets/jquery.tooltip/jquery.tooltip.js'
, '//include/jquery.tooltip.js'
, '//include/jslibs/jquery.contextmenu_scroll.js'
, '//include/jslibs/jquery.print.js'
, '//include/jslibs/jquery.cluetip.js'
@@ -98,7 +98,7 @@ $groups = [
, '//skins/prod/ThumbExtractor.js'
, '//skins/prod/publicator.js'
, '//include/jslibs/jquery.sprintf.1.0.3.js'
, '//assets/jquery.tooltip/jquery.tooltip.js'
, '//include/jquery.tooltip.js'
, '//include/jslibs/flowplayer/flowplayer-3.2.13.min.js'
, '//include/jquery.p4.preview.js'
, '//skins/prod/jquery.edit.js'
@@ -118,7 +118,7 @@ $groups = [
],
'lightbox' => [
'//include/jslibs/jquery.mousewheel.js'
, '//assets/jquery.tooltip/jquery.tooltip.js'
, '//include/jquery.tooltip.js'
, '//assets/swfobject/swfobject.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//assets/jquery.cookie/jquery.cookie.js'
@@ -130,7 +130,7 @@ $groups = [
],
'lightboxie6' => [
'//include/jslibs/jquery.mousewheel.js'
, '//assets/jquery.tooltip/jquery.tooltip.js'
, '//include/jquery.tooltip.js'
, '//assets/swfobject/swfobject.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//assets/jquery.cookie/jquery.cookie.js'

2
www/scripts/apps/admin/require.config.js
View File

@@ -18,7 +18,7 @@ require.config({
"jquery.ui.widget": "../assets/jquery-file-upload/jquery.ui.widget",
"jquery.cookie": "../assets/jquery.cookie/jquery.cookie",
"jquery.treeview": "../assets/jquery.treeview/jquery.treeview",
"jquery.tooltip": "../assets/jquery.tooltip/jquery.tooltip",
"jquery.tooltip": "../include/jquery.tooltip",
"blueimp.loadimage" : "../assets/blueimp-load-image/load-image",
"jfu.iframe-transport": "../assets/jquery-file-upload/jquery.iframe-transport",
"jfu.fileupload": "../assets/jquery-file-upload/jquery.fileupload",

2
www/scripts/tests/common.js
View File

@@ -14,7 +14,7 @@ require.config({
"jquery.ui.widget": "../assets/jquery-file-upload/jquery.ui.widget",
"jquery.cookie": "../assets/jquery.cookie/jquery.cookie",
"jquery.treeview": "../assets/jquery.treeview/jquery.treeview",
"jquery.tooltip": "../assets/jquery.tooltip/jquery.tooltip",
"jquery.tooltip": "../include/jquery.tooltip",
"blueimp.loadimage" : "../assets/blueimp-load-image/load-image",
"jfu.iframe-transport": "../assets/jquery-file-upload/jquery.iframe-transport",
"jfu.fileupload": "../assets/jquery-file-upload/jquery.fileupload"