mockup/master: Merge branch 'master' into theme-filemanager-searching-featu

Repository: mockup
Branch: refs/heads/master
Date: 2017-06-12T12:43:31Z
Author: Oshane Bailey (b4oshany) <[email protected]>
Commit: https://github.com/plone/mockup/commit/996f67e0b13f3e76ebb8fbe78ecccbe6efdeccc1

Merge branch 'master' into theme-filemanager-searching-feature

Files changed:
M CHANGES.rst
M mockup/js/ui/views/dropdown.js
M mockup/patterns/relateditems/pattern.js
M mockup/patterns/tinymce/js/links.js
M mockup/patterns/tinymce/pattern.js

diff --git a/CHANGES.rst b/CHANGES.rst
index a74c15fe..e8a476db 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -14,7 +14,6 @@ New features:
  - Search for text within files and opening the file upon click
  - Added Bootstrap Dropdown menu to the UI views
  - Added Anchor (a) tag to the UI views
-
  - make thumb size in folder contents listing adjustable/supressable
    replace meaningless paper clip icon (fontello) with mime type icons
    from mimetype registry
@@ -56,6 +55,9 @@ New features:
 
 Bug fixes:
 
+- In the insert link/image modal, pass use the correct related items widget options from the ``linkModal`` attribute.
+  [thet]
+
 - Fixed path to tooltip less files.
   This gave an ugly site in develoment mode when editing the loggedin bundle css.
   Fixes `issue 1843 <https://github.com/plone/Products.CMFPlone/issues/1843>`_.
diff --git a/mockup/js/ui/views/dropdown.js b/mockup/js/ui/views/dropdown.js
index 6e4505a0..9df2b1f2 100644
--- a/mockup/js/ui/views/dropdown.js
+++ b/mockup/js/ui/views/dropdown.js
@@ -21,9 +21,9 @@ define([
 
     renderTitle: function() {
       var title = this.options.title;
-      if(this.options.title == undefined){
+      if(this.options.title === undefined){
         title = this.title;
-        if(this.title == null){
+        if(this.title === null){
           title = "Menu Option";
         }
       }
@@ -34,7 +34,7 @@ define([
       var $container;
 
       if (this.itemContainer !== null) {
-        $container = $(this.itemContainer, this.$el);
+        $container = this.$(this.itemContainer, this.$el);
         if ($container.length === 0) {
           throw 'Item Container element not found.';
         }
@@ -44,7 +44,7 @@ define([
 
       var $item = null;
       _.each(this.items, function(view) {
-        $item = $("<li></li>");
+        $item = this.$("<li></li>");
         $item.append(view.render().$el.removeClass("btn"));
         $container.append($item);
       }, this);
diff --git a/mockup/patterns/relateditems/pattern.js b/mockup/patterns/relateditems/pattern.js
index 00ff3883..f10d3145 100644
--- a/mockup/patterns/relateditems/pattern.js
+++ b/mockup/patterns/relateditems/pattern.js
@@ -98,11 +98,11 @@ define([
   'mockup-utils',
   'pat-registry',
   'translate',
-//  'text!mockup-patterns-relateditems-url/templates/breadcrumb.xml',
-//  'text!mockup-patterns-relateditems-url/templates/favorite.xml',
-//  'text!mockup-patterns-relateditems-url/templates/result.xml',
-//  'text!mockup-patterns-relateditems-url/templates/selection.xml',
-//  'text!mockup-patterns-relateditems-url/templates/toolbar.xml',
+  'text!mockup-patterns-relateditems-url/templates/breadcrumb.xml',
+  'text!mockup-patterns-relateditems-url/templates/favorite.xml',
+  'text!mockup-patterns-relateditems-url/templates/result.xml',
+  'text!mockup-patterns-relateditems-url/templates/selection.xml',
+  'text!mockup-patterns-relateditems-url/templates/toolbar.xml',
   'bootstrap-dropdown'
 ], function($, _, Base, Select2, ButtonView, utils, registry, _t,
             BreadcrumbTemplate,
diff --git a/mockup/patterns/tinymce/js/links.js b/mockup/patterns/tinymce/js/links.js
index db1ce110..0896d58d 100644
--- a/mockup/patterns/tinymce/js/links.js
+++ b/mockup/patterns/tinymce/js/links.js
@@ -84,7 +84,7 @@ define([
     },
 
     createRelatedItems: function() {
-      var options = this.tinypattern.options.relatedItems;
+      var options = this.linkModal.options.relatedItems;
       options.upload = false;  // ensure that related items upload is off.
       this.relatedItems = new RelatedItems(this.getEl(), options);
     },
diff --git a/mockup/patterns/tinymce/pattern.js b/mockup/patterns/tinymce/pattern.js
index 76377961..54f36387 100644
--- a/mockup/patterns/tinymce/pattern.js
+++ b/mockup/patterns/tinymce/pattern.js
@@ -223,11 +223,6 @@ define([
             insertHeading: _t('Insert Image')
           },
           relatedItems: {
-            baseCriteria: [{
-              i: 'portal_type',
-              o: 'plone.app.querystring.operation.list.contains',
-              v: self.options.imageTypes.concat(self.options.folderTypes)
-            }],
             selectableTypes: self.options.imageTypes
           }
         });



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot