tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename require reference to requirejs 

Require is a reserverd word for phantomjs

refs #4315
refs #4303
This commit is contained in:
Jannis Moßhammer 2013-06-19 13:21:25 +02:00 committed by Marius Hein
parent 04f7149cfe
commit f93344330e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/main.js
View File

@ -17,8 +17,8 @@ requirejs.config({
}); });
define(['jquery','Holder'], function ($) { define(['jquery','Holder'], function ($) {
require(['bootstrap']); requirejs(['bootstrap']);
require(['icinga/icinga'], function (Icinga) { requirejs(['icinga/icinga'], function (Icinga) {
window.$ = $; window.$ = $;
window.jQuery = $; window.jQuery = $;
window.Icinga = Icinga; window.Icinga = Icinga;