[fc] Repository: Products.TinyMCE

Branch: refs/heads/1.3.x Date: 2016-01-21T09:34:08+01:00 Author: Marc Sommerhalder (msom) <marc.sommerhalder@seantis.ch> Commit: plone/Products.TinyMCE@64509e2 Show anchor dropdown for internal links again if it was empty once Files changed: M Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js Repository: Products.TinyMCE Branch: refs/heads/1.3.x Date: 2016-01-22T08:05:36+01:00 Author: Marc Sommerhalder (msom) <marc.sommerhalder@seantis.ch> Commit: plone/Products.TinyMCE@cd934e4 Update history Files changed: M HISTORY.rst Repository: Products.TinyMCE Branch: refs/heads/1.3.x Date: 2016-02-01T09:03:04+01:00 Author: Marc Sommerhalder (msom) <marc.sommerhalder@seantis.ch> Commit: plone/Products.TinyMCE@2ec86e4 Merge branch '1.3.x' into 1.3.x-fix-internal-anchors Files changed: M HISTORY.rst M Products/TinyMCE/browser/atanchors.py Repository: Products.TinyMCE Branch: refs/heads/1.3.x Date: 2016-02-01T09:14:42+01:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/Products.TinyMCE@c3f50cb Merge pull request #131 from plone/1.3.x-fix-internal-anchors Show anchor dropdown for internal links again if it was empty once Files changed: M HISTORY.rst M Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
plone · Feb 1, 2016 · 23668df · 23668df
1 parent 5c07c48
commit 23668df
Showing 1 changed file with 86 additions and 45 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -2,90 +2,87 @@ Repository: Products.TinyMCE
 
 
 Branch: refs/heads/1.3.x
-Date: 2016-01-28T09:39:56+01:00
+Date: 2016-01-21T09:34:08+01:00
 Author: Marc Sommerhalder (msom) <marc.sommerhalder@seantis.ch>
-Commit: https://github.com/plone/Products.TinyMCE/commit/258588c2d525f0d783317ca4c21c101d1ffbe377
+Commit: https://github.com/plone/Products.TinyMCE/commit/64509e2ed8dbb4b1048871f595a4776b7f690eac
 
-Fixed bug where the plonebrowser dialog wouldn't properly populate the anchors if the HTML5 schema was used
+Show anchor dropdown for internal links again if it was empty once
+
+Files changed:
+M Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
+
+diff --git a/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js b/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
+index a36c8b8..fdaf1ee 100644
+--- a/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
++++ b/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
+@@ -800,6 +800,7 @@ BrowserDialog.prototype.setDetails = function (url) {
+                     html += '<option value="' + data.anchors[i] + '">' + data.anchors[i] + '</option>';
+                 }
+                 jq('#pageanchor', document).append(html);
++                jq('#pageanchorcontainer', document).parents('.field').removeClass('hide');
+             } else {
+                 jq('#pageanchorcontainer', document).parents('.field').addClass('hide');
+             }
+
+
+Repository: Products.TinyMCE
+
+
+Branch: refs/heads/1.3.x
+Date: 2016-01-22T08:05:36+01:00
+Author: Marc Sommerhalder (msom) <marc.sommerhalder@seantis.ch>
+Commit: https://github.com/plone/Products.TinyMCE/commit/cd934e4ff4c620cae2bca350d8eb5309053768b0
+
+Update history
 
 Files changed:
 M HISTORY.rst
-M Products/TinyMCE/browser/atanchors.py
 
 diff --git a/HISTORY.rst b/HISTORY.rst
-index 251fa0d..f516a27 100644
+index 251fa0d..2fa2795 100644
 --- a/HISTORY.rst
 +++ b/HISTORY.rst
-@@ -11,7 +11,9 @@ New:
+@@ -11,7 +11,8 @@ New:
 
  Fixes:
 
 -- *add item here*
-+- Fixed bug where the plonebrowser dialog wouldn't properly populate the
-+  anchors if the HTML5 schema was used.
++- Show the anchor dropdown for internal links again if it was empty once.
 +  [msom]
 
 
  1.3.17 (2016-01-08)
