merge new menu

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61053 954022d7-b5bf-4e40-9824-e11837661b57

merge new menu
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61053 954022d7-b5bf-4e40-9824-e11837661b57
be472b19 · Alexander.Trofimov · Alexander.Trofimov · aa49cd09 · be472b19 · be472b19
Commit be472b19 authored Feb 19, 2015 by Alexander.Trofimov Committed by Alexander.Trofimov May 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

Excel/app.js Excel/app.js +1 -2

PowerPoint/app.js PowerPoint/app.js +0 -1

Word/app.js Word/app.js +1 -2

No files found.
--- a/Excel/app.js
+++ b/Excel/app.js
@@ -12,14 +12,13 @@ require.config({
    // The shim config allows us to configure dependencies for
    // scripts that do not call define() to register a module
    baseUrl: '../../',
-    waitSeconds: 30,
    paths: {
        jquery          : '../vendor/jquery/jquery',
        underscore      : '../vendor/underscore/underscore',
        backbone        : '../vendor/backbone/backbone',
        bootstrap       : '../vendor/bootstrap/dist/js/bootstrap',
        text            : '../vendor/requirejs-text/text',
-        perfectscrollbar: '../vendor/perfect-scrollbar/src/perfect-scrollbar',
+        perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
        jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
        xregexp         : '../vendor/xregexp/xregexp-all-min',
        sockjs          : '../vendor/sockjs/sockjs.min',

--- a/PowerPoint/app.js
+++ b/PowerPoint/app.js
@@ -12,7 +12,6 @@ require.config({
    // The shim config allows us to configure dependencies for
    // scripts that do not call define() to register a module
    baseUrl: '../../',
-    waitSeconds: 30,
    paths: {
        jquery          : '../vendor/jquery/jquery',
        underscore      : '../vendor/underscore/underscore',

--- a/Word/app.js
+++ b/Word/app.js
@@ -12,14 +12,13 @@ require.config({
    // The shim config allows us to configure dependencies for
    // scripts that do not call define() to register a module
    baseUrl: '../../',
-    waitSeconds: 30,
    paths: {
 			jquery          : '../vendor/jquery/jquery',
 			underscore      : '../vendor/underscore/underscore',
 			backbone        : '../vendor/backbone/backbone',
 			bootstrap       : '../vendor/bootstrap/dist/js/bootstrap',
 			text            : '../vendor/requirejs-text/text',
-			perfectscrollbar: '../vendor/perfect-scrollbar/src/perfect-scrollbar',
+        perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
 			jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
 			xregexp         : '../vendor/xregexp/xregexp-all-min',
 			sockjs          : '../vendor/sockjs/sockjs.min',