Merge branch 'feature/jquery-3.2.1' into develop

apps/common/embed/resources/less/common.less

@@ -563,6 +563,10 @@
             background-position: 0 -22px;
         }
     }
+
+    a {
+        cursor: pointer;
+    }
 }
 
 .masked {

apps/common/main/lib/component/Button.js

@@ -487,12 +487,12 @@ define([
                 this.caption = caption;
 
                 if (this.rendered) {
-                    var captionNode = this.cmpEl.find('button:first > .caption').andSelf().filter('button > .caption');
+                    var captionNode = this.cmpEl.find('button:first > .caption').addBack().filter('button > .caption');
 
                     if (captionNode.length > 0) {
                         captionNode.text(caption);
                     } else {
-                        this.cmpEl.find('button:first').andSelf().filter('button').text(caption);
+                        this.cmpEl.find('button:first').addBack().filter('button').text(caption);
                     }
                 }
             }

apps/common/main/lib/component/DataView.js

@@ -297,7 +297,7 @@ define([
 
             if (_.isUndefined(this.scroller) && this.allowScrollbar) {
                 this.scroller = new Common.UI.Scroller({
-                    el: $(this.el).find('.inner').andSelf().filter('.inner'),
+                    el: $(this.el).find('.inner').addBack().filter('.inner'),
                     useKeyboard: this.enableKeyEvents && !this.handleSelect,
                     minScrollbarLength  : 40,
                     wheelSpeed: 10
@@ -394,7 +394,7 @@ define([
             });
 
             if (view) {
-                var innerEl = $(this.el).find('.inner').andSelf().filter('.inner');
+                var innerEl = $(this.el).find('.inner').addBack().filter('.inner');
 
                 if (this.groups && this.groups.length > 0) {
                     var group = this.groups.findWhere({id: record.get('group')});
@@ -452,7 +452,7 @@ define([
             }
 
             if (this.store.length < 1 && this.emptyText.length > 0)
-                $(this.el).find('.inner').andSelf().filter('.inner').append('<table cellpadding="10" class="empty-text"><tr><td>' + this.emptyText + '</td></tr></table>');
+                $(this.el).find('.inner').addBack().filter('.inner').append('<table cellpadding="10" class="empty-text"><tr><td>' + this.emptyText + '</td></tr></table>');
 
             _.each(this.dataViewItems, function(item) {
                 this.stopListening(item);
@@ -464,7 +464,7 @@ define([
 
             if (this.allowScrollbar) {
                 this.scroller = new Common.UI.Scroller({
-                    el: $(this.el).find('.inner').andSelf().filter('.inner'),
+                    el: $(this.el).find('.inner').addBack().filter('.inner'),
                     useKeyboard: this.enableKeyEvents && !this.handleSelect,
                     minScrollbarLength  : 40,
                     wheelSpeed: 10
@@ -487,7 +487,7 @@ define([
             view.stopListening();
 
             if (this.store.length < 1 && this.emptyText.length > 0) {
-                var el = $(this.el).find('.inner').andSelf().filter('.inner');
+                var el = $(this.el).find('.inner').addBack().filter('.inner');
                 if ( el.find('.empty-text').length<=0 )
                     el.append('<table cellpadding="10" class="empty-text"><tr><td>' + this.emptyText + '</td></tr></table>');
             }
@@ -653,7 +653,7 @@ define([
 
         attachKeyEvents: function() {
             if (this.enableKeyEvents && this.handleSelect) {
-                var el = $(this.el).find('.inner').andSelf().filter('.inner');
+                var el = $(this.el).find('.inner').addBack().filter('.inner');
                 el.addClass('canfocused');
                 el.attr('tabindex', '0');
                 el.on((this.parentMenu && this.useBSKeydown) ? 'dataview:keydown' : 'keydown', _.bind(this.onKeyDown, this));
@@ -673,7 +673,7 @@ define([
 
         setDisabled: function(disabled) {
             this.disabled = disabled;
-            $(this.el).find('.inner').andSelf().filter('.inner').toggleClass('disabled', disabled);
+            $(this.el).find('.inner').addBack().filter('.inner').toggleClass('disabled', disabled);
         },
 
         isDisabled: function() {
@@ -688,7 +688,7 @@ define([
             var menuRoot = (this.parentMenu.cmpEl.attr('role') === 'menu')
                             ? this.parentMenu.cmpEl
                             : this.parentMenu.cmpEl.find('[role=menu]'),
-                innerEl = $(this.el).find('.inner').andSelf().filter('.inner'),
+                innerEl = $(this.el).find('.inner').addBack().filter('.inner'),
                 docH = Common.Utils.innerHeight(),
                 menuH = menuRoot.outerHeight(),
                 top = parseInt(menuRoot.css('top'));

apps/common/main/lib/component/InputField.js

@@ -150,7 +150,7 @@ define([
                 if (!me.rendered) {
                     var el = this.cmpEl;
 
-                    this._input = this.cmpEl.find('input').andSelf().filter('input');
+                    this._input = this.cmpEl.find('input').addBack().filter('input');
 
                     if (this.editable) {
                         this._input.on('blur',   _.bind(this.onInputChanged, this));

apps/common/main/lib/component/Window.js

@@ -695,7 +695,7 @@ define([
                         hide_mask = true;
                     mask.attr('counter', parseInt(mask.attr('counter'))-1);
 
-                    if (this.$lastmodal.size() > 0) {
+                    if (this.$lastmodal.length > 0) {
                         this.$lastmodal.removeClass('dethrone');
                         hide_mask = !(this.$lastmodal.hasClass('modal') && this.$lastmodal.is(':visible'));
                     }
@@ -736,7 +736,7 @@ define([
                             hide_mask = true;
                         mask.attr('counter', parseInt(mask.attr('counter'))-1);
 
-                        if (this.$lastmodal.size() > 0) {
+                        if (this.$lastmodal.length > 0) {
                             this.$lastmodal.removeClass('dethrone');
                             hide_mask = !(this.$lastmodal.hasClass('modal') && this.$lastmodal.is(':visible'));
                         }

apps/common/main/lib/extend/Bootstrap.js

@@ -81,8 +81,8 @@ function patchDropDownKeyDown(e) {
     if (!isActive || (isActive && e.keyCode == 27)) {
         if (e.which == 27) {
             $items = $('[role=menu] li.dropdown-submenu.over:visible', $parent);
-            if ($items.size()) {
-                $items.eq($items.size()-1).removeClass('over');
+            if ($items.length) {
+                $items.eq($items.length-1).removeClass('over');
                 return false;
             } else if ($parent.hasClass('dropdown-submenu') && $parent.hasClass('over')) {
                 $parent.removeClass('over');

apps/documenteditor/embed/js/ApplicationView.js

@@ -41,10 +41,10 @@ var ApplicationView = new(function(){
         $btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true');
         $btnTools.parent().append(
             '<ul class="dropdown-menu">' +
-                '<li><a id="idt-download" href="#"><span class="mi-icon svg-icon download"></span>Download</a></li>' +
-                '<li><a id="idt-share" href="#" data-toggle="modal"><span class="mi-icon svg-icon share"></span>Share</a></li>' +
-                '<li><a id="idt-embed" href="#" data-toggle="modal"><span class="mi-icon svg-icon embed"></span>Embed</a></li>' +
-                '<li><a id="idt-fullscreen" href="#"><span class="mi-icon svg-icon fullscr"></span>Full Screen</a></li>' +
+                '<li><a id="idt-download"><span class="mi-icon svg-icon download"></span>Download</a></li>' +
+                '<li><a id="idt-share" data-toggle="modal"><span class="mi-icon svg-icon share"></span>Share</a></li>' +
+                '<li><a id="idt-embed" data-toggle="modal"><span class="mi-icon svg-icon embed"></span>Embed</a></li>' +
+                '<li><a id="idt-fullscreen"><span class="mi-icon svg-icon fullscr"></span>Full Screen</a></li>' +
             '</ul>');
     }
 

apps/documenteditor/main/app/controller/Main.js

@@ -202,13 +202,13 @@ define([
                             me.api.asc_enableKeyEvents(false);
                         },
                         'modal:close': function(dlg) {
-                            if (dlg && dlg.$lastmodal && dlg.$lastmodal.size() < 1) {
+                            if (dlg && dlg.$lastmodal && dlg.$lastmodal.length < 1) {
                                 me.isModalShowed = false;
                                 me.api.asc_enableKeyEvents(true);
                             }
                         },
                         'modal:hide': function(dlg) {
-                            if (dlg && dlg.$lastmodal && dlg.$lastmodal.size() < 1) {
+                            if (dlg && dlg.$lastmodal && dlg.$lastmodal.length < 1) {
                                 me.isModalShowed = false;
                                 me.api.asc_enableKeyEvents(true);
                             }

apps/presentationeditor/embed/js/ApplicationView.js

@@ -41,10 +41,10 @@ var ApplicationView = new(function(){
         $btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true');
         $btnTools.parent().append(
             '<ul class="dropdown-menu">' +
-            '<li><a id="idt-download" href="#"><span class="mi-icon svg-icon download"></span>Download</a></li>' +
-            '<li><a id="idt-share" href="#" data-toggle="modal"><span class="mi-icon svg-icon share"></span>Share</a></li>' +
-            '<li><a id="idt-embed" href="#" data-toggle="modal"><span class="mi-icon svg-icon embed"></span>Embed</a></li>' +
-            '<li><a id="idt-fullscreen" href="#"><span class="mi-icon svg-icon fullscr"></span>Full Screen</a></li>' +
+            '<li><a id="idt-download"><span class="mi-icon svg-icon download"></span>Download</a></li>' +
+            '<li><a id="idt-share" data-toggle="modal"><span class="mi-icon svg-icon share"></span>Share</a></li>' +
+            '<li><a id="idt-embed" data-toggle="modal"><span class="mi-icon svg-icon embed"></span>Embed</a></li>' +
+            '<li><a id="idt-fullscreen"><span class="mi-icon svg-icon fullscr"></span>Full Screen</a></li>' +
             '</ul>');
     }
 

apps/presentationeditor/main/app/controller/Main.js

@@ -192,13 +192,13 @@ define([
                             me.api.asc_enableKeyEvents(false);
                         },
                         'modal:close': function(dlg) {
-                            if (dlg && dlg.$lastmodal && dlg.$lastmodal.size() < 1) {
+                            if (dlg && dlg.$lastmodal && dlg.$lastmodal.length < 1) {
                                 me.isModalShowed = false;
                                 me.api.asc_enableKeyEvents(true);
                             }
                         },
                         'modal:hide': function(dlg) {
-                            if (dlg && dlg.$lastmodal && dlg.$lastmodal.size() < 1) {
+                            if (dlg && dlg.$lastmodal && dlg.$lastmodal.length < 1) {
                                 me.isModalShowed = false;
                                 me.api.asc_enableKeyEvents(true);
                             }

apps/spreadsheeteditor/embed/js/ApplicationView.js

@@ -42,10 +42,10 @@ var ApplicationView = new(function(){
         $btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true');
         $btnTools.parent().append(
             '<ul class="dropdown-menu">' +
-                '<li><a id="idt-download" href="#"><span class="mi-icon svg-icon download"></span>Download</a></li>' +
-                '<li><a id="idt-share" href="#" data-toggle="modal"><span class="mi-icon svg-icon share"></span>Share</a></li>' +
-                '<li><a id="idt-embed" href="#" data-toggle="modal"><span class="mi-icon svg-icon embed"></span>Embed</a></li>' +
-                '<li><a id="idt-fullscreen" href="#"><span class="mi-icon svg-icon fullscr"></span>Full Screen</a></li>' +
+                '<li><a id="idt-download"><span class="mi-icon svg-icon download"></span>Download</a></li>' +
+                '<li><a id="idt-share" data-toggle="modal"><span class="mi-icon svg-icon share"></span>Share</a></li>' +
+                '<li><a id="idt-embed" data-toggle="modal"><span class="mi-icon svg-icon embed"></span>Embed</a></li>' +
+                '<li><a id="idt-fullscreen"><span class="mi-icon svg-icon fullscr"></span>Full Screen</a></li>' +
             '</ul>');
     }
 

apps/spreadsheeteditor/main/app/controller/Main.js

@@ -202,13 +202,13 @@ define([
                         me.api.asc_enableKeyEvents(false);
                     },
                     'modal:close': function(dlg) {
-                        if (dlg && dlg.$lastmodal && dlg.$lastmodal.size() < 1) {
+                        if (dlg && dlg.$lastmodal && dlg.$lastmodal.length < 1) {
                             me.isModalShowed = false;
                             me.api.asc_enableKeyEvents(true);
                         }
                     },
                     'modal:hide': function(dlg) {
-                        if (dlg && dlg.$lastmodal && dlg.$lastmodal.size() < 1) {
+                        if (dlg && dlg.$lastmodal && dlg.$lastmodal.length < 1) {
                             me.isModalShowed = false;
                             me.api.asc_enableKeyEvents(true);
                         }

vendor/jquery/README.md

 jQuery Component
 ================
 
-Shim repository for the [jQuery](http://jquery.com).
+Shim [repository](https://github.com/components/jquery) for the [jQuery](http://jquery.com).
+
+If you're looking for jquery-migrate: It got it's [own repository](https://github.com/components/jquery-migrate) since jQuery v3.0.0.
 
 Package Managers
 ----------------
@@ -9,3 +11,4 @@ Package Managers
 * [Bower](http://bower.io/): `jquery`
 * [Component](https://github.com/component/component): `components/jquery`
 * [Composer](http://packagist.org/packages/components/jquery): `components/jquery`
+* [spm](http://spmjs.io/package/jquery): `jquery`

vendor/jquery/bower.json

 {
-  "name": "jquery",
-  "version": "2.0.3",
-  "description": "jQuery component",
-  "keywords": [
-    "jquery",
-    "component"
-  ],
-  "main": "jquery.js",
-  "license": "MIT"
+    "name": "jquery",
+    "version": "3.2.1",
+    "description": "jQuery component",
+    "license": "MIT",
+    "keywords": [
+        "jquery",
+        "component"
+    ],
+    "main": "jquery.js",
+    "ignore": [
+        "component.json",
+        "package.json",
+        "composer.json"
+    ]
 }

vendor/jquery/component.json

 {
-  "name": "jquery",
-  "repo": "components/jquery",
-  "version": "2.0.3",
-  "description": "jQuery component",
-  "keywords": [
-    "jquery",
-    "component"
-  ],
-  "main": "jquery.js",
-  "scripts": [
-    "jquery.js"
-  ],
-  "license": "MIT"
+    "name": "jquery",
+    "repo": "components/jquery",
+    "version": "3.2.1",
+    "description": "jQuery component",
+    "license": "MIT",
+    "keywords": [
+        "jquery",
+        "component"
+    ],
+    "main": "jquery.js",
+    "scripts": [
+        "jquery.js",
+        "jquery.min.js",
+        "jquery.slim.js",
+        "jquery.slim.min.js"
+    ],
+    "files": [
+        "jquery.min.map",
+        "jquery.slim.min.map"
+    ]
 }

vendor/jquery/composer.json

@@ -6,20 +6,17 @@
     "license": "MIT",
     "support": {
         "irc": "irc://irc.freenode.org/jquery",
-        "issues": "http://bugs.jquery.com",
+        "issues": "https://github.com/jquery/jquery/issues",
         "forum": "http://forum.jquery.com",
         "wiki": "http://docs.jquery.com/",
         "source": "https://github.com/jquery/jquery"
     },
     "authors": [
         {
-            "name": "John Resig",
-            "email": "jeresig@gmail.com"
+            "name": "JS Foundation and other contributors",
+            "url": "https://github.com/jquery/jquery/blob/master/AUTHORS.txt"
         }
     ],
-    "require": {
-        "robloach/component-installer": "*"
-    },
     "extra": {
         "component": {
             "scripts": [
@@ -27,8 +24,10 @@
             ],
             "files": [
                 "jquery.min.js",
-                "jquery-migrate.js",
-                "jquery-migrate.min.js"
+                "jquery.min.map",
+                "jquery.slim.js",
+                "jquery.slim.min.js",
+                "jquery.slim.min.map"
             ]
         }
     }

vendor/jquery/package.json

 {
-  "name": "components-jquery",
-  "version": "2.0.3",
-  "description": "jQuery component",
-  "keywords": ["jquery"],
-  "main": "./jquery.js"
+    "name": "jquery",
+    "description": "JavaScript library for DOM operations",
+    "version": "3.2.1",
+    "homepage": "http://jquery.com",
+    "author": {
+        "name": "jQuery Foundation and other contributors",
+        "url": "https://github.com/jquery/jquery/blob/master/AUTHORS.txt"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/jquery/jquery.git"
+    },
+    "keywords": [
+        "jquery",
+        "javascript",
+        "browser",
+        "library"
+    ],
+    "bugs": {
+        "url": "https://github.com/jquery/jquery/issues"
+    },
+    "licenses": [
+        {
+            "type": "MIT",
+            "url": "https://github.com/jquery/jquery/blob/master/LICENSE.txt"
+        }
+    ],
+    "spm": {
+        "main": "jquery.js"
+    }
 }
+