* fix error in jQuery 3.* and jQuery 2.*.

viclenet · Sep 5, 2016 · 17226fe · 17226fe
1 parent 485ec8d
commit 17226fe
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 33 deletions.
diff --git a/src/js/doc.js b/src/js/doc.js
@@ -287,41 +287,47 @@
 
         var dataType = url.endsWith('.json') ? 'json' : 'html';
         var loadFromRemote = function() {
-            $.get(url, function(data) {
-                if(data !== null) {
-                    if(isIndexJson) {
-                        dataVersion = data.version;
-                        docIndex = data;
-                    } else if(isIconsJson) {
-                        iconsIndex = {
+            $.ajax({
+                url: url,
+                type: 'GET',
+                dataType: dataType,
+                success: function(data) {
+                    if(data !== null) {
+                        if(isIndexJson) {
+                            dataVersion = data.version;
+                            docIndex = data;
+                        } else if(isIconsJson) {
+                            iconsIndex = {
+                                data: data,
+                                version: dataVersion
+                            };
+                        }
+                        cacheData = {
                             data: data,
                             version: dataVersion
                         };
+                        $.zui.store.set('//' + url, data);
+                        $.zui.store.set('//' + url + '::V', dataVersion);
+
+                        if(debug) console.log('Load', url, 'from remote:', cacheData);
+                        callback(data, 'remote');
+                    } else if(isHasCache && !isIndexJson) {
+                        if(debug) console.log('Failed load', url, 'from remote, instead load cache:', cacheData);
+                        callback(cacheData.data, 'cache');
+                    }
+                },
+                error: function() {
+                    if(debug) console.warn("Ajax error:", url);
+                    if(isHasCache && !isIndexJson) {
+                        if(debug) console.log('Failed load', url, 'from remote with error, instead load cache:', cacheData);
+                        callback(cacheData.data, 'cache');
+                    } else {
+                        callback(null, 'error');
                     }
-                    cacheData = {
-                        data: data,
-                        version: dataVersion
-                    };
-                    $.zui.store.set('//' + url, data);
-                    $.zui.store.set('//' + url + '::V', dataVersion);
-
-                    if(debug) console.log('Load', url, 'from remote:', cacheData);
-                    callback(data, 'remote');
-                } else if(isHasCache && !isIndexJson) {
-                    if(debug) console.log('Failed load', url, 'from remote, instead load cache:', cacheData);
-                    callback(cacheData.data, 'cache');
-                }
-            }, dataType).error(function() {
-                if(debug) console.warn("Ajax error:", url);
-                if(isHasCache && !isIndexJson) {
-                    if(debug) console.log('Failed load', url, 'from remote with error, instead load cache:', cacheData);
-                    callback(cacheData.data, 'cache');
-                } else {
-                    callback(null, 'error');
-                }
 
-                if($body.hasClass('page-open')) {
-                    $pageBody.children('.loader').addClass('with-error');
+                    if($body.hasClass('page-open')) {
+                        $pageBody.children('.loader').addClass('with-error');
+                    }
                 }
             });
         }

diff --git a/src/js/dropdown.js b/src/js/dropdown.js
@@ -114,9 +114,10 @@
             selector = $this.attr('href')
             selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
         }
-
-        var $parent = selector && $(selector)
-
+        var $parent;
+        try {
+            $parent = selector && $(selector);
+        } catch(e) {}
         return $parent && $parent.length ? $parent : $this.parent()
     }