Skip to content

Commit

Permalink
v7.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
sutara79 committed Dec 10, 2014
1 parent 9cf610c commit 02ceca4
Show file tree
Hide file tree
Showing 9 changed files with 149 additions and 142 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# jquery.ajax-combobox CHANGELOG

## 7.4.2 (2014-12-10)
- Fixed a defect that occurs searching for JSON without database.
(DBの代わりにJSONを検索する際に生じる不具合を修正しました。)

## 7.4.1 (2014-12-06)
- An alert is displayed if an error occurs.
(サーバとの通信が失敗した場合はアラートを表示するようにしました。)
Expand Down
2 changes: 1 addition & 1 deletion ajax-combobox.jquery.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ajax-combobox",
"title": "jquery.ajax-combobox",
"description": "jQuery plugin for creating a text box it can auto-complete and pull-down-select.",
"version": "7.4.1",
"version": "7.4.2",
"keywords": [
"suggest",
"combobox",
Expand Down
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ <h1>jquery.ajax-combobox</h1>
オートコンプリートとドロップダウンリストを組み合わせたコンボボックス
</p>
<dl class="dl-horizontal">
<dt>Version</dt><dd>7.4.1</dd>
<dt>Update</dt><dd>2014-12-06</dd>
<dt>Version</dt><dd>7.4.2</dd>
<dt>Update</dt><dd>2014-12-10</dd>
<dt>Author</dt><dd>Yuusaku Miyazaki</dd>
<dt>License</dt><dd><a href="//opensource.org/licenses/mit-license.php">MIT License</a></dd>
</dl>
Expand Down Expand Up @@ -1415,7 +1415,7 @@ <h6>JavaScript</h6>

<!-- JavaScript -->
<script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
<script src="lib/jquery.ajax-combobox.7.4.1.js"></script><!-- required -->
<script src="lib/jquery.ajax-combobox.7.4.2.js"></script><!-- required -->
<script src="sample/jquery.simple-scroll-follow.2.0.0.js"></script>
<script src="sample/sample.js"></script>
</body>
Expand Down
248 changes: 124 additions & 124 deletions jsdoc/AjaxComboBox.html

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions jsdoc/global.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ <h3 class="subsection-title">Methods</h3>
<dl>

<dt>
<h4 class="name" id="ajaxComboBox"><span class="type-signature"></span>ajaxComboBox<span class="signature">(source, option)</span><span class="type-signature"></span></h4>
<h4 class="name" id="ajaxComboBox"><span class="type-signature"></span>ajaxComboBox<span class="signature">(source, option, option.instance<span class="signature-attributes">opt</span>, option.lang<span class="signature-attributes">opt</span>, option.db_table<span class="signature-attributes">opt</span>, option.field<span class="signature-attributes">opt</span>, option.search_field<span class="signature-attributes">opt</span>, option.order_by<span class="signature-attributes">opt</span>, option.per_page<span class="signature-attributes">opt</span>, option.navi_num<span class="signature-attributes">opt</span>, option.navi_simple<span class="signature-attributes">opt</span>, option.plugin_type<span class="signature-attributes">opt</span>, option.init_record<span class="signature-attributes">opt</span>, option.bind_to<span class="signature-attributes">opt</span>, option.and_or<span class="signature-attributes">opt</span>, option.sub_info<span class="signature-attributes">opt</span>, option.sub_as<span class="signature-attributes">opt</span>, option.show_field<span class="signature-attributes">opt</span>, option.hide_field<span class="signature-attributes">opt</span>, option.select_only<span class="signature-attributes">opt</span>, option.primary_key<span class="signature-attributes">opt</span>, option.button_img<span class="signature-attributes">opt</span>, option.shorten_btn<span class="signature-attributes">opt</span>, option.shorten_src<span class="signature-attributes">opt</span>, option.shorten_min<span class="signature-attributes">opt</span>, option.shorten_reg<span class="signature-attributes">opt</span>, option.tags<span class="signature-attributes">opt</span>, option.tags.pattern<span class="signature-attributes">opt</span>, option.tags.space<span class="signature-attributes">opt</span>, option.tags.db_table<span class="signature-attributes">opt</span>, option.tags.field<span class="signature-attributes">opt</span>, option.tags.search_field<span class="signature-attributes">opt</span>, option.tags.order_by<span class="signature-attributes">opt</span>, option.tags.sub_info<span class="signature-attributes">opt</span>, option.tags.sub_as<span class="signature-attributes">opt</span>, option.tags.show_field<span class="signature-attributes">opt</span>, option.tags.hide_field<span class="signature-attributes">opt</span>)</span><span class="type-signature"></span></h4>


</dt>
Expand Down Expand Up @@ -1627,7 +1627,7 @@ <h6>Properties</h6>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.ajax-combobox.7.4.1.js.html">jquery.ajax-combobox.7.4.1.js</a>, <a href="jquery.ajax-combobox.7.4.1.js.html#line51">line 51</a>
<a href="jquery.ajax-combobox.7.4.2.js.html">jquery.ajax-combobox.7.4.2.js</a>, <a href="jquery.ajax-combobox.7.4.2.js.html#line51">line 51</a>
</li></ul></dd>


Expand Down Expand Up @@ -1676,7 +1676,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="AjaxComb
<br clear="both">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a> on Sat Dec 06 2014 18:33:35 GMT+0900 (JST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a> on Wed Dec 10 2014 20:13:15 GMT+0900 (JST)
</footer>

<script> prettyPrint(); </script>
Expand Down
8 changes: 4 additions & 4 deletions jsdoc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h3> </h3>

<header>
<h2>
jquery.ajax-combobox.7.4.1.js
jquery.ajax-combobox.7.4.2.js
</h2>

</header>
Expand All @@ -71,7 +71,7 @@ <h2>


<dt class="tag-version">Version:</dt>
<dd class="tag-version"><ul class="dummy"><li>7.4.1</li></ul></dd>
<dd class="tag-version"><ul class="dummy"><li>7.4.2</li></ul></dd>



Expand Down Expand Up @@ -101,7 +101,7 @@ <h2>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.ajax-combobox.7.4.1.js.html">jquery.ajax-combobox.7.4.1.js</a>, <a href="jquery.ajax-combobox.7.4.1.js.html#line1">line 1</a>
<a href="jquery.ajax-combobox.7.4.2.js.html">jquery.ajax-combobox.7.4.2.js</a>, <a href="jquery.ajax-combobox.7.4.2.js.html#line1">line 1</a>
</li></ul></dd>


Expand Down Expand Up @@ -152,7 +152,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="AjaxComb
<br clear="both">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a> on Sat Dec 06 2014 18:33:35 GMT+0900 (JST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a> on Wed Dec 10 2014 20:13:15 GMT+0900 (JST)
</footer>

<script> prettyPrint(); </script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>JSDoc: Source: jquery.ajax-combobox.7.4.1.js</title>
<title>JSDoc: Source: jquery.ajax-combobox.7.4.2.js</title>

<script src="scripts/prettify/prettify.js"> </script>
<script src="scripts/prettify/lang-css.js"> </script>
Expand All @@ -17,7 +17,7 @@

<div id="main">

<h1 class="page-title">Source: jquery.ajax-combobox.7.4.1.js</h1>
<h1 class="page-title">Source: jquery.ajax-combobox.7.4.2.js</h1>



Expand All @@ -27,7 +27,7 @@ <h1 class="page-title">Source: jquery.ajax-combobox.7.4.1.js</h1>
<article>
<pre class="prettyprint source linenums"><code>/**
* @file jQuery Plugin: jquery.ajax-combobox
* @version 7.4.1
* @version 7.4.2
* @author Yuusaku Miyazaki [[email protected]]
* @license MIT License
*/
Expand Down Expand Up @@ -1566,6 +1566,8 @@ <h1 class="page-title">Source: jquery.ajax-combobox.7.4.1.js</h1>
}
}
}
// json.cnt_page = json.candidate.length;
if (json.candidate == undefined) json.candidate = [];
json.cnt_page = json.candidate.length;
self._prepareResults(self, json, q_word, which_page_num);
},
Expand Down Expand Up @@ -2180,7 +2182,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="AjaxComb
<br clear="both">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a> on Sat Dec 06 2014 18:33:34 GMT+0900 (JST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-dev</a> on Wed Dec 10 2014 20:13:15 GMT+0900 (JST)
</footer>

<script> prettyPrint(); </script>
Expand Down
3 changes: 1 addition & 2 deletions jsdoc/styles/jsdoc-default.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ section
display: none;
}

.optional:after {
content: "opt";
.signature-attributes {
font-size: 60%;
color: #aaa;
font-style: italic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @file jQuery Plugin: jquery.ajax-combobox
* @version 7.4.1
* @version 7.4.2
* @author Yuusaku Miyazaki [[email protected]]
* @license MIT License
*/
Expand Down Expand Up @@ -1539,6 +1539,8 @@ $.extend(AjaxComboBox.prototype, /** @lends AjaxComboBox.prototype */ {
}
}
}
// json.cnt_page = json.candidate.length;
if (json.candidate == undefined) json.candidate = [];
json.cnt_page = json.candidate.length;
self._prepareResults(self, json, q_word, which_page_num);
},
Expand Down

0 comments on commit 02ceca4

Please sign in to comment.