Commit 65b8d5a2 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

merge menu app.js

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55836 954022d7-b5bf-4e40-9824-e11837661b57
parent 2bded733
...@@ -12,6 +12,7 @@ require.config({ ...@@ -12,6 +12,7 @@ require.config({
// The shim config allows us to configure dependencies for // The shim config allows us to configure dependencies for
// scripts that do not call define() to register a module // scripts that do not call define() to register a module
baseUrl: '../../', baseUrl: '../../',
waitSeconds: 30,
paths: { paths: {
jquery : '../vendor/jquery/jquery', jquery : '../vendor/jquery/jquery',
underscore : '../vendor/underscore/underscore', underscore : '../vendor/underscore/underscore',
......
...@@ -12,6 +12,7 @@ require.config({ ...@@ -12,6 +12,7 @@ require.config({
// The shim config allows us to configure dependencies for // The shim config allows us to configure dependencies for
// scripts that do not call define() to register a module // scripts that do not call define() to register a module
baseUrl: '../../', baseUrl: '../../',
waitSeconds: 30,
paths: { paths: {
jquery : '../vendor/jquery/jquery', jquery : '../vendor/jquery/jquery',
underscore : '../vendor/underscore/underscore', underscore : '../vendor/underscore/underscore',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment