Merge branch 'master' into frapell-tinymce

CHANGES.rst

@@ -10,6 +10,9 @@ Breaking changes:
 
 New features:
 
+- Include TinyMCE 4.7.13
+  [erral]
+
 - pat-structure: Use the datatables pattern for sorting columns 
   [frapell]
 
@@ -19,7 +22,9 @@ New features:
 - Add a new pattern, to provide the DataTables functionality
   https://datatables.net/
   [frapell]
-- *add item here*
+
+- Add package-lock.json to git. 
+  See https://github.com/npm/npm/blob/v5.0.0/doc/files/package-lock.json.md
 
 Bug fixes:
 
@@ -33,6 +38,13 @@ Bug fixes:
 - fix small message typos
   [tkimnguyen]
 
+- Remove patternslib "This pattern without a name attribute will not be
+  registered!" warnings by setting dummy name and trigger properties.
+  [sunew]
+
+- Fix error when running tests: "Some of your tests did a full page reload!", due to a form submit with no preventDefault.
+  [sunew]
+
 
 2.7.4 (2018-06-21)
 ------------------

bower.json

@@ -45,7 +45,7 @@
     "requirejs-text": "2.0.15",
     "select2": "3.5.4",
     "selectivizr": "1.0.2",
-    "tinymce-builded": "4.7.6",
+    "tinymce-builded": "4.7.13",
     "js-shortcuts": "^1.0.1",
     "cs-jqtree-contextmenu": "^0.1.0"
   },

mockup/patterns/thememapper/pattern.js

@@ -50,6 +50,8 @@ define([
   var inspectorTemplate = _.template(InspectorTemplate);
 
   var Inspector = Base.extend({
+    name: 'thememapper-inspector',
+    trigger: '.pat-thememapper-inspector-dummy',
     defaults: {
       name: 'name',
       ruleBuilder: null,
@@ -505,7 +507,7 @@ define([
           self.hideInspectors();
         }
       });
-      
+
       self.btns.buildRuleButton = new AnchorView({
         id: 'buildrule',
         title: _t('Build rule'),
@@ -588,7 +590,7 @@ define([
         triggerView: self.btns.buildLessButton,
         app: self
       });
-      
+
 
       self.menus.tools = new DropdownView({
         title: _t('Tools'),
@@ -601,7 +603,7 @@ define([
         icon: 'file',
         disable: function() {}
       });
-      
+
       self.buttonGroup = new ButtonGroup({
         items: [
           self.menus.tools,

mockup/patterns/tinymce/js/links.js

@@ -14,6 +14,8 @@ define([
   'use strict';
 
   var LinkType = Base.extend({
+    name: 'linktype',
+    trigger: '.pat-linktype-dummy',
     defaults: {
       linkModal: null // required
     },
@@ -55,6 +57,8 @@ define([
   });
 
   var ExternalLink = LinkType.extend({
+    name: 'externallinktype',
+    trigger: '.pat-externallinktype-dummy',
     init: function() {
       LinkType.prototype.init.call(this);
       this.getEl().on('change', function(){
@@ -73,6 +77,8 @@ define([
   });
 
   var InternalLink = LinkType.extend({
+    name: 'internallinktype',
+    trigger: '.pat-internallinktype-dummy',
     init: function() {
       LinkType.prototype.init.call(this);
       this.getEl().addClass('pat-relateditems');
@@ -134,6 +140,8 @@ define([
   });
 
   var UploadLink = LinkType.extend({
+    name: 'uploadlinktype',
+    trigger: '.pat-uploadlinktype-dummy',
     /* need to do it a bit differently here.
        when a user uploads and tries to upload from
        it, you need to delegate to the real insert
@@ -163,13 +171,17 @@ define([
   });
 
   var ImageLink = InternalLink.extend({
+    name: 'imagelinktype',
+    trigger: '.pat-imagelinktype-dummy',
     toUrl: function() {
       var value = this.value();
       return this.tinypattern.generateImageUrl(value, this.linkModal.$scale.val());
     }
   });
 
   var EmailLink = LinkType.extend({
+    name: 'emaillinktype',
+    trigger: '.pat-emaillinktype-dummy',
     toUrl: function() {
       var self = this;
       var val = self.value();
@@ -201,6 +213,8 @@ define([
   });
 
   var AnchorLink = LinkType.extend({
+    name: 'anchorlinktype',
+    trigger: '.pat-anchorlinktype-dummy',
     init: function() {
       LinkType.prototype.init.call(this);
       this.$select = this.$el.find('select');

mockup/tests/pattern-tinymce-test.js

@@ -507,6 +507,10 @@ define([
       var changed_txt = 'changed contents';
       $editable.html(changed_txt);
       var $form = $container.find('form');
+      // Avoid error when running tests: "Some of your tests did a full page reload!"
+      $container.submit(function(e) {
+        e.preventDefault();
+      });
       $container.trigger('submit');
       expect($el.val()).to.be.equal(changed_txt);
       tinymce.get(0).remove();