git-svn-id: https://msi/svn/firstRepo/WebClient/branches/NewRelease@33 0f545695-f87b-41b6-9a03-7f16563b5454

2015-05-07 13:16:11 +00:00
parent d0d55ee8e5
commit 282ad76c48
79 changed files with 2416 additions and 1824 deletions
@@ -20,12 +20,15 @@ define(['jquery', 'underscore', 'backbone', 'classes/cache'],
                    {
                        window.setTimeout(function () {
                            self[options.reset ? 'reset' : 'set'](false, options);
-                            deferred.resolve(cachedItem);
+                            //deferred.resolve(cachedItem);
+
+                            deferred.notify(self);
                            self.push(cachedItem);
-                            self.trigger('sync', self, false, options);
                            if (_.isFunction(options.success)) {
                                options.success(self, false, options);
-                            }                            
+                            }
+                            deferred.resolve(cachedItem);
+                            self.trigger('sync', self, false, options);
                            return deferred;
                        }, 0);
                    }
@@ -48,6 +51,11 @@ define(['jquery', 'underscore', 'backbone', 'classes/cache'],
                        // return a promise which provides the same methods as a jqXHR object
                        return deferred;
                    }
+                },
+                isCached: function () {
+                    var cachedItem = Cache.get(this.cacheName);
+
+                    return (cachedItem !== null);
                }
            });
            return CachedCollection;