-diff --git a/Products/TinyMCE/browser/atanchors.py b/Products/TinyMCE/browser/atanchors.py
-index 0ca7e2b..a55cb58 100644
---- a/Products/TinyMCE/browser/atanchors.py
-+++ b/Products/TinyMCE/browser/atanchors.py
-@@ -18,6 +18,7 @@ def fromstring(text):
-
-     SEARCHPATTERN = "*/a"
-
-+
- class ATAnchorView(BrowserView):
-     implements(IAnchorView)
-
-@@ -38,5 +39,11 @@ def listAnchorNames(self, fieldname=None):
-             raise
-         except Exception:
-             return []
--        return [anchor.get('name') for anchor in tree.findall(SEARCHPATTERN)
--                if "name" in anchor.keys()]
-+
-+        anchors = []
-+        for anchor in tree.findall(SEARCHPATTERN):
-+            if "name" in anchor.keys():
-+                anchors.append(anchor.get('name'))
-+            if "id" in anchor.keys():
-+                anchors.append(anchor.get('id'))
-+        return anchors
 
 
 Repository: Products.TinyMCE
 
 
 Branch: refs/heads/1.3.x
-Date: 2016-01-31T23:56:40+01:00
-Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
-Commit: https://github.com/plone/Products.TinyMCE/commit/b0e4db1f406da8798ab4c2f549e006cfe16e6d62
-
-Merge pull request #132 from plone/1.3.x-fix-anchors
+Date: 2016-02-01T09:03:04+01:00
+Author: Marc Sommerhalder (msom) <marc.sommerhalder@seantis.ch>
+Commit: https://github.com/plone/Products.TinyMCE/commit/2ec86e4ce68b014d42d033dcad9ffc06bb5a67d3
 
-Fix listing of internal anchors in the plonebrowser dialog
+Merge branch '1.3.x' into 1.3.x-fix-internal-anchors
 
 Files changed:
 M HISTORY.rst
 M Products/TinyMCE/browser/atanchors.py
 
 diff --git a/HISTORY.rst b/HISTORY.rst
-index 251fa0d..f516a27 100644
+index 2fa2795..84ca5b1 100644
 --- a/HISTORY.rst
 +++ b/HISTORY.rst
-@@ -11,7 +11,9 @@ New:
+@@ -11,6 +11,10 @@ New:
 
  Fixes:
 
--- *add item here*
 +- Fixed bug where the plonebrowser dialog wouldn't properly populate the
 +  anchors if the HTML5 schema was used.
 +  [msom]
++
+ - Show the anchor dropdown for internal links again if it was empty once.
+   [msom]
 
-
- 1.3.17 (2016-01-08)
 diff --git a/Products/TinyMCE/browser/atanchors.py b/Products/TinyMCE/browser/atanchors.py
 index 0ca7e2b..a55cb58 100644
 --- a/Products/TinyMCE/browser/atanchors.py
@@ -114,3 +111,47 @@ index 0ca7e2b..a55cb58 100644
 +        return anchors
 
 
+Repository: Products.TinyMCE
+
+
+Branch: refs/heads/1.3.x
+Date: 2016-02-01T09:14:42+01:00
+Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
+Commit: https://github.com/plone/Products.TinyMCE/commit/c3f50cbaa40b865c9ad24176ba95dc89764f39a1
+
+Merge pull request #131 from plone/1.3.x-fix-internal-anchors
+
+Show anchor dropdown for internal links again if it was empty once
+
+Files changed:
+M HISTORY.rst
+M Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
+
+diff --git a/HISTORY.rst b/HISTORY.rst
+index f516a27..84ca5b1 100644
+--- a/HISTORY.rst
++++ b/HISTORY.rst
+@@ -15,6 +15,9 @@ Fixes:
+   anchors if the HTML5 schema was used.
+   [msom]
+
++- Show the anchor dropdown for internal links again if it was empty once.
++  [msom]
++
+
+ 1.3.17 (2016-01-08)
+ -------------------
+diff --git a/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js b/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
+index a36c8b8..fdaf1ee 100644
+--- a/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
++++ b/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
+@@ -800,6 +800,7 @@ BrowserDialog.prototype.setDetails = function (url) {
+                     html += '<option value="' + data.anchors[i] + '">' + data.anchors[i] + '</option>';
+                 }
+                 jq('#pageanchor', document).append(html);
++                jq('#pageanchorcontainer', document).parents('.field').removeClass('hide');
+             } else {
+                 jq('#pageanchorcontainer', document).parents('.field').addClass('hide');
+             }
+
+