From 4f5b5062b61df85e12e845b4f469f6a780e59103 Mon Sep 17 00:00:00 2001
From: vitalets <noginsk@rambler.ru>
Date: Tue, 4 Dec 2012 18:20:46 +0400
Subject: [PATCH] sourceCache option ready
---
src/inputs/list.js | 82 ++++++++++++++++++++++++++++-----------------
test/unit/select.js | 49 +++++++++++++++++++++++++++
2 files changed, 101 insertions(+), 30 deletions(-)
diff --git a/src/inputs/list.js b/src/inputs/list.js
index 891e442..1e4da05 100644
--- a/src/inputs/list.js
+++ b/src/inputs/list.js
@@ -66,32 +66,35 @@ List - abstract class for inputs that have source option loaded from js array or
//loading from url
if (typeof this.options.source === 'string') {
- var cacheID = this.options.source + (this.options.name ? '-' + this.options.name : ''),
- cache;
+ //try to get from cache
+ if(this.options.sourceCache) {
+ var cacheID = this.options.source + (this.options.name ? '-' + this.options.name : ''),
+ cache;
- if (!$(document).data(cacheID)) {
- $(document).data(cacheID, {});
- }
- cache = $(document).data(cacheID);
+ if (!$(document).data(cacheID)) {
+ $(document).data(cacheID, {});
+ }
+ cache = $(document).data(cacheID);
- //check for cached data
- if (cache.loading === false && cache.sourceData) { //take source from cache
- this.sourceData = cache.sourceData;
- success.call(this);
- return;
- } else if (cache.loading === true) { //cache is loading, put callback in stack to be called later
- cache.callbacks.push($.proxy(function () {
+ //check for cached data
+ if (cache.loading === false && cache.sourceData) { //take source from cache
this.sourceData = cache.sourceData;
success.call(this);
- }, this));
+ return;
+ } else if (cache.loading === true) { //cache is loading, put callback in stack to be called later
+ cache.callbacks.push($.proxy(function () {
+ this.sourceData = cache.sourceData;
+ success.call(this);
+ }, this));
- //also collecting error callbacks
- cache.err_callbacks.push($.proxy(error, this));
- return;
- } else { //no cache yet, activate it
- cache.loading = true;
- cache.callbacks = [];
- cache.err_callbacks = [];
+ //also collecting error callbacks
+ cache.err_callbacks.push($.proxy(error, this));
+ return;
+ } else { //no cache yet, activate it
+ cache.loading = true;
+ cache.callbacks = [];
+ cache.err_callbacks = [];
+ }
}
//loading sourceData from server
@@ -102,23 +105,32 @@ List - abstract class for inputs that have source option loaded from js array or
data: this.options.name ? {name: this.options.name} : {},
dataType: 'json',
success: $.proxy(function (data) {
- cache.loading = false;
+ if(cache) {
+ cache.loading = false;
+ }
this.sourceData = this.makeArray(data);
if($.isArray(this.sourceData)) {
this.doPrepend();
- //store result in cache
- cache.sourceData = this.sourceData;
success.call(this);
- $.each(cache.callbacks, function () { this.call(); }); //run success callbacks for other fields
+ if(cache) {
+ //store result in cache
+ cache.sourceData = this.sourceData;
+ $.each(cache.callbacks, function () { this.call(); }); //run success callbacks for other fields
+ }
} else {
error.call(this);
- $.each(cache.err_callbacks, function () { this.call(); }); //run error callbacks for other fields
+ if(cache) {
+ $.each(cache.err_callbacks, function () { this.call(); }); //run error callbacks for other fields
+ }
}
}, this),
error: $.proxy(function () {
- cache.loading = false;
error.call(this);
- $.each(cache.err_callbacks, function () { this.call(); }); //run error callbacks for other fields
+ if(cache) {
+ cache.loading = false;
+ //run error callbacks for other fields
+ $.each(cache.err_callbacks, function () { this.call(); });
+ }
}, this)
});
} else { //options as json/array
@@ -225,7 +237,8 @@ List - abstract class for inputs that have source option loaded from js array or
Source data for list. If string - considered ajax url to load items. Otherwise should be an array.
Array format is: <code>[{value: 1, text: "text"}, {...}]</code><br>
For compability it also supports format <code>{value1: "text1", value2: "text2" ...}</code> but it does not guarantee elements order.
-
+ If source is **string**, results will be cached for fields with the same source and name. See also <code>sourceCache</code> option.
+
@property source
@type string|array|object
@default null
@@ -246,7 +259,16 @@ List - abstract class for inputs that have source option loaded from js array or
@type string
@default Error when loading list
**/
- sourceError: 'Error when loading list'
+ sourceError: 'Error when loading list',
+ /**
+ if <code>true</code> and source is **string url** - results will be cached for fields with the same source and name.
+ Usefull for editable grids.
+
+ @property sourceCache
+ @type boolean
+ @default true
+ **/
+ sourceCache: true
});
$.fn.editabletypes.list = List;
diff --git a/test/unit/select.js b/test/unit/select.js
index 7a240dd..ea90852 100644
--- a/test/unit/select.js
+++ b/test/unit/select.js
@@ -363,6 +363,55 @@ $(function () {
});
+ asyncTest("sourceCache: false", function () {
+ var e = $('<a href="#" data-type="select" data-pk="1" data-name="name1" data-value="2" data-url="post.php" data-source="groups-cache-false.php">customer</a>').appendTo(fx).editable({
+ sourceCache: false
+ }),
+ e1 = $('<a href="#" data-type="select" data-pk="1" id="name1" data-value="2" data-url="post.php" data-source="groups-cache-false.php">customer</a>').appendTo(fx).editable({
+ sourceCache: false
+ }),
+ req = 0;
+
+ $.mockjax({
+ url: 'groups-cache-false.php',
+ response: function() {
+ req++;
+ this.responseText = groups;
+ }
+ });
+
+ //click first
+ e.click();
+ var p = tip(e);
+
+ setTimeout(function() {
+ ok(p.is(':visible'), 'popover visible');
+ equal(p.find('select').find('option').length, size, 'options loaded');
+ equal(req, 1, 'one request performed');
+
+ p.find('button[type=button]').click();
+ ok(!p.is(':visible'), 'popover was removed');
+
+ //click second
+ e1.click();
+ p = tip(e1);
+
+ setTimeout(function() {
+ ok(p.is(':visible'), 'popover2 visible');
+ equal(p.find('select').find('option').length, size, 'options loaded');
+ equal(req, 2, 'second request performed');
+
+ p.find('button[type=button]').click();
+ ok(!p.is(':visible'), 'popover was removed');
+
+ e.remove();
+ e1.remove();
+ start();
+ }, timeout);
+ }, timeout);
+
+ });
+
asyncTest("autotext: auto", function () {
expect(3);