Changeset 2486:e45e3db10b85

Timestamp:

10/23/13 21:52:57 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

2.6

Message:

Must not open link with class modal in a new window
Closes #1809

Location:

admin

Files:

• js/common.js (modified) (1 diff)
• post.php (modified) (1 diff)

admin/js/common.js

@@ -410 +410 @@
      // manage outgoing links
      $('a').filter(function() {
-          return ((this.hostname && this.hostname!=location.hostname)
+          return ((this.hostname && this.hostname!=location.hostname && !$(this).hasClass('modal'))
                || $(this).hasClass('outgoing'));
      }).each(function() {

admin/post.php

@@ -589 +589 @@
           http::browserUID(DC_MASTER_KEY.$core->auth->userID().$core->auth->getInfo('user_pwd')).
           '/'.$post->post_url);
-          echo '<a id="post-preview" href="'.$preview_url.'" class="button" accesskey="p">'.__('Preview').' (p)'.'</a> ';
+          echo '<a id="post-preview" href="'.$preview_url.'" class="button modal" accesskey="p">'.__('Preview').' (p)'.'</a> ';
      } else {
           echo