Revert fetching tooltip dependency with bower

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

View File

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

View File

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

View File

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

View File

@@ -18,7 +18,7 @@ require.config({
"jquery.ui.widget": "../assets/jquery-file-upload/jquery.ui.widget", "jquery.ui.widget": "../assets/jquery-file-upload/jquery.ui.widget",
"jquery.cookie": "../assets/jquery.cookie/jquery.cookie", "jquery.cookie": "../assets/jquery.cookie/jquery.cookie",
"jquery.treeview": "../assets/jquery.treeview/jquery.treeview", "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", "blueimp.loadimage" : "../assets/blueimp-load-image/load-image",
"jfu.iframe-transport": "../assets/jquery-file-upload/jquery.iframe-transport", "jfu.iframe-transport": "../assets/jquery-file-upload/jquery.iframe-transport",
"jfu.fileupload": "../assets/jquery-file-upload/jquery.fileupload", "jfu.fileupload": "../assets/jquery-file-upload/jquery.fileupload",

View File

@@ -14,7 +14,7 @@ require.config({
"jquery.ui.widget": "../assets/jquery-file-upload/jquery.ui.widget", "jquery.ui.widget": "../assets/jquery-file-upload/jquery.ui.widget",
"jquery.cookie": "../assets/jquery.cookie/jquery.cookie", "jquery.cookie": "../assets/jquery.cookie/jquery.cookie",
"jquery.treeview": "../assets/jquery.treeview/jquery.treeview", "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", "blueimp.loadimage" : "../assets/blueimp-load-image/load-image",
"jfu.iframe-transport": "../assets/jquery-file-upload/jquery.iframe-transport", "jfu.iframe-transport": "../assets/jquery-file-upload/jquery.iframe-transport",
"jfu.fileupload": "../assets/jquery-file-upload/jquery.fileupload" "jfu.fileupload": "../assets/jquery-file-upload/jquery.fileupload"