Changeset 884448

Timestamp:

03/30/2014 02:28:32 AM (12 years ago)

Author:

gilbarbara

Message:

Better tinyMCE integration

Location:

requird/trunk

Files:

• readme.txt (modified) (2 diffs)
• requird-settings.php (modified) (1 diff)
• requird.js (modified) (4 diffs)
• requird.php (modified) (1 diff)

requird/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 3.x
 Tested up to: 3.8
-Stable tag: 1.2.1
+Stable tag: 1.2.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -55 +55 @@
 = 1.2.1 =
 * Added a link to requird settings on Plug-ins page
+
+= 1.2.2 =
+* Better tinyMCE integration

requird/trunk/requird-settings.php

@@ -32 +32 @@
         add_action('admin_init', array(&$this, 'initialize_options'));
         // Settings page actions
-        $this->version = '1.2.1';
+        $this->version = '1.2.2';
     }
 

requird/trunk/requird.js

@@ -4 +4 @@
 Description: Require fields for WP-Admin
 Writer: Gil Barbara
-Version: 1.2.1
+Version: 1.2.2
 Writer URI: http://kollectiv.org
 */
@@ -17 +17 @@
         },
         requird = {
-        post_type: $('#post_type').val(),
-        fields: requirdOptions[$('#post_type').val()],
-        message: '<div class="requird-fields" style="color:red; font-weight: bold; font-size: 18px; margin:10px 0;">' + requirdOptions.error_message + '</div>',
-        errors: 0
-    };
+            post_type: $('#post_type').val(),
+            fields: requirdOptions[$('#post_type').val()],
+            message: '<div class="requird-fields" style="color:red; font-weight: bold; font-size: 18px; margin:10px 0;">' + requirdOptions.error_message + '</div>',
+            errors: 0
+        };
 
     if (typeof(requird.fields) !== 'undefined' && requird.fields.length) {
+        tinyMCE.triggerSave();
         for(var key in requird.fields) {
             if (requird.fields.hasOwnProperty(key)) {
@@ -31 +32 @@
                 if (requird.$parent.size()) {
                     if (requird.fields[key] === 'editor') {
-                        if ((tinyMCE.activeEditor && !tinyMCE.activeEditor.getContent().length) || !$('#content').val().length) {
+                        if (!$('#content').val().length) {
                             if (!requird.$parent.find('.requird-fields').size()) {
-                                requird.$parent.append(requird.message);
+                                if (requird.$parent.find('.inside').size()) {
+                                    requird.$parent.find('.inside').append(requird.message);
+                                } else {
+                                    requird.$parent.append(requird.message);
+                                }
                             }
                             requird.errors++;
@@ -90 +95 @@
     }
     if (typeof(requirdOptions[requird.post_type+'-custom']) !== 'undefined' && requirdOptions[requird.post_type+'-custom'].length) {
-        requird.custom = requirdOptions[requird.post_type+'-custom'].split(',');
+        requird.custom = requirdOptions[requird.post_type+'-custom'].replace(' ', '').split(',');
         if (requird.custom.length) {
+            tinyMCE.triggerSave();
             for (var key2 in requird.custom) {
                 if (requird.custom.hasOwnProperty(key2)) {
-                    requird.$parent = $('#'+requird.custom[key2]+'div');
-                    requird.$custom = $('#'+requird.custom[key2]);
+                    requird.$parent = $('#' + requird.custom[key2] + 'div');
+                    requird.$custom = $('#' + requird.custom[key2]);
                     if (requird.$custom.size() && requird.$custom.is(':input')) {
                         requird.$parent = $('#'+requird.custom[key2]+'div');

requird/trunk/requird.php

@@ -5 +5 @@
 Description: Require fields for WP-Admin
 Writer: Gil Barbara
-Version: 1.2.1
+Version: 1.2.2
 Writer URI: http://kollectiv.org
 */