Advertisement
Guest User

Untitled

a guest
May 24th, 2014
182
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.19 KB | None | 0 0
  1. diff -wur a/Theme Files/magzimize/functions/admin/admin-style.css magzimize/functions/admin/admin-style.css
  2. --- a/Theme Files/magzimize/functions/admin/admin-style.css     2014-05-07 15:56:08.000000000 +0100
  3. +++ magzimize/functions/admin/admin-style.css   2013-03-06 18:39:06.000000000 +0000
  4. @@ -215,7 +215,7 @@
  5.         border-radius: 3px;
  6.  }
  7.  .single-collective{
  8. -       width: 264px;
  9. +       width: 274px;
  10.         float: left;
  11.         list-style: none;
  12.         background: #FFFFFF;
  13. diff -wur a/Theme Files/magzimize/functions/js/jquery.custom.admin.js magzimize/functions/js/jquery.custom.admin.js
  14. --- a/Theme Files/magzimize/functions/js/jquery.custom.admin.js 2014-05-07 15:11:38.000000000 +0100
  15. +++ magzimize/functions/js/jquery.custom.admin.js       2013-08-21 09:50:22.000000000 +0100
  16. @@ -118,7 +118,7 @@
  17.                         revert: true
  18.                 });
  19.                
  20. -               jQuery( ".collective-canvas > .single-collective:not(.single-master)" ).draggable({
  21. +               jQuery( ".collective-canvas > single-collective:not(.single-master)" ).draggable({
  22.                         connectToSortable: ".collective-canvas",
  23.                         revert: "invalid",
  24.                         handle: "div.sc_panel"
  25. diff -wur a/Theme Files/magzimize/functions/shortcodes/qa/mce_plugin.js magzimize/functions/shortcodes/qa/mce_plugin.js
  26. --- a/Theme Files/magzimize/functions/shortcodes/qa/mce_plugin.js       2014-05-07 14:59:06.000000000 +0100
  27. +++ magzimize/functions/shortcodes/qa/mce_plugin.js     2013-03-06 18:39:06.000000000 +0000
  28. @@ -12,7 +12,7 @@
  29.                         // Register example button
  30.                         ed.addButton('qa_button_shortcodes', {
  31.                                 title : 'Insert Question and Answer',
  32. -                               //cmd : 'qa_button_shortcodes',
  33. +                               cmd : 'qa_button_shortcodes',
  34.                                 image : url + '/icon.png',
  35.                                 onclick : function() {  
  36.                                         ed.selection.setContent('[chat question="Your question here?"]</br>Your answer here </br>[/chat]');
  37. diff -wur a/Theme Files/magzimize/functions/shortcodes/quote/mce_plugin.js magzimize/functions/shortcodes/quote/mce_plugin.js
  38. --- a/Theme Files/magzimize/functions/shortcodes/quote/mce_plugin.js    2014-05-07 14:59:18.000000000 +0100
  39. +++ magzimize/functions/shortcodes/quote/mce_plugin.js  2013-03-06 18:39:06.000000000 +0000
  40. @@ -12,7 +12,7 @@
  41.                         // Register example button
  42.                         ed.addButton('quote_button_shortcodes', {
  43.                                 title : 'Insert Quote',
  44. -                       //      cmd : 'quote_button_shortcodes',
  45. +                               cmd : 'quote_button_shortcodes',
  46.                                 image : url + '/icon.png',
  47.                                 onclick : function() {  
  48.                                         ed.selection.setContent('[quote]Your Quote here[/quote]');
  49. diff -wur a/Theme Files/magzimize/functions/shortcodes/shortcodes_function.js magzimize/functions/shortcodes/shortcodes_function.js
  50. --- a/Theme Files/magzimize/functions/shortcodes/shortcodes_function.js 2014-05-07 12:31:40.000000000 +0100
  51. +++ magzimize/functions/shortcodes/shortcodes_function.js       2013-03-06 18:39:06.000000000 +0000
  52. @@ -47,8 +47,7 @@
  53.                 $('#insertCode').click(function (){
  54.                         if($selectedShortcode != 'none') {
  55.                        
  56. -//                             var inst = tinyMCE.getInstanceById('content');
  57. -                               var inst = tinyMCE.get('content');
  58. +                               var inst = tinyMCE.getInstanceById('content');
  59.                                 var html = inst.selection.getContent();
  60.                                
  61.                                 var shortcodeData = '';
  62. @@ -92,8 +91,7 @@
  63.                                                 break;
  64.                                 }
  65.                                        
  66. -//                             window.tinyMCE.execInstanceCommand('content', 'mceInsertContent', false, shortcodeData);
  67. -                               window.tinyMCE.execCommand('mceInsertContent', false, shortcodeData);
  68. +                               window.tinyMCE.execInstanceCommand('content', 'mceInsertContent', false, shortcodeData);
  69.                                 tinyMCEPopup.editor.execCommand('mceRepaint');
  70.                                 tinyMCEPopup.close();
  71.                                
  72. diff -wur a/Theme Files/magzimize/functions.php magzimize/functions.php
  73. --- a/Theme Files/magzimize/functions.php       2014-05-07 15:55:54.000000000 +0100
  74. +++ magzimize/functions.php     2013-08-15 16:23:00.000000000 +0100
  75. @@ -163,7 +163,7 @@
  76.  
  77.      function vpt_admin_js($hook) {
  78.          if ($hook == 'post.php' || $hook == 'post-new.php') {
  79. -            wp_register_script('vpt-admin', get_template_directory_uri() . '/functions/js/jquery.custom.admin.js', array('jquery','jquery-ui-draggable'));
  80. +            wp_register_script('vpt-admin', get_template_directory_uri() . '/functions/js/jquery.custom.admin.js', 'jquery');
  81.              wp_enqueue_script('vpt-admin');
  82.          }
  83.      }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement