Patch wijutil, in visibility mechanism for avoid recursive loop

Remove unnecessary refresh in appdesk
novius-os · Jan 28, 2014 · 2c10051 · 2c10051
1 parent cff5ea8
commit 2c10051
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 60 deletions.
diff --git a/static/admin/bundle/nos.min.js b/static/admin/bundle/nos.min.js
diff --git a/static/admin/bundle/vendor.min.js b/static/admin/bundle/vendor.min.js
diff --git a/static/admin/novius-os/js/jquery.novius-os.appdesk.js b/static/admin/novius-os/js/jquery.novius-os.appdesk.js
@@ -1475,8 +1475,7 @@ define('jquery-nos-appdesk',
                         borderRightWidth : '0px'
                     })
                     .end()
-                    .wijsplitter('option', 'panel1', {collapsed : true})
-                    .wijsplitter('refresh', true, false);
+                    .wijsplitter('option', 'panel1', {collapsed : true});
 
                 return self;
             },
@@ -1490,8 +1489,7 @@ define('jquery-nos-appdesk',
                         borderTopWidth : '0px'
                     })
                     .end()
-                    .wijsplitter('option', 'panel1', {collapsed : true})
-                    .wijsplitter('refresh', true, false);
+                    .wijsplitter('option', 'panel1', {collapsed : true});
 
                 return self;
             },
@@ -1518,8 +1516,7 @@ define('jquery-nos-appdesk',
                 var self = this,
                     o = self.options;
 
-                self.uiSplitterVertical.wijsplitter('refresh', true, false);
-                self.uiSplitterHorizontal.wijsplitter('refresh', true, false);
+                self.uiSplitterVertical.wijsplitter('refresh');
 
                 self._resizeInspectorsV()
                     ._resizeInspectorsH()

diff --git a/static/admin/vendor/wijmo/js/wijutil/jquery.wijmo.wijutil.js b/static/admin/vendor/wijmo/js/wijutil/jquery.wijmo.wijutil.js
@@ -4,7 +4,7 @@
  * http://wijmo.com/
  *
  * Copyright(c) GrapeCity, Inc.  All rights reserved.
- * 
+ *
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * licensing@wijmo.com
  * http://wijmo.com/widgets/license/
@@ -53,7 +53,7 @@ var wijmo;
                         }
                     } catch (e) {
                     }//fixed bug 26153
-                    
+
                 }
                 var te = val.substring(s, e);
                 return {
@@ -134,9 +134,16 @@ var wijmo;
             return this.each(function () {
                 var $el = $(this);
                 if($el.hasClass("wijmo-wijobserver-visibility")) {
-                    $el.trigger("wijmovisibilitychanged");
+                    // Novius OS add .wijmo-wijobserver-visibility-exec (like in nosOnShow) for avoid recursive loops
+                    $el.not('.wijmo-wijobserver-visibility-exec').addClass('wijmo-wijobserver-visibility-exec')
+                        .trigger("wijmovisibilitychanged")
+                        .removeClass('wijmo-wijobserver-visibility-exec');
                 }
-                $el.find(".wijmo-wijobserver-visibility").trigger("wijmovisibilitychanged");
+                // Novius OS add .wijmo-wijobserver-visibility-exec (like in nosOnShow) for avoid recursive loops
+                $el.find(".wijmo-wijobserver-visibility")
+                    .not('.wijmo-wijobserver-visibility-exec').addClass('wijmo-wijobserver-visibility-exec')
+                    .trigger("wijmovisibilitychanged")
+                    .removeClass('wijmo-wijobserver-visibility-exec');
             });
         },
         leftBorderWidth: function () {
@@ -327,9 +334,9 @@ var wijmo;
                 zIndex: element.css('z-index')
             });
             $.each([
-                'top', 
-                'left', 
-                'bottom', 
+                'top',
+                'left',
+                'bottom',
                 'right'
             ], function (i, pos) {
                 props[pos] = element.css(pos);
@@ -497,40 +504,40 @@ var wijmo;
         };
     }
     var c__escapeArr1 = [
-        '\n', 
-        '\r', 
-        '"', 
-        '@', 
-        '+', 
-        '\'', 
-        '<', 
-        '>', 
-        '%', 
-        '{', 
+        '\n',
+        '\r',
+        '"',
+        '@',
+        '+',
+        '\'',
+        '<',
+        '>',
+        '%',
+        '{',
         '}'
     ], c__escapeArr2 = [
-        "!ESC!NN!", 
-        "!ESC!RR!", 
-        "!ESC!01!", 
-        "!ESC!02!", 
-        "!ESC!03!", 
-        "!ESC!04!", 
-        "!ESC!05!", 
-        "!ESC!06!", 
-        "!ESC!07!", 
-        "!ESC!08!", 
+        "!ESC!NN!",
+        "!ESC!RR!",
+        "!ESC!01!",
+        "!ESC!02!",
+        "!ESC!03!",
+        "!ESC!04!",
+        "!ESC!05!",
+        "!ESC!06!",
+        "!ESC!07!",
+        "!ESC!08!",
         "!ESC!09!"
     ], c__escapeArr3 = [
-        "(\n)", 
-        "(\r)", 
-        "(\")", 
-        "(@)", 
-        "(\\+)", 
-        "(')", 
-        "(\\<)", 
-        "(\\>)", 
-        "(%)", 
-        "(\\{)", 
+        "(\n)",
+        "(\r)",
+        "(\")",
+        "(@)",
+        "(\\+)",
+        "(')",
+        "(\\<)",
+        "(\\>)",
+        "(%)",
+        "(\\{)",
         "(\\})"
     ];
     if(!$.wij) {
@@ -625,7 +632,7 @@ var wijmo;
                 ]) : rvertical.test(my[0]) ? [
                     "center"
                 ].concat(my) : [
-                    "center", 
+                    "center",
                     "center"
                 ];
             }