Skip to content

Commit fd319bd

Browse files
committed
Moved requirejs to bower, grafana#677
1 parent 6f982b2 commit fd319bd

File tree

19 files changed

+722
-418
lines changed

19 files changed

+722
-418
lines changed

bower.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
"angular-mocks": "~1.4.0",
2020
"angular-sanitize": "~1.4.0",
2121
"angular-native-dragdrop": "~1.1.0",
22-
"angular-bindonce": "~0.3.3"
22+
"angular-bindonce": "~0.3.3",
23+
"requirejs": "~2.1.18",
24+
"requirejs-text": "~2.0.14"
2325
}
2426
}

public/app/components/require.config.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ require.config({
88
kbn: 'components/kbn',
99
store: 'components/store',
1010

11-
css: '../vendor/require/css',
12-
text: '../vendor/require/text',
11+
text: '../vendor/requirejs-text/text',
1312
moment: '../vendor/moment',
1413
filesaver: '../vendor/filesaver',
1514
ZeroClipboard: '../vendor/ZeroClipboard',

public/vendor/require/css-build.js

-78
This file was deleted.

public/vendor/require/css.js

-23
This file was deleted.

public/vendor/require/tmpl.js

-17
This file was deleted.
+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"name": "text",
3+
"version": "2.0.14",
4+
"main": "text.js",
5+
"homepage": "https://github.com/requirejs/text",
6+
"_release": "2.0.14",
7+
"_resolution": {
8+
"type": "version",
9+
"tag": "2.0.14",
10+
"commit": "195a482d24f1d515979ab26f29e968e99c4ab63c"
11+
},
12+
"_source": "git://github.com/requirejs/text.git",
13+
"_target": "~2.0.14",
14+
"_originalSource": "requirejs-text",
15+
"_direct": true
16+
}

public/vendor/requirejs-text/LICENSE

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
RequireJS is released under two licenses: new BSD, and MIT. You may pick the
2+
license that best suits your development needs. The text of both licenses are
3+
provided below.
4+
5+
6+
The "New" BSD License:
7+
----------------------
8+
9+
Copyright (c) 2010-2014, The Dojo Foundation
10+
All rights reserved.
11+
12+
Redistribution and use in source and binary forms, with or without
13+
modification, are permitted provided that the following conditions are met:
14+
15+
* Redistributions of source code must retain the above copyright notice, this
16+
list of conditions and the following disclaimer.
17+
* Redistributions in binary form must reproduce the above copyright notice,
18+
this list of conditions and the following disclaimer in the documentation
19+
and/or other materials provided with the distribution.
20+
* Neither the name of the Dojo Foundation nor the names of its contributors
21+
may be used to endorse or promote products derived from this software
22+
without specific prior written permission.
23+
24+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
25+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
26+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
27+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
28+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
29+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
30+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
31+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
32+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
33+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34+
35+
36+
37+
MIT License
38+
-----------
39+
40+
Copyright (c) 2010-2014, The Dojo Foundation
41+
42+
Permission is hereby granted, free of charge, to any person obtaining a copy
43+
of this software and associated documentation files (the "Software"), to deal
44+
in the Software without restriction, including without limitation the rights
45+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
46+
copies of the Software, and to permit persons to whom the Software is
47+
furnished to do so, subject to the following conditions:
48+
49+
The above copyright notice and this permission notice shall be included in
50+
all copies or substantial portions of the Software.
51+
52+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
53+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
54+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
55+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
56+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
57+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
58+
THE SOFTWARE.

0 commit comments

Comments
 (0)