[all] fix editor openin after undescorejs update

apps/common/main/lib/core/NotificationCenter.js

@@ -56,8 +56,9 @@ if (Common === undefined)
     var Common = {};
 
 define([
-    'backbone'
-], function (Backbone) {
+    'backbone',
+    'underscore',
+], function (Backbone, _) {
     'use strict';
 
     var NotificationCenter = function(){};

apps/common/main/lib/core/application.js

@@ -1,4 +1,5 @@
-(function(){
+define(['underscore'],
+function(_){
     var resolveNamespace = function(className, root) {
         var parts = className.split('.'),
             current = root || window;
@@ -562,4 +563,4 @@
     else {
         throw ('Native Backbone.Application instance already defined.')
     }
-})();
+});

apps/common/main/lib/util/Shortcuts.js

@@ -77,7 +77,8 @@ Common.util = Common.util||{};
 
  define([
     'backbone',
-    'keymaster'
+    'keymaster',
+    'notification'
 ], function (Backbone) {
     'use strict';
 

apps/documenteditor/main/app.js

@@ -118,22 +118,20 @@ require.config({
     }
 });
 
-require(['underscore'], function(_) {
-    window._ = _
-})
-
 require([
     'sdk',
     'backbone',
+    'underscore',
     'bootstrap',
     'core',
     'analytics',
     'gateway',
     'locale'
-], function (Sdk, Backbone, Bootstrap, Core) {
+], function (Sdk, Backbone, _, Bootstrap, Core) {
     if (Backbone.History && Backbone.History.started)
         return;
     Backbone.history.start();
+    window._ = _;
 
     /**
      * Application instance with DE namespace defined

apps/documenteditor/main/app_dev.js

@@ -108,23 +108,20 @@ require.config({
     }
 });
 
-require(['underscore'], function(_) {
-    window._ = _
-})
-
 require([
     'backbone',
+    'underscore',
     'bootstrap',
     'core',
     'analytics',
     'gateway',
     'locale',
     'socketio',
-	'underscore'
-], function (Backbone, Bootstrap, Core) {
+], function (Backbone, _, Bootstrap, Core) {
     if (Backbone.History && Backbone.History.started)
         return;
     Backbone.history.start();
+    window._ = _;
 
     /**
      * Application instance with DE namespace defined

apps/pdfeditor/main/app.js

@@ -118,22 +118,20 @@ require.config({
     }
 });
 
-require(['underscore'], function(_) {
-    window._ = _
-})
-
 require([
     'sdk',
     'backbone',
+    'underscore',
     'bootstrap',
     'core',
     'analytics',
     'gateway',
     'locale'
-], function (Sdk, Backbone, Bootstrap, Core) {
+], function (Sdk, Backbone, _, Bootstrap, Core) {
     if (Backbone.History && Backbone.History.started)
         return;
     Backbone.history.start();
+    window._ = _;
 
     /**
      * Application instance with PDFE namespace defined

apps/pdfeditor/main/app_dev.js

@@ -108,22 +108,20 @@ require.config({
     }
 });
 
-require(['underscore'], function(_) {
-    window._ = _
-})
-
 require([
     'backbone',
+    'underscore',
     'bootstrap',
     'core',
     'analytics',
     'gateway',
     'locale',
     'socketio',
-], function (Backbone, Bootstrap, Core) {
+], function (Backbone, _, Bootstrap, Core) {
     if (Backbone.History && Backbone.History.started)
         return;
     Backbone.history.start();
+    window._ = _;
 
     /**
      * Application instance with PDFE namespace defined

apps/presentationeditor/main/app.js

@@ -117,22 +117,20 @@ require.config({
     }
 });
 
-require(['underscore'], function(_) {
-    window._ = _
-})
-
 require([
     'sdk',
     'backbone',
+    'underscore',
     'bootstrap',
     'core',
     'analytics',
     'gateway',
     'locale'
-], function (Sdk, Backbone, Bootstrap, Core) {
+], function (Sdk, Backbone, _, Bootstrap, Core) {
     if (Backbone.History && Backbone.History.started)
         return;
     Backbone.history.start();
+    window._ = _;
 
     /**
      * Application instance with PE namespace defined

apps/presentationeditor/main/app_dev.js

@@ -107,12 +107,9 @@ require.config({
     }
 });
 
-require(['underscore'], function(_) {
-    window._ = _
-})
-
 require([
     'backbone',
+    'underscore',
     'bootstrap',
     'core',
     'analytics',
@@ -120,10 +117,11 @@ require([
     'locale',
     'socketio',
     'xregexp',
-], function (Backbone, Bootstrap, Core) {
+], function (Backbone, _, Bootstrap, Core) {
     if (Backbone.History && Backbone.History.started)
         return;
     Backbone.history.start();
+    window._ = _;
 
     /**
      * Application instance with PE namespace defined

apps/spreadsheeteditor/main/app.js

@@ -117,22 +117,20 @@ require.config({
     }
 });
 
-require(['underscore'], function(_) {
-    window._ = _
-})
-
 require([
     'sdk',
     'backbone',
+    'underscore',
     'bootstrap',
     'core',
     'analytics',
     'gateway',
     'locale'
-], function (Sdk, Backbone, Bootstrap, Core) {
+], function (Sdk, Backbone, _, Bootstrap, Core) {
     if (Backbone.History && Backbone.History.started)
         return;
     Backbone.history.start();
+    window._ = _;
 
     /**
      * Application instance with SSE namespace defined

apps/spreadsheeteditor/main/app_dev.js

@@ -107,22 +107,20 @@ require.config({
     }
 });
 
-require(['underscore'], function(_) {
-    window._ = _
-})
-
 require([
     'backbone',
+    'underscore',
     'bootstrap',
     'core',
     'analytics',
     'gateway',
     'locale',
 	'socketio',
-], function (Backbone, Bootstrap, Core) {
+], function (Backbone, _, Bootstrap, Core) {
     if (Backbone.History && Backbone.History.started)
         return;
     Backbone.history.start();
+    window._ = _;
 
     /**
      * Application instance with SSE namespace defined