diff --git a/assets/docs/changelog.txt b/assets/docs/changelog.txt
index ddc40b5880..5d2c85d33e 100644
--- a/assets/docs/changelog.txt
+++ b/assets/docs/changelog.txt
@@ -1,6 +1,238 @@
This file shows the changes in recent releases of MODX. The most current release is usually the
development release, and is only shown to give an idea of what's currently in the pipeline.
+MODX Evolution 1.2.2(Jul 10, 2017)
+* [GitHub:#99d1b62cd] - [F] fix properties for instal snippet,modules,plugins (dmi3yy)
+* [GitHub:#e18d5d373] - [F] mm multiplefields for php 7 (dmi3yy)
+* [GitHub:#9a0da748c] - [F] params for richtext (dmi3yy)
+* [GitHub:#1a6ad1faf] - [I] for composer (dmi3yy)
+* [GitHub:#a7c01f6e0] - [F] update Plugins version (dmi3yy)
+* [GitHub:#e9000c2f4] - [I] update DocLister (dmi3yy)
+* [GitHub:#32c33198c] - [F] doc parser (dmi3yy)
+* [GitHub:#7854a1933] - [F] send mail via smtp (dmi3yy)
+* [GitHub:#c937e4e04] - [I] add one-dark theme in codemirror (dmi3yy)
+* [GitHub:#73e221004] - [F] &else in snippet if (dmi3yy)
+* [GitHub:#d033a2337] - [F] update ru lang (dmi3yy)
+* [GitHub:#33898ec08] - [I] update modxre2_dropdown theme (dmi3yy)
+* [GitHub:#5e7636e4e] - [F] Days allowed to manager access #568 (dmi3yy)
+* [GitHub:#726606744] - [F] tynyMCE (dmi3yy)
+* [GitHub:#879cacc5f] - [R] update FormLister to 1.7.2 (dmi3yy)
+* [GitHub:#4c7d864b5] - [I] first step for composer (dmi3yy)
+* [GitHub:#862d2986d] - [F] #1343 Init Quicksearch after Tree-Reload for all tabs (Deesen)
+* [GitHub:#13e4be667] - [F] when modx installed in folder, request of home page with parameters causes endless redirect (sunhaim)
+* [GitHub:#ed84bbe94] - [F] thumb generation fixed on some php7 systems (sunhaim)
+* [GitHub:#565e25b61] - [F] #1377 $modx->getDocumentChildrenTVars() (yamamoto)
+* [GitHub:#949d090ea] - [F] update phpmailer to 5.2.23 (dmi3yy)
+* [GitHub:#d867fc2f6] - [R] action buttons (dmi3yy)
+* [GitHub:#b48f80064] - [F] style for action buttons in new theme (dmi3yy)
+* [GitHub:#25afbced6] - [F] permission in new theme (dmi3yy)
+* [GitHub:#11b63feb1] - [F] in OnManagerMenuPrepender (dmi3yy)
+* [GitHub:#89e31b0af] - [F] fix in OnManagerNodePrepender (dmi3yy)
+* [GitHub:#d0b4f6957] - [F] update login page in new theme (dmi3yy)
+* [GitHub:#2d4202ce2] - [F] php7.2 error (dmi3yy)
+* [GitHub:#0dca7be96] - [F] php7 notices (dmi3yy)
+* [GitHub:#f27eee4b4] - [F] php7 notices (dmi3yy)
+* [GitHub:#1ae4c4ec6] - [F] default config max size images (dmi3yy)
+* [GitHub:#91b54bf03] - [F] php7 notice (dmi3yy)
+* [GitHub:#e044e9d4d] - [F] no need bootstrap css in catecogy manager (dmi3yy)
+* [GitHub:#09f9d25eb] - [R] FormLister 1.6.2 (dmi3yy)
+* [GitHub:#461b7abc5] - [F] snippet if fix php7 notice (dmi3yy)
+* [GitHub:#c8843b02b] - [F] fix image position in backend tinmymce4 (dmi3yy)
+* [GitHub:#6776e42ed] - [F] need only for settings (dmi3yy)
+* [GitHub:#1293a05d6] - [I] fast work in manager after save document (dmi3yy)
+* [GitHub:#b4293cda6] - [F] in modxre_dropdownmenu (dmi3yy)
+* [GitHub:#e13199af0] - [F] check for 'register_globals' fixed #1370 (sunhaim)
+* [GitHub:#7fbb6999e] - [F] sql fix (dmi3yy)
+* [GitHub:#71b33897c] - [R] update dropdown theme (dmi3yy)
+* [GitHub:#826937e0a] - [I] add sample tv for head and SEO tab (dmi3yy)
+* [GitHub:#30e63a1dc] - [I] add sample head scripts (dmi3yy)
+* [GitHub:#9e87bdbc6] - [I] update dropdown theme (dmi3yy)
+* [GitHub:#53e8ab9fa] - [I] - set name from Request use with new mechanism create elements from codemmiror (dmi3yy)
+* [GitHub:#1e94cac0b] - [I] Module Extras/Store parse chunk version (Mr B)
+* [GitHub:#465d1da73] - [I] update theme dropdown and extend codemirror (dmi3yy)
+* [GitHub:#625838cea] - [F] #907 Quick Manager+ : Vertical align text (Mr B)
+* [GitHub:#6cbfec34d] - [F] Remove img tag so Font Awesome icons display for locked resource in tree (Mr B)
+* [GitHub:#b3293567b] - [I] Update plugin.tinymce.php (Mr B)
+* [GitHub:#21438b28e] - [F] Update TinyMCE version numbers to match (Mr B)
+* [GitHub:#63e7d61c1] - [F] Edit a role - check boxes were inline instead of block (Mr B)
+* [GitHub:#eaddeec48] - [R] Manager Polish translation update (Piotr Matysiak)
+* [GitHub:#fa82430d5] - [I] #1332 Highlight actual viewed or edited file (Deesen)
+* [GitHub:#fc764b953] - [F] #1346 Allow users with permission "Allow root" to create doc in root (Deesen)
+* [GitHub:#9025ac120] - [C] Replaced short-tag recent documents>uses template (yamamoto)
+* [GitHub:#bce17e1c6] - [F] dropdown items white icons on hover (Nicola)
+* [GitHub:#1ebd3a24c] - [F] #1227 (Pathologic)
+* [GitHub:#b6f514514] - [I] Ditto + Cross references = not working (yamamoto)
+* [GitHub:#cd9edc726] - [F] update theme with dropdown (dmi3yy)
+* [GitHub:#e72c1633a] - [F] search static (dmi3yy)
+* [GitHub:#bb613a516] - [F] style (dmi3yy)
+* [GitHub:#9f55793a3] - [F] session keep alive (dmi3yy)
+* [GitHub:#7127787b8] - [F] warning in mgrResources (dmi3yy)
+* [GitHub:#f2d24c0f9] - [F] Update dropdown theme (dmi3yy)
+* [GitHub:#1532ef67e] - [F] Update modxre_dropdonwmenu theme (dmi3yy)
+* [GitHub:#a024c2f2d] - [F] Change gridster image to fa (dmi3yy)
+* [GitHub:#b32c7f8a6] - [F] Fixed sidebar search buttons position (Piotr Matysiak)
+* [GitHub:#aaecb8a69] - [F] fixed wrong path to jquery library (Sasha Beep)
+* [GitHub:#4e48080a3] - [R] Add responsive buttons style to new theme (dmi3yy)
+* [GitHub:#b4783a78b] - [F] fix new theme with dropdown (dmi3yy)
+* [GitHub:#5ae71ba5c] - [F] Fix js (dmi3yy)
+* [GitHub:#100cdb1e7] - [F] fix 2016 to 2017 (dmi3yy)
+* [GitHub:#69455bd79] - [F] lost icon in search (dmi3yy)
+* [GitHub:#ac59e8deb] - [F] mobile actionbuttons fix for roles (Nicola)
+* [GitHub:#bf07b997e] - [F] Search mobile actionbutton (Nicola)
+* [GitHub:#5392a64a3] - [F] Fix Manage Users mobile Action buttons (Nicola)
+* [GitHub:#f1cc3cb87] - [F] https://github.com/modxcms/evolution/issues/1306 (Nicola)
+* [GitHub:#be8f23bc6] - [R] Responsive Action Buttons (Nicola)
+* [GitHub:#2750446a3] - [F] Fix vertical align (MrSwed)
+* [GitHub:#e849197ea] - [I] MODxRE2_DropdownMenu -new theme (dmi3yy)
+* [GitHub:#ae3a90da5] - [F] typo in setup.sql (dmi3yy)
+* [GitHub:#38eb4f6af] - [F]. Https in site_url (dmi3yy)
+* [GitHub:#66f7eef77] - [F] #1218 TVs/PHs will not be rendered if custom_meta_title is not assigned to template like [*custom_meta_title:ne:then=`[*custom_meta_title*]`:else=`[*pagetitle*]`*] (dmi3yy)
+* [GitHub:#7e9766084] - add .json exclude to alias (dmi3yy)
+* [GitHub:#10317fa75] - [F] Fix params from modules to plugins (dmi3yy)
+* [GitHub:#bc4517afc] - [F] for aliaslistingfolder no need check for docAlias for search id (dmi3yy)
+* [GitHub:#4e309dc84] - [F] staticSearch for ajaxSearch (dmi3yy)
+* [GitHub:#aff734e19] - [F] hardcoded fix ElementsInTree (dmi3yy)
+* [GitHub:#e3e0da8e8] - [F] DLBuildMenu lot of queries (dmi3yy)
+* [GitHub:#11d6288c5] - [F] #1279 If container has no siblings, get default-template from parent (Deesen)
+* [GitHub:#90f69323a] - [C] Remove old version (Digitalime)
+* [GitHub:#899e630af] - [R] Allow HTML email for Websignup (Digitalime)
+* [GitHub:#48f694e31] - [I] Get the q parameter from the request and store it in a property, as well as cleaning it up for future use. (MadHatter)
+* [GitHub:#1b635fb78] - [F] fix OnLoadDocumentObject event dont work #1271 (dmi3yy)
+* [GitHub:#94418b98b] - [I] Update docLister add (makePaginateUrl param) (dmi3yy)
+* [GitHub:#ba98bc6fa] - [I] Make sure site tree context menu is also within frame horizontally (Mr B)
+* [GitHub:#27c560230] - [F] - #1275. http://take.ms/wo4RF (dmi3yy)
+* [GitHub:#829808440] - [F] #1273 Permission-check for setting "Allow root" (Deesen)
+* [GitHub:#34ce1939c] - [F] !contains (not_contains) condition for [[if]] (webber12)
+* [GitHub:#03c5eb9e9] - [F] Code cleanup (yamamoto)
+* [GitHub:#0a244df39] - [R] - $modx->invokeEvent() (yamamoto)
+* [GitHub:#00e806af0] - [I] #1248 Show ID in tooltip (Deesen)
+* [GitHub:#0970d3f7b] - [I] Assigning category automatically when using contextmenu-button "create new" (Deesen)
+* [GitHub:#74eb8c054] - Icon for first tab (Sasha Beep)
+* [GitHub:#a587691a4] - [R] Fix and Refactor - $modx->getSettings() (yamamoto)
+* [GitHub:#8ff87f09e] - [R] Update ditto.class.inc.php (Intersel)
+* [GitHub:#676606d3b] - [F] fix css typo in manage elements (Nicola Lambathakis)
+* [GitHub:#983bc4d1f] - [R] Allow Webuser Signup Email to contain HTML (Digitalime)
+* [GitHub:#717bcaed0] - [I] styles for resource view options toggle (Nicola Lambathakis)
+* [GitHub:#2326f1a11] - [I] restyled resource view options toggle (Nicola Lambathakis)
+* [GitHub:#14c01835b] - [I] added toggle speed animation to resource view options (Nicola Lambathakis)
+* [GitHub:#0aa16f8fc] - [F] Update config.inc.tpl (Mr B)
+* [GitHub:#33b17cdc0] - [R] no BG colors and other (MrSwed)
+* [GitHub:#71b1748ce] - [F] fix site_manager_url for capcha (MrSwed)
+* [GitHub:#2951ad121] - [F] Function isn't a constructor, it's a static method (Matthew Simpson)
+* [GitHub:#bcf1aa6a1] - [F] Typo (Deesen)
+* [GitHub:#45a368b62] - [F] Flex-View in Chrome: Fix breaking lines / spreading elements into next column (Deesen)
+* [GitHub:#638e8f458] - [F] Added padding-bottom:10px for open panels (Deesen)
+* [GitHub:#d5c0584f5] - [F] Removed unnecessary spaces and corrected alignments (Deesen)
+* [GitHub:#a786013db] - [F] Inline-View: Removed space between collapsed categories (Deesen)
+* [GitHub:#f39f54b75] - [F] QM fix modal buttons styles for tvs (Nicola Lambathakis)
+* [GitHub:#8fc895fa5] - [F] QM media query in sidebar view (Nicola Lambathakis)
+* [GitHub:#e6a6ea8a0] - [F] #1177 #1239 Corrected $_lang['lang_code'] (Deesen)
+* [GitHub:#7984bcc89] - [F] Fix javascript error in console: 404 http://localhost/manager/JS (Nicola Lambathakis)
+* [GitHub:#f043190d2] - [F] #1222 Fix tinymce4 introtext width (Nicola Lambathakis)
+* [GitHub:#9ed21706e] - [O] Improve language for minify php option (Mr B)
+* [GitHub:#fe42ef07d] - [F] for getIdFromAlias (sunhaim)
+* [GitHub:#1a4540566] - [R] Refactored and improved "Manage Elements" - added language-strings - load template-files only once - added "View Options"-paragraph to "Help" (Deesen)
+* [GitHub:#670cc8777] - [F] Sorting in "Combined View" (Deesen)
+* [GitHub:#e996a0ba7] - [R] Refactored and improved "Manage Elements" - adapted "Combined View" to new view-mechanismn (Deesen)
+* [GitHub:#6e77f636d] - [I] Aligned form below action-buttons (Deesen)
+* [GitHub:#2c13cd979] - [F] Remove unnecessary "-" (Deesen)
+* [GitHub:#e225194ed] - [F] Display lock-icon nicely instead of element-icon (Deesen)
+* [GitHub:#78febbe40] - [R] Refactored and improved "Manage Elements" - moved HTML-templates into external files - adapted quicksearch - cleaned up CSS-styles (Deesen)
+* [GitHub:#03f34e2d8] - [R] Refactored and improved "Manage Elements" - added collapsible categories (+ remember via localStorage) - added nuContextMenu - adapted CSS to new features (Deesen)
+* [GitHub:#875621086] - [R] Moved jq-plugin "nuContextMenu" to external file "manager/media/script/jquery.nucontextmenu.js" (Deesen)
+* [GitHub:#1a48e736a] - [F] alias_visible fix2 (sunhaim)
+* [GitHub:#98adbe4cd] - [F] alias_visible fix (sunhaim)
+* [GitHub:#7a9cf8e53] - [R] Refactored and improved "Manage Elements" - added "View Options"-button to show/hide form - removed checkbox "small font" - instead added font-size option - added checkbox "all tabs" to change views of all tabs with same options - added button "reset" to reset to defaults, works with "all tabs"-checkbox (Deesen)
+* [GitHub:#d2bc89616] - [R] Refactored and improved "Manage Elements" as per idea of Nicola1971 - different views like "list, inline, flex" - flex provides dynamic columns using CSS3 "columns-count" - localStorage to store view-settings per tab - new class "mgrResources" to provide array with all nessecary details (Deesen)
+* [GitHub:#c68c36a30] - [F] version 1.2.2-beta2, because of changes in document.parser (Deesen)
+* [GitHub:#921e1b995] - [F] #1226 Load user-specific language instead of manager default-language (Deesen)
+* [GitHub:#8c0027a54] - [F] category row padding (Nicola Lambathakis)
+* [GitHub:#806196e7a] - [F] #1225 Manage Categories button in Combined View (Nicola Lambathakis)
+* [GitHub:#d8e568162] - [F] Manage Elements - minor css fix - smaller row height (Nicola Lambathakis)
+* [GitHub:#af2e886bf] - [F] Manage Elements - minor css fix - smaller row height (Nicola Lambathakis)
+* [GitHub:#c51d7a10f] - [I] #1134 Added "styleFormat_inline" and "styleFormat_block" to plugin-config to allow separated settings for inline- and block-styles in simple-format (Deesen)
+* [GitHub:#12c67aad3] - [F] #1218 Parse TVs/placeholders & modifiers even if TV is not assigned to actual template like [*custom_meta_title:ne:then=`[*custom_meta_title*]`:else=`[*pagetitle*]`*] (Deesen)
+* [GitHub:#a30163dbe] - [F] #1200 Provide using (nested) placeholders/modifiers in Wayfinder (PHX backward-compatibility) (Deesen)
+* [GitHub:#47c60d97b] - [F] Checkbox-value fallback to "name" if no "value" is given http://modx.im/blog/news/4950.html#comment41140 (Deesen)
+* [GitHub:#a11311870] - [F] recent commit (yamamoto)
+* [GitHub:#8dcf976ef] - [O]: reorder security configuration (Mr B)
+* [GitHub:#e8db62140] - [C] Replaced htmlspecialchars() by $modx->htmlspecialchars() (Deesen)
+* [GitHub:#2031422a1] - [F] Do not show users who forgot pressing logout in "Online Users"-list after login (Deesen)
+* [GitHub:#6230c969d] - [F] #1205 TinyMCE4 usersettings: Added new checkbox "Use the global setting" - to params "Custom Plugins", "Custom Buttons", "Block Formats" - small clean-up of modxRTEbridge (Deesen)
+* [GitHub:#ea765448d] - [C] #1214 Removed confusion in creating $modx->config to rely only on $modx->getSettings() and $modx->getUserSettings() - splitted $modx->getSettings() into getSettings() and getUserSettings(), so usersettings can be queried after startCMSSession(); - added $modx->configGlobal to keep fallback-values of global settings overwritten by usersettings (req. for Tiny4 "Use global settings"-checkbox in usersettings) - removed unnecessary inclusion of settings.inc.php and user_settings.inc.php (Deesen)
+* [GitHub:#377fc22e2] - [I] New buttons theme and design improvemets (Nicola Lambathakis)
+* [GitHub:#193e6d793] - [R] Updated Colorbox to 1.6.4 (Nicola Lambathakis)
+* [GitHub:#d6f752573] - [R] media query for mobile Buttons (Nicola Lambathakis)
+* [GitHub:#dc73e54cb] - [R] welcome.static.php (yamamoto)
+* [GitHub:#f334a44a5] - [R] Manager theme template (yamamoto)
+* [GitHub:#c528150a1] - [R] $modx->getUserInfo() (yamamoto)
+* [GitHub:#7d3eca38e] - [I] Link snippet name to arbitrary function (yamamoto)
+* [GitHub:#2591d6c8f] - [I] New modifier - json_decode (yamamoto)
+* [GitHub:#6b0a6b904] - [I] New modifier - json_encode (yamamoto)
+* [GitHub:#06fe67b18] - [F] Remove calling nonexistent metod (yamamoto)
+* [GitHub:#1ff46451e] - [F] Wayfinder - &hideSubMenus (yamamoto)
+* [GitHub:#e5e4eabcf] - [R] QM less hidden closed toolbar -47px (Nicola Lambathakis)
+* [GitHub:#8804e77e3] - [R] QM icon for custom buttons in sideba (Nicola Lambathakis)
+* [GitHub:#81284dd36] - [R] new QM position: right, left, before (Nicola Lambathakis)
+* [GitHub:#29af60343] - [R] added QM bottom tollbar option (Nicola Lambathakis)
+* [GitHub:#0c1e747c1] - [F] removed modx logo from QM toolbar (Nicola Lambathakis)
+* [GitHub:#6d859f710] - [F] Remove users who forgot pressing logout from "Online Users"-list (Deesen)
+* [GitHub:#5d3dfbe89] - [F] fixed some bugs and better save button style (Nicola Lambathakis)
+* [GitHub:#6ac3d951f] - [i] Quick Manager buttons restyle (MODxRE2 style) (Nicola Lambathakis)
+* [GitHub:#596422400] - [C] Removing Notice: Undefined offset: 0 (kulmjens)
+* [GitHub:#d8f97efd1] - [F] fix incorrect detect id if in url string start from numeric (dmi3yy)
+* [GitHub:#5f59f2c2c] - [R] font awesome icons for View Children (document overview) (Nicola Lambathakis)
+* [GitHub:#3de7826a3] - [R] View Children: new buttons+font awesome (Nicola Lambathakis)
+* [GitHub:#48447fbcd] - [I] changing output filename for easier sorting (kulmjens)
+* [GitHub:#65edfb661] - [F] Do not list "index.html" as category/tab (Deesen)
+* [GitHub:#4ca716fd6] - [C] delete category button (Nicola Lambathakis)
+* [GitHub:#7c09a42fc] - [F] updated resource.static with buttons for 1.2.1 (Nicola Lambathakis)
+* [GitHub:#a9f036792] - [F] updated styles for latest 1.2.1 (Nicola)
+* [GitHub:#d7e089265] - [F] Ensure login button is styled for iPad/iPhone (Mr B)
+* [GitHub:#0d2316965] - [I] #775 Added .border-bottom for category-manager (Deesen)
+* [GitHub:#5137199eb] - [F] del ?> (dmi3yy)
+* [GitHub:#64bad31f2] - [F] fix warnings in module extras on php 7 (dmi3yy)
+* [GitHub:#94938d29a] - [F] #1184 Added missing "static" to var $i (Deesen)
+
MODX Evolution 1.2.1(Jan 11, 2017)
* [GitHub:#6f404c6] - [I] Debug information (yamamoto)
diff --git a/assets/js/easy-ui/easyloader.js b/assets/js/easy-ui/easyloader.js
old mode 100755
new mode 100644
index d5ec1cf84b..edf4b5ebcc
--- a/assets/js/easy-ui/easyloader.js
+++ b/assets/js/easy-ui/easyloader.js
@@ -1,14 +1,14 @@
/**
- * jQuery EasyUI 1.4.1
+ * jQuery EasyUI 1.5.2
*
- * Copyright (c) 2009-2014 www.jeasyui.com. All rights reserved.
+ * Copyright (c) 2009-2017 www.jeasyui.com. All rights reserved.
*
- * Licensed under the GPL license: http://www.gnu.org/licenses/gpl.txt
- * To use it on other terms please contact us at info@jeasyui.com
+ * Licensed under the freeware license: http://www.jeasyui.com/license_freeware.php
+ * To use it on other terms please contact us: info@jeasyui.com
*
*/
(function(){
-var _1={draggable:{js:"jquery.draggable.js"},droppable:{js:"jquery.droppable.js"},resizable:{js:"jquery.resizable.js"},linkbutton:{js:"jquery.linkbutton.js",css:"linkbutton.css"},progressbar:{js:"jquery.progressbar.js",css:"progressbar.css"},tooltip:{js:"jquery.tooltip.js",css:"tooltip.css"},pagination:{js:"jquery.pagination.js",css:"pagination.css",dependencies:["linkbutton"]},datagrid:{js:"jquery.datagrid.js",css:"datagrid.css",dependencies:["panel","resizable","linkbutton","pagination"]},treegrid:{js:"jquery.treegrid.js",css:"tree.css",dependencies:["datagrid"]},propertygrid:{js:"jquery.propertygrid.js",css:"propertygrid.css",dependencies:["datagrid"]},panel:{js:"jquery.panel.js",css:"panel.css"},window:{js:"jquery.window.js",css:"window.css",dependencies:["resizable","draggable","panel"]},dialog:{js:"jquery.dialog.js",css:"dialog.css",dependencies:["linkbutton","window"]},messager:{js:"jquery.messager.js",css:"messager.css",dependencies:["linkbutton","window","progressbar"]},layout:{js:"jquery.layout.js",css:"layout.css",dependencies:["resizable","panel"]},form:{js:"jquery.form.js"},menu:{js:"jquery.menu.js",css:"menu.css"},tabs:{js:"jquery.tabs.js",css:"tabs.css",dependencies:["panel","linkbutton"]},menubutton:{js:"jquery.menubutton.js",css:"menubutton.css",dependencies:["linkbutton","menu"]},splitbutton:{js:"jquery.splitbutton.js",css:"splitbutton.css",dependencies:["menubutton"]},accordion:{js:"jquery.accordion.js",css:"accordion.css",dependencies:["panel"]},calendar:{js:"jquery.calendar.js",css:"calendar.css"},textbox:{js:"jquery.textbox.js",css:"textbox.css",dependencies:["validatebox","linkbutton"]},filebox:{js:"jquery.filebox.js",css:"filebox.css",dependencies:["textbox"]},combo:{js:"jquery.combo.js",css:"combo.css",dependencies:["panel","textbox"]},combobox:{js:"jquery.combobox.js",css:"combobox.css",dependencies:["combo"]},combotree:{js:"jquery.combotree.js",dependencies:["combo","tree"]},combogrid:{js:"jquery.combogrid.js",dependencies:["combo","datagrid"]},validatebox:{js:"jquery.validatebox.js",css:"validatebox.css",dependencies:["tooltip"]},numberbox:{js:"jquery.numberbox.js",dependencies:["textbox"]},searchbox:{js:"jquery.searchbox.js",css:"searchbox.css",dependencies:["menubutton","textbox"]},spinner:{js:"jquery.spinner.js",css:"spinner.css",dependencies:["textbox"]},numberspinner:{js:"jquery.numberspinner.js",dependencies:["spinner","numberbox"]},timespinner:{js:"jquery.timespinner.js",dependencies:["spinner"]},tree:{js:"jquery.tree.js",css:"tree.css",dependencies:["draggable","droppable"]},datebox:{js:"jquery.datebox.js",css:"datebox.css",dependencies:["calendar","combo"]},datetimebox:{js:"jquery.datetimebox.js",dependencies:["datebox","timespinner"]},slider:{js:"jquery.slider.js",dependencies:["draggable"]},tooltip:{js:"jquery.tooltip.js"},parser:{js:"jquery.parser.js"}};
+var _1={draggable:{js:"jquery.draggable.js"},droppable:{js:"jquery.droppable.js"},resizable:{js:"jquery.resizable.js"},linkbutton:{js:"jquery.linkbutton.js",css:"linkbutton.css"},progressbar:{js:"jquery.progressbar.js",css:"progressbar.css"},tooltip:{js:"jquery.tooltip.js",css:"tooltip.css"},pagination:{js:"jquery.pagination.js",css:"pagination.css",dependencies:["linkbutton"]},datagrid:{js:"jquery.datagrid.js",css:"datagrid.css",dependencies:["panel","resizable","linkbutton","pagination"]},treegrid:{js:"jquery.treegrid.js",css:"tree.css",dependencies:["datagrid"]},propertygrid:{js:"jquery.propertygrid.js",css:"propertygrid.css",dependencies:["datagrid"]},datalist:{js:"jquery.datalist.js",css:"datalist.css",dependencies:["datagrid"]},panel:{js:"jquery.panel.js",css:"panel.css"},window:{js:"jquery.window.js",css:"window.css",dependencies:["resizable","draggable","panel"]},dialog:{js:"jquery.dialog.js",css:"dialog.css",dependencies:["linkbutton","window"]},messager:{js:"jquery.messager.js",css:"messager.css",dependencies:["linkbutton","dialog","progressbar"]},layout:{js:"jquery.layout.js",css:"layout.css",dependencies:["resizable","panel"]},form:{js:"jquery.form.js"},menu:{js:"jquery.menu.js",css:"menu.css"},tabs:{js:"jquery.tabs.js",css:"tabs.css",dependencies:["panel","linkbutton"]},menubutton:{js:"jquery.menubutton.js",css:"menubutton.css",dependencies:["linkbutton","menu"]},splitbutton:{js:"jquery.splitbutton.js",css:"splitbutton.css",dependencies:["menubutton"]},switchbutton:{js:"jquery.switchbutton.js",css:"switchbutton.css"},accordion:{js:"jquery.accordion.js",css:"accordion.css",dependencies:["panel"]},calendar:{js:"jquery.calendar.js",css:"calendar.css"},textbox:{js:"jquery.textbox.js",css:"textbox.css",dependencies:["validatebox","linkbutton"]},passwordbox:{js:"jquery.passwordbox.js",css:"passwordbox.css",dependencies:["textbox"]},filebox:{js:"jquery.filebox.js",css:"filebox.css",dependencies:["textbox"]},combo:{js:"jquery.combo.js",css:"combo.css",dependencies:["panel","textbox"]},combobox:{js:"jquery.combobox.js",css:"combobox.css",dependencies:["combo"]},combotree:{js:"jquery.combotree.js",dependencies:["combo","tree"]},combogrid:{js:"jquery.combogrid.js",dependencies:["combo","datagrid"]},combotreegrid:{js:"jquery.combotreegrid.js",dependencies:["combo","treegrid"]},tagbox:{js:"jquery.tagbox.js",dependencies:["combobox"]},validatebox:{js:"jquery.validatebox.js",css:"validatebox.css",dependencies:["tooltip"]},numberbox:{js:"jquery.numberbox.js",dependencies:["textbox"]},searchbox:{js:"jquery.searchbox.js",css:"searchbox.css",dependencies:["menubutton","textbox"]},spinner:{js:"jquery.spinner.js",css:"spinner.css",dependencies:["textbox"]},numberspinner:{js:"jquery.numberspinner.js",dependencies:["spinner","numberbox"]},timespinner:{js:"jquery.timespinner.js",dependencies:["spinner"]},tree:{js:"jquery.tree.js",css:"tree.css",dependencies:["draggable","droppable"]},datebox:{js:"jquery.datebox.js",css:"datebox.css",dependencies:["calendar","combo"]},datetimebox:{js:"jquery.datetimebox.js",dependencies:["datebox","timespinner"]},slider:{js:"jquery.slider.js",dependencies:["draggable"]},parser:{js:"jquery.parser.js"},mobile:{js:"jquery.mobile.js"}};
var _2={"af":"easyui-lang-af.js","ar":"easyui-lang-ar.js","bg":"easyui-lang-bg.js","ca":"easyui-lang-ca.js","cs":"easyui-lang-cs.js","cz":"easyui-lang-cz.js","da":"easyui-lang-da.js","de":"easyui-lang-de.js","el":"easyui-lang-el.js","en":"easyui-lang-en.js","es":"easyui-lang-es.js","fr":"easyui-lang-fr.js","it":"easyui-lang-it.js","jp":"easyui-lang-jp.js","nl":"easyui-lang-nl.js","pl":"easyui-lang-pl.js","pt_BR":"easyui-lang-pt_BR.js","ru":"easyui-lang-ru.js","sv_SE":"easyui-lang-sv_SE.js","tr":"easyui-lang-tr.js","zh_CN":"easyui-lang-zh_CN.js","zh_TW":"easyui-lang-zh_TW.js"};
var _3={};
function _4(_5,_6){
diff --git a/assets/js/easy-ui/editors/fileBrowser.js b/assets/js/easy-ui/editors/fileBrowser.js
old mode 100755
new mode 100644
index a7649d0bf1..5e0163ad41
--- a/assets/js/easy-ui/editors/fileBrowser.js
+++ b/assets/js/easy-ui/editors/fileBrowser.js
@@ -3,7 +3,7 @@
fileBrowser: {
init: function (container, options) {
var input = $('' + (options.hasOwnProperty('icon') ? ' ').appendTo(container);
button.click({
target: this,
field: input,
@@ -22,7 +22,7 @@
$(target).val(value);
},
resize: function (target, width) {
- return;
+ $(target).width(width-30);
},
browse: function (e) {
var width = screen.width * 0.5;
diff --git a/assets/js/easy-ui/jquery.easyui.min.js b/assets/js/easy-ui/jquery.easyui.min.js
old mode 100755
new mode 100644
index 6c061dd903..ed68ac4cd3
--- a/assets/js/easy-ui/jquery.easyui.min.js
+++ b/assets/js/easy-ui/jquery.easyui.min.js
@@ -1,158 +1,222 @@
/**
- * jQuery EasyUI 1.4.1
+ * jQuery EasyUI 1.5.2
*
- * Copyright (c) 2009-2014 www.jeasyui.com. All rights reserved.
+ * Copyright (c) 2009-2017 www.jeasyui.com. All rights reserved.
*
- * Licensed under the GPL license: http://www.gnu.org/licenses/gpl.txt
- * To use it on other terms please contact us at info@jeasyui.com
+ * Licensed under the freeware license: http://www.jeasyui.com/license_freeware.php
+ * To use it on other terms please contact us: info@jeasyui.com
*
*/
(function($){
-$.parser={auto:true,onComplete:function(_1){
-},plugins:["draggable","droppable","resizable","pagination","tooltip","linkbutton","menu","menubutton","splitbutton","progressbar","tree","textbox","filebox","combo","combobox","combotree","combogrid","numberbox","validatebox","searchbox","spinner","numberspinner","timespinner","datetimespinner","calendar","datebox","datetimebox","slider","layout","panel","datagrid","propertygrid","treegrid","tabs","accordion","window","dialog","form"],parse:function(_2){
+$.easyui={indexOfArray:function(a,o,id){
+for(var i=0,_1=a.length;i<_1;i++){
+if(id==undefined){
+if(a[i]==o){
+return i;
+}
+}else{
+if(a[i][o]==id){
+return i;
+}
+}
+}
+return -1;
+},removeArrayItem:function(a,o,id){
+if(typeof o=="string"){
+for(var i=0,_2=a.length;i<_2;i++){
+if(a[i][o]==id){
+a.splice(i,1);
+return;
+}
+}
+}else{
+var _3=this.indexOfArray(a,o);
+if(_3!=-1){
+a.splice(_3,1);
+}
+}
+},addArrayItem:function(a,o,r){
+var _4=this.indexOfArray(a,o,r?r[o]:undefined);
+if(_4==-1){
+a.push(r?r:o);
+}else{
+a[_4]=r?r:o;
+}
+},getArrayItem:function(a,o,id){
+var _5=this.indexOfArray(a,o,id);
+return _5==-1?null:a[_5];
+},forEach:function(_6,_7,_8){
+var _9=[];
+for(var i=0;i<_6.length;i++){
+_9.push(_6[i]);
+}
+while(_9.length){
+var _a=_9.shift();
+if(_8(_a)==false){
+return;
+}
+if(_7&&_a.children){
+for(var i=_a.children.length-1;i>=0;i--){
+_9.unshift(_a.children[i]);
+}
+}
+}
+}};
+$.parser={auto:true,onComplete:function(_b){
+},plugins:["draggable","droppable","resizable","pagination","tooltip","linkbutton","menu","menubutton","splitbutton","switchbutton","progressbar","tree","textbox","passwordbox","filebox","combo","combobox","combotree","combogrid","combotreegrid","tagbox","numberbox","validatebox","searchbox","spinner","numberspinner","timespinner","datetimespinner","calendar","datebox","datetimebox","slider","layout","panel","datagrid","propertygrid","treegrid","datalist","tabs","accordion","window","dialog","form"],parse:function(_c){
var aa=[];
for(var i=0;i<$.parser.plugins.length;i++){
-var _3=$.parser.plugins[i];
-var r=$(".easyui-"+_3,_2);
+var _d=$.parser.plugins[i];
+var r=$(".easyui-"+_d,_c);
if(r.length){
-if(r[_3]){
-r[_3]();
+if(r[_d]){
+r.each(function(){
+$(this)[_d]($.data(this,"options")||{});
+});
}else{
-aa.push({name:_3,jq:r});
+aa.push({name:_d,jq:r});
}
}
}
if(aa.length&&window.easyloader){
-var _4=[];
+var _e=[];
for(var i=0;i=0){
-v=Math.floor((_8.width()-_9)*v/100);
+},parseValue:function(_10,_11,_12,_13){
+_13=_13||0;
+var v=$.trim(String(_11||""));
+var _14=v.substr(v.length-1,1);
+if(_14=="%"){
+v=parseFloat(v.substr(0,v.length-1));
+if(_10.toLowerCase().indexOf("width")>=0){
+v=Math.floor((_12.width()-_13)*v/100);
}else{
-v=Math.floor((_8.height()-_9)*v/100);
+v=Math.floor((_12.height()-_13)*v/100);
}
}else{
v=parseInt(v)||undefined;
}
return v;
-},parseOptions:function(_b,_c){
-var t=$(_b);
-var _d={};
+},parseOptions:function(_15,_16){
+var t=$(_15);
+var _17={};
var s=$.trim(t.attr("data-options"));
if(s){
if(s.substring(0,1)!="{"){
s="{"+s+"}";
}
-_d=(new Function("return "+s))();
+_17=(new Function("return "+s))();
}
$.map(["width","height","left","top","minWidth","maxWidth","minHeight","maxHeight"],function(p){
-var pv=$.trim(_b.style[p]||"");
+var pv=$.trim(_15.style[p]||"");
if(pv){
if(pv.indexOf("%")==-1){
-pv=parseInt(pv)||undefined;
+pv=parseInt(pv);
+if(isNaN(pv)){
+pv=undefined;
}
-_d[p]=pv;
+}
+_17[p]=pv;
}
});
-if(_c){
-var _e={};
-for(var i=0;i<_c.length;i++){
-var pp=_c[i];
+if(_16){
+var _18={};
+for(var i=0;i<_16.length;i++){
+var pp=_16[i];
if(typeof pp=="string"){
-_e[pp]=t.attr(pp);
+_18[pp]=t.attr(pp);
}else{
-for(var _f in pp){
-var _10=pp[_f];
-if(_10=="boolean"){
-_e[_f]=t.attr(_f)?(t.attr(_f)=="true"):undefined;
+for(var _19 in pp){
+var _1a=pp[_19];
+if(_1a=="boolean"){
+_18[_19]=t.attr(_19)?(t.attr(_19)=="true"):undefined;
}else{
-if(_10=="number"){
-_e[_f]=t.attr(_f)=="0"?0:parseFloat(t.attr(_f))||undefined;
+if(_1a=="number"){
+_18[_19]=t.attr(_19)=="0"?0:parseFloat(t.attr(_19))||undefined;
}
}
}
}
}
-$.extend(_d,_e);
+$.extend(_17,_18);
}
-return _d;
+return _17;
}};
$(function(){
var d=$("
").appendTo("body");
$._boxModel=d.outerWidth()!=100;
d.remove();
+d=$("
").appendTo("body");
+$._positionFixed=(d.css("position")=="fixed");
+d.remove();
if(!window.easyloader&&$.parser.auto){
$.parser.parse();
}
});
-$.fn._outerWidth=function(_11){
-if(_11==undefined){
+$.fn._outerWidth=function(_1b){
+if(_1b==undefined){
if(this[0]==window){
return this.width()||document.body.clientWidth;
}
return this.outerWidth()||0;
}
-return this._size("width",_11);
+return this._size("width",_1b);
};
-$.fn._outerHeight=function(_12){
-if(_12==undefined){
+$.fn._outerHeight=function(_1c){
+if(_1c==undefined){
if(this[0]==window){
return this.height()||document.body.clientHeight;
}
return this.outerHeight()||0;
}
-return this._size("height",_12);
+return this._size("height",_1c);
};
-$.fn._scrollLeft=function(_13){
-if(_13==undefined){
+$.fn._scrollLeft=function(_1d){
+if(_1d==undefined){
return this.scrollLeft();
}else{
return this.each(function(){
-$(this).scrollLeft(_13);
+$(this).scrollLeft(_1d);
});
}
};
$.fn._propAttr=$.fn.prop||$.fn.attr;
-$.fn._size=function(_14,_15){
-if(typeof _14=="string"){
-if(_14=="clear"){
+$.fn._size=function(_1e,_1f){
+if(typeof _1e=="string"){
+if(_1e=="clear"){
return this.each(function(){
$(this).css({width:"",minWidth:"",maxWidth:"",height:"",minHeight:"",maxHeight:""});
});
}else{
-if(_14=="fit"){
+if(_1e=="fit"){
return this.each(function(){
-_16(this,this.tagName=="BODY"?$("body"):$(this).parent(),true);
+_20(this,this.tagName=="BODY"?$("body"):$(this).parent(),true);
});
}else{
-if(_14=="unfit"){
+if(_1e=="unfit"){
return this.each(function(){
-_16(this,$(this).parent(),false);
+_20(this,$(this).parent(),false);
});
}else{
-if(_15==undefined){
-return _17(this[0],_14);
+if(_1f==undefined){
+return _21(this[0],_1e);
}else{
return this.each(function(){
-_17(this,_14,_15);
+_21(this,_1e,_1f);
});
}
}
@@ -160,10 +224,10 @@ _17(this,_14,_15);
}
}else{
return this.each(function(){
-_15=_15||$(this).parent();
-$.extend(_14,_16(this,_15,_14.fit)||{});
-var r1=_18(this,"width",_15,_14);
-var r2=_18(this,"height",_15,_14);
+_1f=_1f||$(this).parent();
+$.extend(_1e,_20(this,_1f,_1e.fit)||{});
+var r1=_22(this,"width",_1f,_1e);
+var r2=_22(this,"height",_1f,_1e);
if(r1||r2){
$(this).addClass("easyui-fluid");
}else{
@@ -171,17 +235,17 @@ $(this).removeClass("easyui-fluid");
}
});
}
-function _16(_19,_1a,fit){
-if(!_1a.length){
+function _20(_23,_24,fit){
+if(!_24.length){
return false;
}
-var t=$(_19)[0];
-var p=_1a[0];
-var _1b=p.fcount||0;
+var t=$(_23)[0];
+var p=_24[0];
+var _25=p.fcount||0;
if(fit){
if(!t.fitted){
t.fitted=true;
-p.fcount=_1b+1;
+p.fcount=_25+1;
$(p).addClass("panel-noscroll");
if(p.tagName=="BODY"){
$("html").addClass("panel-fit");
@@ -191,7 +255,7 @@ return {width:($(p).width()||1),height:($(p).height()||1)};
}else{
if(t.fitted){
t.fitted=false;
-p.fcount=_1b-1;
+p.fcount=_25-1;
if(p.fcount==0){
$(p).removeClass("panel-noscroll");
if(p.tagName=="BODY"){
@@ -202,18 +266,18 @@ $("html").removeClass("panel-fit");
return false;
}
};
-function _18(_1c,_1d,_1e,_1f){
-var t=$(_1c);
-var p=_1d;
+function _22(_26,_27,_28,_29){
+var t=$(_26);
+var p=_27;
var p1=p.substr(0,1).toUpperCase()+p.substr(1);
-var min=$.parser.parseValue("min"+p1,_1f["min"+p1],_1e);
-var max=$.parser.parseValue("max"+p1,_1f["max"+p1],_1e);
-var val=$.parser.parseValue(p,_1f[p],_1e);
-var _20=(String(_1f[p]||"").indexOf("%")>=0?true:false);
+var min=$.parser.parseValue("min"+p1,_29["min"+p1],_28);
+var max=$.parser.parseValue("max"+p1,_29["max"+p1],_28);
+var val=$.parser.parseValue(p,_29[p],_28);
+var _2a=(String(_29[p]||"").indexOf("%")>=0?true:false);
if(!isNaN(val)){
var v=Math.min(Math.max(val,min||0),max||99999);
-if(!_20){
-_1f[p]=v;
+if(!_2a){
+_29[p]=v;
}
t._size("min"+p1,"");
t._size("max"+p1,"");
@@ -223,34 +287,34 @@ t._size(p,"");
t._size("min"+p1,min);
t._size("max"+p1,max);
}
-return _20||_1f.fit;
+return _2a||_29.fit;
};
-function _17(_21,_22,_23){
-var t=$(_21);
-if(_23==undefined){
-_23=parseInt(_21.style[_22]);
-if(isNaN(_23)){
+function _21(_2b,_2c,_2d){
+var t=$(_2b);
+if(_2d==undefined){
+_2d=parseInt(_2b.style[_2c]);
+if(isNaN(_2d)){
return undefined;
}
if($._boxModel){
-_23+=_24();
+_2d+=_2e();
}
-return _23;
+return _2d;
}else{
-if(_23===""){
-t.css(_22,"");
+if(_2d===""){
+t.css(_2c,"");
}else{
if($._boxModel){
-_23-=_24();
-if(_23<0){
-_23=0;
+_2d-=_2e();
+if(_2d<0){
+_2d=0;
}
}
-t.css(_22,_23+"px");
+t.css(_2c,_2d+"px");
}
}
-function _24(){
-if(_22.toLowerCase().indexOf("width")>=0){
+function _2e(){
+if(_2c.toLowerCase().indexOf("width")>=0){
return t.outerWidth()-t.width();
}else{
return t.outerHeight()-t.height();
@@ -260,204 +324,212 @@ return t.outerHeight()-t.height();
};
})(jQuery);
(function($){
-var _25=null;
-var _26=null;
-var _27=false;
-function _28(e){
+var _2f=null;
+var _30=null;
+var _31=false;
+function _32(e){
if(e.touches.length!=1){
return;
}
-if(!_27){
-_27=true;
+if(!_31){
+_31=true;
dblClickTimer=setTimeout(function(){
-_27=false;
+_31=false;
},500);
}else{
clearTimeout(dblClickTimer);
-_27=false;
-_29(e,"dblclick");
+_31=false;
+_33(e,"dblclick");
}
-_25=setTimeout(function(){
-_29(e,"contextmenu",3);
+_2f=setTimeout(function(){
+_33(e,"contextmenu",3);
},1000);
-_29(e,"mousedown");
+_33(e,"mousedown");
if($.fn.draggable.isDragging||$.fn.resizable.isResizing){
e.preventDefault();
}
};
-function _2a(e){
+function _34(e){
if(e.touches.length!=1){
return;
}
-if(_25){
-clearTimeout(_25);
+if(_2f){
+clearTimeout(_2f);
}
-_29(e,"mousemove");
+_33(e,"mousemove");
if($.fn.draggable.isDragging||$.fn.resizable.isResizing){
e.preventDefault();
}
};
-function _2b(e){
-if(_25){
-clearTimeout(_25);
+function _35(e){
+if(_2f){
+clearTimeout(_2f);
}
-_29(e,"mouseup");
+_33(e,"mouseup");
if($.fn.draggable.isDragging||$.fn.resizable.isResizing){
e.preventDefault();
}
};
-function _29(e,_2c,_2d){
-var _2e=new $.Event(_2c);
-_2e.pageX=e.changedTouches[0].pageX;
-_2e.pageY=e.changedTouches[0].pageY;
-_2e.which=_2d||1;
-$(e.target).trigger(_2e);
+function _33(e,_36,_37){
+var _38=new $.Event(_36);
+_38.pageX=e.changedTouches[0].pageX;
+_38.pageY=e.changedTouches[0].pageY;
+_38.which=_37||1;
+$(e.target).trigger(_38);
};
if(document.addEventListener){
-document.addEventListener("touchstart",_28,true);
-document.addEventListener("touchmove",_2a,true);
-document.addEventListener("touchend",_2b,true);
+document.addEventListener("touchstart",_32,true);
+document.addEventListener("touchmove",_34,true);
+document.addEventListener("touchend",_35,true);
}
})(jQuery);
(function($){
-function _2f(e){
-var _30=$.data(e.data.target,"draggable");
-var _31=_30.options;
-var _32=_30.proxy;
-var _33=e.data;
-var _34=_33.startLeft+e.pageX-_33.startX;
-var top=_33.startTop+e.pageY-_33.startY;
-if(_32){
-if(_32.parent()[0]==document.body){
-if(_31.deltaX!=null&&_31.deltaX!=undefined){
-_34=e.pageX+_31.deltaX;
-}else{
-_34=e.pageX-e.data.offsetWidth;
-}
-if(_31.deltaY!=null&&_31.deltaY!=undefined){
-top=e.pageY+_31.deltaY;
+function _39(e){
+var _3a=$.data(e.data.target,"draggable");
+var _3b=_3a.options;
+var _3c=_3a.proxy;
+var _3d=e.data;
+var _3e=_3d.startLeft+e.pageX-_3d.startX;
+var top=_3d.startTop+e.pageY-_3d.startY;
+if(_3c){
+if(_3c.parent()[0]==document.body){
+if(_3b.deltaX!=null&&_3b.deltaX!=undefined){
+_3e=e.pageX+_3b.deltaX;
+}else{
+_3e=e.pageX-e.data.offsetWidth;
+}
+if(_3b.deltaY!=null&&_3b.deltaY!=undefined){
+top=e.pageY+_3b.deltaY;
}else{
top=e.pageY-e.data.offsetHeight;
}
}else{
-if(_31.deltaX!=null&&_31.deltaX!=undefined){
-_34+=e.data.offsetWidth+_31.deltaX;
+if(_3b.deltaX!=null&&_3b.deltaX!=undefined){
+_3e+=e.data.offsetWidth+_3b.deltaX;
}
-if(_31.deltaY!=null&&_31.deltaY!=undefined){
-top+=e.data.offsetHeight+_31.deltaY;
+if(_3b.deltaY!=null&&_3b.deltaY!=undefined){
+top+=e.data.offsetHeight+_3b.deltaY;
}
}
}
if(e.data.parent!=document.body){
-_34+=$(e.data.parent).scrollLeft();
+_3e+=$(e.data.parent).scrollLeft();
top+=$(e.data.parent).scrollTop();
}
-if(_31.axis=="h"){
-_33.left=_34;
+if(_3b.axis=="h"){
+_3d.left=_3e;
}else{
-if(_31.axis=="v"){
-_33.top=top;
+if(_3b.axis=="v"){
+_3d.top=top;
}else{
-_33.left=_34;
-_33.top=top;
+_3d.left=_3e;
+_3d.top=top;
}
}
};
-function _35(e){
-var _36=$.data(e.data.target,"draggable");
-var _37=_36.options;
-var _38=_36.proxy;
-if(!_38){
-_38=$(e.data.target);
+function _3f(e){
+var _40=$.data(e.data.target,"draggable");
+var _41=_40.options;
+var _42=_40.proxy;
+if(!_42){
+_42=$(e.data.target);
}
-_38.css({left:e.data.left,top:e.data.top});
-$("body").css("cursor",_37.cursor);
+_42.css({left:e.data.left,top:e.data.top});
+$("body").css("cursor",_41.cursor);
};
-function _39(e){
-$.fn.draggable.isDragging=true;
-var _3a=$.data(e.data.target,"draggable");
-var _3b=_3a.options;
-var _3c=$(".droppable").filter(function(){
+function _43(e){
+if(!$.fn.draggable.isDragging){
+return false;
+}
+var _44=$.data(e.data.target,"draggable");
+var _45=_44.options;
+var _46=$(".droppable:visible").filter(function(){
return e.data.target!=this;
}).filter(function(){
-var _3d=$.data(this,"droppable").options.accept;
-if(_3d){
-return $(_3d).filter(function(){
+var _47=$.data(this,"droppable").options.accept;
+if(_47){
+return $(_47).filter(function(){
return this==e.data.target;
}).length>0;
}else{
return true;
}
});
-_3a.droppables=_3c;
-var _3e=_3a.proxy;
-if(!_3e){
-if(_3b.proxy){
-if(_3b.proxy=="clone"){
-_3e=$(e.data.target).clone().insertAfter(e.data.target);
+_44.droppables=_46;
+var _48=_44.proxy;
+if(!_48){
+if(_45.proxy){
+if(_45.proxy=="clone"){
+_48=$(e.data.target).clone().insertAfter(e.data.target);
}else{
-_3e=_3b.proxy.call(e.data.target,e.data.target);
+_48=_45.proxy.call(e.data.target,e.data.target);
}
-_3a.proxy=_3e;
+_44.proxy=_48;
}else{
-_3e=$(e.data.target);
+_48=$(e.data.target);
}
}
-_3e.css("position","absolute");
-_2f(e);
-_35(e);
-_3b.onStartDrag.call(e.data.target,e);
+_48.css("position","absolute");
+_39(e);
+_3f(e);
+_45.onStartDrag.call(e.data.target,e);
return false;
};
-function _3f(e){
-var _40=$.data(e.data.target,"draggable");
-_2f(e);
-if(_40.options.onDrag.call(e.data.target,e)!=false){
-_35(e);
+function _49(e){
+if(!$.fn.draggable.isDragging){
+return false;
+}
+var _4a=$.data(e.data.target,"draggable");
+_39(e);
+if(_4a.options.onDrag.call(e.data.target,e)!=false){
+_3f(e);
}
-var _41=e.data.target;
-_40.droppables.each(function(){
-var _42=$(this);
-if(_42.droppable("options").disabled){
+var _4b=e.data.target;
+_4a.droppables.each(function(){
+var _4c=$(this);
+if(_4c.droppable("options").disabled){
return;
}
-var p2=_42.offset();
-if(e.pageX>p2.left&&e.pageXp2.top&&e.pageYp2.left&&e.pageXp2.top&&e.pageYp2.left&&e.pageXp2.top&&e.pageYp2.left&&e.pageXp2.top&&e.pageY_57.options.edge;
+function _5d(e){
+var _62=$.data(e.data.target,"draggable");
+var _63=_62.handle;
+var _64=$(_63).offset();
+var _65=$(_63).outerWidth();
+var _66=$(_63).outerHeight();
+var t=e.pageY-_64.top;
+var r=_64.left+_65-e.pageX;
+var b=_64.top+_66-e.pageY;
+var l=e.pageX-_64.left;
+return Math.min(t,r,b,l)>_62.options.edge;
};
});
};
@@ -581,11 +666,11 @@ return jq.each(function(){
$(this).draggable({disabled:true});
});
}};
-$.fn.draggable.parseOptions=function(_5c){
-var t=$(_5c);
-return $.extend({},$.parser.parseOptions(_5c,["cursor","handle","axis",{"revert":"boolean","deltaX":"number","deltaY":"number","edge":"number"}]),{disabled:(t.attr("disabled")?true:undefined)});
+$.fn.draggable.parseOptions=function(_67){
+var t=$(_67);
+return $.extend({},$.parser.parseOptions(_67,["cursor","handle","axis",{"revert":"boolean","deltaX":"number","deltaY":"number","edge":"number","delay":"number"}]),{disabled:(t.attr("disabled")?true:undefined)});
};
-$.fn.draggable.defaults={proxy:null,revert:false,cursor:"move",deltaX:null,deltaY:null,handle:null,disabled:false,edge:0,axis:null,onBeforeDrag:function(e){
+$.fn.draggable.defaults={proxy:null,revert:false,cursor:"move",deltaX:null,deltaY:null,handle:null,disabled:false,edge:0,axis:null,delay:100,onBeforeDrag:function(e){
},onStartDrag:function(e){
},onDrag:function(e){
},onStopDrag:function(e){
@@ -593,33 +678,33 @@ $.fn.draggable.defaults={proxy:null,revert:false,cursor:"move",deltaX:null,delta
$.fn.draggable.isDragging=false;
})(jQuery);
(function($){
-function _5d(_5e){
-$(_5e).addClass("droppable");
-$(_5e).bind("_dragenter",function(e,_5f){
-$.data(_5e,"droppable").options.onDragEnter.apply(_5e,[e,_5f]);
+function _68(_69){
+$(_69).addClass("droppable");
+$(_69).bind("_dragenter",function(e,_6a){
+$.data(_69,"droppable").options.onDragEnter.apply(_69,[e,_6a]);
});
-$(_5e).bind("_dragleave",function(e,_60){
-$.data(_5e,"droppable").options.onDragLeave.apply(_5e,[e,_60]);
+$(_69).bind("_dragleave",function(e,_6b){
+$.data(_69,"droppable").options.onDragLeave.apply(_69,[e,_6b]);
});
-$(_5e).bind("_dragover",function(e,_61){
-$.data(_5e,"droppable").options.onDragOver.apply(_5e,[e,_61]);
+$(_69).bind("_dragover",function(e,_6c){
+$.data(_69,"droppable").options.onDragOver.apply(_69,[e,_6c]);
});
-$(_5e).bind("_drop",function(e,_62){
-$.data(_5e,"droppable").options.onDrop.apply(_5e,[e,_62]);
+$(_69).bind("_drop",function(e,_6d){
+$.data(_69,"droppable").options.onDrop.apply(_69,[e,_6d]);
});
};
-$.fn.droppable=function(_63,_64){
-if(typeof _63=="string"){
-return $.fn.droppable.methods[_63](this,_64);
+$.fn.droppable=function(_6e,_6f){
+if(typeof _6e=="string"){
+return $.fn.droppable.methods[_6e](this,_6f);
}
-_63=_63||{};
+_6e=_6e||{};
return this.each(function(){
-var _65=$.data(this,"droppable");
-if(_65){
-$.extend(_65.options,_63);
+var _70=$.data(this,"droppable");
+if(_70){
+$.extend(_70.options,_6e);
}else{
-_5d(this);
-$.data(this,"droppable",{options:$.extend({},$.fn.droppable.defaults,$.fn.droppable.parseOptions(this),_63)});
+_68(this);
+$.data(this,"droppable",{options:$.extend({},$.fn.droppable.defaults,$.fn.droppable.parseOptions(this),_6e)});
}
});
};
@@ -634,97 +719,97 @@ return jq.each(function(){
$(this).droppable({disabled:true});
});
}};
-$.fn.droppable.parseOptions=function(_66){
-var t=$(_66);
-return $.extend({},$.parser.parseOptions(_66,["accept"]),{disabled:(t.attr("disabled")?true:undefined)});
-};
-$.fn.droppable.defaults={accept:null,disabled:false,onDragEnter:function(e,_67){
-},onDragOver:function(e,_68){
-},onDragLeave:function(e,_69){
-},onDrop:function(e,_6a){
+$.fn.droppable.parseOptions=function(_71){
+var t=$(_71);
+return $.extend({},$.parser.parseOptions(_71,["accept"]),{disabled:(t.attr("disabled")?true:undefined)});
+};
+$.fn.droppable.defaults={accept:null,disabled:false,onDragEnter:function(e,_72){
+},onDragOver:function(e,_73){
+},onDragLeave:function(e,_74){
+},onDrop:function(e,_75){
}};
})(jQuery);
(function($){
-$.fn.resizable=function(_6b,_6c){
-if(typeof _6b=="string"){
-return $.fn.resizable.methods[_6b](this,_6c);
-}
-function _6d(e){
-var _6e=e.data;
-var _6f=$.data(_6e.target,"resizable").options;
-if(_6e.dir.indexOf("e")!=-1){
-var _70=_6e.startWidth+e.pageX-_6e.startX;
-_70=Math.min(Math.max(_70,_6f.minWidth),_6f.maxWidth);
-_6e.width=_70;
-}
-if(_6e.dir.indexOf("s")!=-1){
-var _71=_6e.startHeight+e.pageY-_6e.startY;
-_71=Math.min(Math.max(_71,_6f.minHeight),_6f.maxHeight);
-_6e.height=_71;
-}
-if(_6e.dir.indexOf("w")!=-1){
-var _70=_6e.startWidth-e.pageX+_6e.startX;
-_70=Math.min(Math.max(_70,_6f.minWidth),_6f.maxWidth);
-_6e.width=_70;
-_6e.left=_6e.startLeft+_6e.startWidth-_6e.width;
-}
-if(_6e.dir.indexOf("n")!=-1){
-var _71=_6e.startHeight-e.pageY+_6e.startY;
-_71=Math.min(Math.max(_71,_6f.minHeight),_6f.maxHeight);
-_6e.height=_71;
-_6e.top=_6e.startTop+_6e.startHeight-_6e.height;
-}
-};
-function _72(e){
-var _73=e.data;
-var t=$(_73.target);
-t.css({left:_73.left,top:_73.top});
-if(t.outerWidth()!=_73.width){
-t._outerWidth(_73.width);
-}
-if(t.outerHeight()!=_73.height){
-t._outerHeight(_73.height);
-}
-};
-function _74(e){
+$.fn.resizable=function(_76,_77){
+if(typeof _76=="string"){
+return $.fn.resizable.methods[_76](this,_77);
+}
+function _78(e){
+var _79=e.data;
+var _7a=$.data(_79.target,"resizable").options;
+if(_79.dir.indexOf("e")!=-1){
+var _7b=_79.startWidth+e.pageX-_79.startX;
+_7b=Math.min(Math.max(_7b,_7a.minWidth),_7a.maxWidth);
+_79.width=_7b;
+}
+if(_79.dir.indexOf("s")!=-1){
+var _7c=_79.startHeight+e.pageY-_79.startY;
+_7c=Math.min(Math.max(_7c,_7a.minHeight),_7a.maxHeight);
+_79.height=_7c;
+}
+if(_79.dir.indexOf("w")!=-1){
+var _7b=_79.startWidth-e.pageX+_79.startX;
+_7b=Math.min(Math.max(_7b,_7a.minWidth),_7a.maxWidth);
+_79.width=_7b;
+_79.left=_79.startLeft+_79.startWidth-_79.width;
+}
+if(_79.dir.indexOf("n")!=-1){
+var _7c=_79.startHeight-e.pageY+_79.startY;
+_7c=Math.min(Math.max(_7c,_7a.minHeight),_7a.maxHeight);
+_79.height=_7c;
+_79.top=_79.startTop+_79.startHeight-_79.height;
+}
+};
+function _7d(e){
+var _7e=e.data;
+var t=$(_7e.target);
+t.css({left:_7e.left,top:_7e.top});
+if(t.outerWidth()!=_7e.width){
+t._outerWidth(_7e.width);
+}
+if(t.outerHeight()!=_7e.height){
+t._outerHeight(_7e.height);
+}
+};
+function _7f(e){
$.fn.resizable.isResizing=true;
$.data(e.data.target,"resizable").options.onStartResize.call(e.data.target,e);
return false;
};
-function _75(e){
-_6d(e);
+function _80(e){
+_78(e);
if($.data(e.data.target,"resizable").options.onResize.call(e.data.target,e)!=false){
-_72(e);
+_7d(e);
}
return false;
};
-function _76(e){
+function _81(e){
$.fn.resizable.isResizing=false;
-_6d(e,true);
-_72(e);
+_78(e,true);
+_7d(e);
$.data(e.data.target,"resizable").options.onStopResize.call(e.data.target,e);
$(document).unbind(".resizable");
$("body").css("cursor","");
return false;
};
return this.each(function(){
-var _77=null;
-var _78=$.data(this,"resizable");
-if(_78){
+var _82=null;
+var _83=$.data(this,"resizable");
+if(_83){
$(this).unbind(".resizable");
-_77=$.extend(_78.options,_6b||{});
+_82=$.extend(_83.options,_76||{});
}else{
-_77=$.extend({},$.fn.resizable.defaults,$.fn.resizable.parseOptions(this),_6b||{});
-$.data(this,"resizable",{options:_77});
+_82=$.extend({},$.fn.resizable.defaults,$.fn.resizable.parseOptions(this),_76||{});
+$.data(this,"resizable",{options:_82});
}
-if(_77.disabled==true){
+if(_82.disabled==true){
return;
}
$(this).bind("mousemove.resizable",{target:this},function(e){
if($.fn.resizable.isResizing){
return;
}
-var dir=_79(e);
+var dir=_84(e);
if(dir==""){
$(e.data.target).css("cursor","");
}else{
@@ -733,11 +818,11 @@ $(e.data.target).css("cursor",dir+"-resize");
}).bind("mouseleave.resizable",{target:this},function(e){
$(e.data.target).css("cursor","");
}).bind("mousedown.resizable",{target:this},function(e){
-var dir=_79(e);
+var dir=_84(e);
if(dir==""){
return;
}
-function _7a(css){
+function _85(css){
var val=parseInt($(e.data.target).css(css));
if(isNaN(val)){
return 0;
@@ -745,37 +830,37 @@ return 0;
return val;
}
};
-var _7b={target:e.data.target,dir:dir,startLeft:_7a("left"),startTop:_7a("top"),left:_7a("left"),top:_7a("top"),startX:e.pageX,startY:e.pageY,startWidth:$(e.data.target).outerWidth(),startHeight:$(e.data.target).outerHeight(),width:$(e.data.target).outerWidth(),height:$(e.data.target).outerHeight(),deltaWidth:$(e.data.target).outerWidth()-$(e.data.target).width(),deltaHeight:$(e.data.target).outerHeight()-$(e.data.target).height()};
-$(document).bind("mousedown.resizable",_7b,_74);
-$(document).bind("mousemove.resizable",_7b,_75);
-$(document).bind("mouseup.resizable",_7b,_76);
+var _86={target:e.data.target,dir:dir,startLeft:_85("left"),startTop:_85("top"),left:_85("left"),top:_85("top"),startX:e.pageX,startY:e.pageY,startWidth:$(e.data.target).outerWidth(),startHeight:$(e.data.target).outerHeight(),width:$(e.data.target).outerWidth(),height:$(e.data.target).outerHeight(),deltaWidth:$(e.data.target).outerWidth()-$(e.data.target).width(),deltaHeight:$(e.data.target).outerHeight()-$(e.data.target).height()};
+$(document).bind("mousedown.resizable",_86,_7f);
+$(document).bind("mousemove.resizable",_86,_80);
+$(document).bind("mouseup.resizable",_86,_81);
$("body").css("cursor",dir+"-resize");
});
-function _79(e){
+function _84(e){
var tt=$(e.data.target);
var dir="";
-var _7c=tt.offset();
-var _7d=tt.outerWidth();
-var _7e=tt.outerHeight();
-var _7f=_77.edge;
-if(e.pageY>_7c.top&&e.pageY<_7c.top+_7f){
+var _87=tt.offset();
+var _88=tt.outerWidth();
+var _89=tt.outerHeight();
+var _8a=_82.edge;
+if(e.pageY>_87.top&&e.pageY<_87.top+_8a){
dir+="n";
}else{
-if(e.pageY<_7c.top+_7e&&e.pageY>_7c.top+_7e-_7f){
+if(e.pageY<_87.top+_89&&e.pageY>_87.top+_89-_8a){
dir+="s";
}
}
-if(e.pageX>_7c.left&&e.pageX<_7c.left+_7f){
+if(e.pageX>_87.left&&e.pageX<_87.left+_8a){
dir+="w";
}else{
-if(e.pageX<_7c.left+_7d&&e.pageX>_7c.left+_7d-_7f){
+if(e.pageX<_87.left+_88&&e.pageX>_87.left+_88-_8a){
dir+="e";
}
}
-var _80=_77.handles.split(",");
-for(var i=0;i<_80.length;i++){
-var _81=_80[i].replace(/(^\s*)|(\s*$)/g,"");
-if(_81=="all"||_81==dir){
+var _8b=_82.handles.split(",");
+for(var i=0;i<_8b.length;i++){
+var _8c=_8b[i].replace(/(^\s*)|(\s*$)/g,"");
+if(_8c=="all"||_8c==dir){
return dir;
}
}
@@ -794,9 +879,9 @@ return jq.each(function(){
$(this).resizable({disabled:true});
});
}};
-$.fn.resizable.parseOptions=function(_82){
-var t=$(_82);
-return $.extend({},$.parser.parseOptions(_82,["handles",{minWidth:"number",minHeight:"number",maxWidth:"number",maxHeight:"number",edge:"number"}]),{disabled:(t.attr("disabled")?true:undefined)});
+$.fn.resizable.parseOptions=function(_8d){
+var t=$(_8d);
+return $.extend({},$.parser.parseOptions(_8d,["handles",{minWidth:"number",minHeight:"number",maxWidth:"number",maxHeight:"number",edge:"number"}]),{disabled:(t.attr("disabled")?true:undefined)});
};
$.fn.resizable.defaults={disabled:false,handles:"n, e, s, w, ne, se, sw, nw, all",minWidth:10,minHeight:10,maxWidth:10000,maxHeight:10000,edge:5,onStartResize:function(e){
},onResize:function(e){
@@ -805,81 +890,84 @@ $.fn.resizable.defaults={disabled:false,handles:"n, e, s, w, ne, se, sw, nw, all
$.fn.resizable.isResizing=false;
})(jQuery);
(function($){
-function _83(_84,_85){
-var _86=$.data(_84,"linkbutton").options;
-if(_85){
-$.extend(_86,_85);
-}
-if(_86.width||_86.height||_86.fit){
-var btn=$(_84);
-var _87=btn.parent();
-var _88=btn.is(":visible");
-if(!_88){
-var _89=$("
").insertBefore(_84);
-var _8a={position:btn.css("position"),display:btn.css("display"),left:btn.css("left")};
+function _8e(_8f,_90){
+var _91=$.data(_8f,"linkbutton").options;
+if(_90){
+$.extend(_91,_90);
+}
+if(_91.width||_91.height||_91.fit){
+var btn=$(_8f);
+var _92=btn.parent();
+var _93=btn.is(":visible");
+if(!_93){
+var _94=$("
").insertBefore(_8f);
+var _95={position:btn.css("position"),display:btn.css("display"),left:btn.css("left")};
btn.appendTo("body");
btn.css({position:"absolute",display:"inline-block",left:-20000});
}
-btn._size(_86,_87);
-var _8b=btn.find(".l-btn-left");
-_8b.css("margin-top",0);
-_8b.css("margin-top",parseInt((btn.height()-_8b.height())/2)+"px");
-if(!_88){
-btn.insertAfter(_89);
-btn.css(_8a);
-_89.remove();
+btn._size(_91,_92);
+var _96=btn.find(".l-btn-left");
+_96.css("margin-top",0);
+_96.css("margin-top",parseInt((btn.height()-_96.height())/2)+"px");
+if(!_93){
+btn.insertAfter(_94);
+btn.css(_95);
+_94.remove();
}
}
};
-function _8c(_8d){
-var _8e=$.data(_8d,"linkbutton").options;
-var t=$(_8d).empty();
-t.addClass("l-btn").removeClass("l-btn-plain l-btn-selected l-btn-plain-selected");
-t.removeClass("l-btn-small l-btn-medium l-btn-large").addClass("l-btn-"+_8e.size);
-if(_8e.plain){
+function _97(_98){
+var _99=$.data(_98,"linkbutton").options;
+var t=$(_98).empty();
+t.addClass("l-btn").removeClass("l-btn-plain l-btn-selected l-btn-plain-selected l-btn-outline");
+t.removeClass("l-btn-small l-btn-medium l-btn-large").addClass("l-btn-"+_99.size);
+if(_99.plain){
t.addClass("l-btn-plain");
}
-if(_8e.selected){
-t.addClass(_8e.plain?"l-btn-selected l-btn-plain-selected":"l-btn-selected");
+if(_99.outline){
+t.addClass("l-btn-outline");
}
-t.attr("group",_8e.group||"");
-t.attr("id",_8e.id||"");
-var _8f=$(" ").appendTo(_8f);
+$(" ").appendTo(_9a);
}
-if(_8e.iconCls){
-$(" ").addClass(_8e.iconCls).appendTo(_8f);
-_8f.addClass("l-btn-icon-"+_8e.iconAlign);
+if(_99.iconCls){
+$(" ").addClass(_99.iconCls).appendTo(_9a);
+_9a.addClass("l-btn-icon-"+_99.iconAlign);
}
t.unbind(".linkbutton").bind("focus.linkbutton",function(){
-if(!_8e.disabled){
+if(!_99.disabled){
$(this).addClass("l-btn-focus");
}
}).bind("blur.linkbutton",function(){
$(this).removeClass("l-btn-focus");
}).bind("click.linkbutton",function(){
-if(!_8e.disabled){
-if(_8e.toggle){
-if(_8e.selected){
+if(!_99.disabled){
+if(_99.toggle){
+if(_99.selected){
$(this).linkbutton("unselect");
}else{
$(this).linkbutton("select");
}
}
-_8e.onClick.call(this);
+_99.onClick.call(this);
}
});
-_90(_8d,_8e.selected);
-_91(_8d,_8e.disabled);
+_9b(_98,_99.selected);
+_9c(_98,_99.disabled);
};
-function _90(_92,_93){
-var _94=$.data(_92,"linkbutton").options;
-if(_93){
-if(_94.group){
-$("a.l-btn[group=\""+_94.group+"\"]").each(function(){
+function _9b(_9d,_9e){
+var _9f=$.data(_9d,"linkbutton").options;
+if(_9e){
+if(_9f.group){
+$("a.l-btn[group=\""+_9f.group+"\"]").each(function(){
var o=$(this).linkbutton("options");
if(o.toggle){
$(this).removeClass("l-btn-selected l-btn-plain-selected");
@@ -887,107 +975,110 @@ o.selected=false;
}
});
}
-$(_92).addClass(_94.plain?"l-btn-selected l-btn-plain-selected":"l-btn-selected");
-_94.selected=true;
+$(_9d).addClass(_9f.plain?"l-btn-selected l-btn-plain-selected":"l-btn-selected");
+_9f.selected=true;
}else{
-if(!_94.group){
-$(_92).removeClass("l-btn-selected l-btn-plain-selected");
-_94.selected=false;
+if(!_9f.group){
+$(_9d).removeClass("l-btn-selected l-btn-plain-selected");
+_9f.selected=false;
}
}
};
-function _91(_95,_96){
-var _97=$.data(_95,"linkbutton");
-var _98=_97.options;
-$(_95).removeClass("l-btn-disabled l-btn-plain-disabled");
-if(_96){
-_98.disabled=true;
-var _99=$(_95).attr("href");
-if(_99){
-_97.href=_99;
-$(_95).attr("href","javascript:void(0)");
+function _9c(_a0,_a1){
+var _a2=$.data(_a0,"linkbutton");
+var _a3=_a2.options;
+$(_a0).removeClass("l-btn-disabled l-btn-plain-disabled");
+if(_a1){
+_a3.disabled=true;
+var _a4=$(_a0).attr("href");
+if(_a4){
+_a2.href=_a4;
+$(_a0).attr("href","javascript:;");
}
-if(_95.onclick){
-_97.onclick=_95.onclick;
-_95.onclick=null;
+if(_a0.onclick){
+_a2.onclick=_a0.onclick;
+_a0.onclick=null;
}
-_98.plain?$(_95).addClass("l-btn-disabled l-btn-plain-disabled"):$(_95).addClass("l-btn-disabled");
+_a3.plain?$(_a0).addClass("l-btn-disabled l-btn-plain-disabled"):$(_a0).addClass("l-btn-disabled");
}else{
-_98.disabled=false;
-if(_97.href){
-$(_95).attr("href",_97.href);
+_a3.disabled=false;
+if(_a2.href){
+$(_a0).attr("href",_a2.href);
}
-if(_97.onclick){
-_95.onclick=_97.onclick;
+if(_a2.onclick){
+_a0.onclick=_a2.onclick;
}
}
};
-$.fn.linkbutton=function(_9a,_9b){
-if(typeof _9a=="string"){
-return $.fn.linkbutton.methods[_9a](this,_9b);
+$.fn.linkbutton=function(_a5,_a6){
+if(typeof _a5=="string"){
+return $.fn.linkbutton.methods[_a5](this,_a6);
}
-_9a=_9a||{};
+_a5=_a5||{};
return this.each(function(){
-var _9c=$.data(this,"linkbutton");
-if(_9c){
-$.extend(_9c.options,_9a);
+var _a7=$.data(this,"linkbutton");
+if(_a7){
+$.extend(_a7.options,_a5);
}else{
-$.data(this,"linkbutton",{options:$.extend({},$.fn.linkbutton.defaults,$.fn.linkbutton.parseOptions(this),_9a)});
+$.data(this,"linkbutton",{options:$.extend({},$.fn.linkbutton.defaults,$.fn.linkbutton.parseOptions(this),_a5)});
$(this).removeAttr("disabled");
-$(this).bind("_resize",function(e,_9d){
-if($(this).hasClass("easyui-fluid")||_9d){
-_83(this);
+$(this).bind("_resize",function(e,_a8){
+if($(this).hasClass("easyui-fluid")||_a8){
+_8e(this);
}
return false;
});
}
-_8c(this);
-_83(this);
+_97(this);
+_8e(this);
});
};
$.fn.linkbutton.methods={options:function(jq){
return $.data(jq[0],"linkbutton").options;
-},resize:function(jq,_9e){
+},resize:function(jq,_a9){
return jq.each(function(){
-_83(this,_9e);
+_8e(this,_a9);
});
},enable:function(jq){
return jq.each(function(){
-_91(this,false);
+_9c(this,false);
});
},disable:function(jq){
return jq.each(function(){
-_91(this,true);
+_9c(this,true);
});
},select:function(jq){
return jq.each(function(){
-_90(this,true);
+_9b(this,true);
});
},unselect:function(jq){
return jq.each(function(){
-_90(this,false);
+_9b(this,false);
});
}};
-$.fn.linkbutton.parseOptions=function(_9f){
-var t=$(_9f);
-return $.extend({},$.parser.parseOptions(_9f,["id","iconCls","iconAlign","group","size",{plain:"boolean",toggle:"boolean",selected:"boolean"}]),{disabled:(t.attr("disabled")?true:undefined),text:$.trim(t.html()),iconCls:(t.attr("icon")||t.attr("iconCls"))});
+$.fn.linkbutton.parseOptions=function(_aa){
+var t=$(_aa);
+return $.extend({},$.parser.parseOptions(_aa,["id","iconCls","iconAlign","group","size","text",{plain:"boolean",toggle:"boolean",selected:"boolean",outline:"boolean"}]),{disabled:(t.attr("disabled")?true:undefined),text:($.trim(t.html())||undefined),iconCls:(t.attr("icon")||t.attr("iconCls"))});
};
-$.fn.linkbutton.defaults={id:null,disabled:false,toggle:false,selected:false,group:null,plain:false,text:"",iconCls:null,iconAlign:"left",size:"small",onClick:function(){
+$.fn.linkbutton.defaults={id:null,disabled:false,toggle:false,selected:false,outline:false,group:null,plain:false,text:"",iconCls:null,iconAlign:"left",size:"small",onClick:function(){
}};
})(jQuery);
(function($){
-function _a0(_a1){
-var _a2=$.data(_a1,"pagination");
-var _a3=_a2.options;
-var bb=_a2.bb={};
-var _a4=$(_a1).addClass("pagination").html("");
-var tr=_a4.find("tr");
-var aa=$.extend([],_a3.layout);
-if(!_a3.showPageList){
-_a5(aa,"list");
-}
-if(!_a3.showRefresh){
-_a5(aa,"refresh");
+function _ab(_ac){
+var _ad=$.data(_ac,"pagination");
+var _ae=_ad.options;
+var bb=_ad.bb={};
+var _af=$(_ac).addClass("pagination").html("");
+var tr=_af.find("tr");
+var aa=$.extend([],_ae.layout);
+if(!_ae.showPageList){
+_b0(aa,"list");
+}
+if(!_ae.showPageInfo){
+_b0(aa,"info");
+}
+if(!_ae.showRefresh){
+_b0(aa,"refresh");
}
if(aa[0]=="sep"){
aa.shift();
@@ -995,52 +1086,61 @@ aa.shift();
if(aa[aa.length-1]=="sep"){
aa.pop();
}
-for(var _a6=0;_a6