10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-15 12:43:33 +09:00
Code Issues Packages Projects Releases Wiki Activity

- fixed conditional js;

Browse Source 
- fixed um_ prefix for role data;
This commit is contained in:
nikitozzzzzzz
2018-11-09 16:21:34 +02:00
parent 8cf1567b91
commit 0ca9213dbe
7 changed files with 605 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/um-conditional.js
+567 -568
View File
File diff suppressed because it is too large Load Diff
assets/js/um-conditional.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
assets/js/um-scripts.js
+2 -2
View File
@@ -124,10 +124,10 @@ jQuery(document).ready(function() {
score: function() {return jQuery(this).attr('data-score');},
scoreName: function(){return jQuery(this).attr('data-key');},
hints: false,
click: function(score, evt) {
click: function( score, evt ) {
live_field = this.id;
live_value = score;
um_conditional();
um_apply_conditions( jQuery(this), false );
}
});
assets/js/um-scripts.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
includes/core/class-enqueue.php
+3 -3
View File
@@ -110,7 +110,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
wp_register_script('um_functions', $this->js_baseurl . 'um-functions' . $this->suffix . '.js', array( 'jquery', 'jquery-masonry', 'wp-util', 'um_scrollbar' ), ultimatemember_version, true );
wp_register_script( 'um-gdpr', $this->js_baseurl . 'um-gdpr' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, false );
wp_register_script('um_conditional', $this->js_baseurl . 'um-conditional' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script('um_scripts', $this->js_baseurl . 'um-scripts' . $this->suffix . '.js', array( 'jquery', 'wp-util' ), ultimatemember_version, true );
wp_register_script('um_scripts', $this->js_baseurl . 'um-scripts' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'um_conditional' ), ultimatemember_version, true );
/**
* UM hook
*
@@ -155,8 +155,8 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
wp_register_style( 'select2', $this->css_baseurl . 'select2/select2.min.css', array(), ultimatemember_version );
wp_register_style( 'um_fileupload', $this->css_baseurl . 'um-fileupload.css', array(), ultimatemember_version );
wp_register_style( 'um_datetime', $this->css_baseurl . 'pickadate/default.css', array(), ultimatemember_version );
wp_register_style( 'um_datetime_date', $this->css_baseurl . 'pickadate/default.date.css', array( 'um-datetime' ), ultimatemember_version );
wp_register_style( 'um_datetime_time', $this->css_baseurl . 'pickadate/default.time.css', array( 'um-datetime' ), ultimatemember_version );
wp_register_style( 'um_datetime_date', $this->css_baseurl . 'pickadate/default.date.css', array( 'um_datetime' ), ultimatemember_version );
wp_register_style( 'um_datetime_time', $this->css_baseurl . 'pickadate/default.time.css', array( 'um_datetime' ), ultimatemember_version );
wp_register_style( 'um_scrollbar', $this->css_baseurl . 'um-scrollbar.css', array(), ultimatemember_version );
wp_register_style( 'um_rtl', $this->css_baseurl . 'um.rtl.css', array(), ultimatemember_version );
includes/core/class-roles-capabilities.php
+5 -2
View File
@@ -530,8 +530,11 @@ if ( ! class_exists( 'um\core\Roles_Capabilities' ) ) {
$temp = array();
foreach ( $role_data as $key=>$value ) {
if ( strpos( $key, '_um_' ) === 0 )
$key = str_replace( '_um_', '', $key );
if ( strpos( $key, '_um_' ) === 0 ) {
$key = preg_replace('/_um_/', '', $key, 1);
}
//$key = str_replace( '_um_', '', $key, $count );
$temp[ $key ] = $value;
}
languages/ultimate-member-en_US.po
+26 -37
View File
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Ultimate Member\n"
"POT-Creation-Date: 2018-10-26 14:45+0300\n"
"PO-Revision-Date: 2018-10-26 14:46+0300\n"
"POT-Creation-Date: 2018-11-09 16:19+0200\n"
"PO-Revision-Date: 2018-11-09 16:19+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: en_US\n"
@@ -6195,48 +6195,42 @@ msgstr ""
msgid "just now"
msgstr ""
#: includes/core/class-date-time.php:62
#: includes/core/class-date-time.php:63
#, php-format
msgid "%s min"
msgstr ""
msgid_plural "%s mins"
msgstr[0] ""
msgstr[1] ""
#: includes/core/class-date-time.php:64
#, php-format
msgid "%s mins"
msgstr ""
#: includes/core/class-date-time.php:73
#: includes/core/class-date-time.php:72
#, php-format
msgid "%s hr"
msgstr ""
msgid_plural "%s hrs"
msgstr[0] ""
msgstr[1] ""
#: includes/core/class-date-time.php:75
#, php-format
msgid "%s hrs"
msgstr ""
#: includes/core/class-date-time.php:84
#: includes/core/class-date-time.php:82
#, php-format
msgid "Yesterday at %s"
msgstr ""
#: includes/core/class-date-time.php:86 includes/core/class-date-time.php:91
#: includes/core/class-date-time.php:95 includes/core/class-date-time.php:99
#: includes/core/class-date-time.php:84 includes/core/class-date-time.php:89
#: includes/core/class-date-time.php:93 includes/core/class-date-time.php:97
#, php-format
msgid "%s at %s"
msgstr ""
#: includes/core/class-date-time.php:148
#: includes/core/class-date-time.php:146
#, php-format
msgid "%s year old"
msgstr ""
#: includes/core/class-date-time.php:151
#: includes/core/class-date-time.php:149
#, php-format
msgid "%s years old"
msgstr ""
#: includes/core/class-date-time.php:154
#: includes/core/class-date-time.php:152
msgid "Less than 1 year old"
msgstr ""
@@ -6313,7 +6307,7 @@ msgstr ""
msgid "Upload File"
msgstr ""
#: includes/core/class-fields.php:2364 includes/core/um-filters-fields.php:243
#: includes/core/class-fields.php:2364 includes/core/um-filters-fields.php:244
msgid "This file has been removed."
msgstr ""
@@ -6530,36 +6524,36 @@ msgid ""
"\"{login_referrer}\">login</a> to view this content."
msgstr ""
#: includes/core/class-shortcodes.php:644
#: includes/core/class-shortcodes.php:645
msgid "You are already registered"
msgstr ""
#: includes/core/class-shortcodes.php:886
#: includes/core/class-shortcodes.php:887
msgid "Default Template"
msgstr ""
#: includes/core/class-uploader.php:648
#: includes/core/class-uploader.php:654
msgid "Your image is invalid!"
msgstr ""
#: includes/core/class-uploader.php:690
#: includes/core/class-uploader.php:696
msgid "This media type is not recognized."
msgstr ""
#: includes/core/class-uploader.php:738
#: includes/core/class-uploader.php:744
msgid "Your image is invalid or too large!"
msgstr ""
#: includes/core/class-uploader.php:744 includes/core/class-uploader.php:746
#: includes/core/class-uploader.php:750 includes/core/class-uploader.php:752
#, php-format
msgid "Your photo is too small. It must be at least %spx wide."
msgstr ""
#: includes/core/class-uploader.php:799
#: includes/core/class-uploader.php:805
msgid "This file type is not recognized."
msgstr ""
#: includes/core/class-uploader.php:1065
#: includes/core/class-uploader.php:1071
#, php-format
msgid "Maximum file size allowed: %s"
msgstr ""
@@ -6950,12 +6944,7 @@ msgstr ""
msgid "Joined %s"
msgstr ""
#: includes/core/um-filters-fields.php:133
#, php-format
msgid "Last login: %s"
msgstr ""
#: includes/core/um-filters-fields.php:274
#: includes/core/um-filters-fields.php:275
msgid "Untitled photo"
msgstr ""