Merge branch 'master' of https://github.com/ultimatemember/ultimatemember into release/2.0

ISSUE_TEMPLATE.md

@@ -0,0 +1,14 @@
+### Ultimate Member Version
+Tell us what UM core version you use. Do you use UM extensions? Tell us which UM extensions and what are their versions.
+
+### Subject of the issue
+Describe your issue here.
+
+### Expected behavior
+Tell us what should happen
+
+### Actual behavior
+Tell us what happens instead
+
+### Steps to reproduce the behavior
+Tell us how to reproduce this issue. 

assets/js/um-conditional.js

@@ -315,20 +315,24 @@ jQuery(document).ready( function (){
 
         if (condition.action == 'show' && is_true /*&& child_dom.is(':hidden')*/) {
             child_dom.show();
+            _show_in_ie( child_dom );
             um_field_restore_default_value(child_dom);
         }
 
         if (condition.action == 'show' && !is_true /*&& child_dom.is(':visible') */) {
             child_dom.hide();
+            _hide_in_ie( child_dom );
         }
 
         if (condition.action == 'hide' && is_true  /*&& child_dom.is(':visible')*/) {
             child_dom.hide();
-        }
+             _hide_in_ie( child_dom );
+       }
 
         if (condition.action == 'hide' && !is_true /*&& child_dom.is(':hidden')*/) {
             child_dom.show();
-            um_field_restore_default_value(child_dom);
+            _show_in_ie( child_dom );
+            um_field_restore_default_value( child_dom );
 
         }
         $dom.removeClass('um-field-has-changed');
@@ -452,6 +456,26 @@ jQuery(document).ready( function (){
 
     }
 
+    /**
+     * Hides div for IE browser
+     * @param  object $dom
+     */
+    function _hide_in_ie( $dom ){
+        if( jQuery.browser.msie ){
+           $dom.css({"visibility":"hidden"});
+        }
+    }
+
+    /**
+     * Shows div for IE browser
+     * @param  object $dom
+     */
+    function _show_in_ie( $dom ){
+        if( jQuery.browser.msie ){
+           $dom.css({"visibility":"visible"});
+        }
+    }
+
     jQuery(document).on('change', '.um-field select, .um-field input[type=radio], .um-field input[type=checkbox]', function () {
         var me = jQuery(this);
         um_apply_conditions(me, false);

gulpfile.js

@@ -8,7 +8,7 @@ var gulp = require('gulp')
 
 // task
 gulp.task( 'default', function () {
-    gulp.src('assets/js/*.js') // path to your files
+    gulp.src(['assets/js/*.js', '!assets/js/*.min.js', ]) // path to your files
         .pipe( uglify() )
         .pipe( rename({ suffix: '.min' }) )
         .pipe( gulp.dest( 'assets/js/*' ) );

includes/core/class-enqueue.php

@@ -36,8 +36,8 @@ if ( ! class_exists( 'Enqueue' ) ) {
         function wp_enqueue_scripts() {
             global $post;
 
-            $this->suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
+            $this->suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || defined('UM_SCRIPT_DEBUG') ) ? '' : '.min';
+            
             $exclude = um_get_option('js_css_exclude');
             if ( is_array( $exclude ) ) {
                 array_filter( $exclude );