Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
522 commits
Select commit Hold shift + click to select a range
1ebd3a2
fix #1227
Pathologic Apr 24, 2017
0666c9b
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Apr 26, 2017
bce17e1
dropdown items white icons on hover
Nicola1971 Apr 26, 2017
48c154c
Merge pull request #1319 from Nicola1971/develop
Dmi3yy Apr 26, 2017
a9b8743
[F] dashboard>recent documents>uses template
yama Apr 27, 2017
5b854e0
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Nicola1971 Apr 27, 2017
622d1c9
[f] fix manage elements buttons styles
Nicola1971 Apr 27, 2017
db05a33
Merge pull request #1322 from Nicola1971/develop
Dmi3yy Apr 30, 2017
fd3f203
[FIX] sidebar size in new theme
Dmi3yy Apr 30, 2017
8f3b2d2
Add support responsive manager
Dmi3yy Apr 30, 2017
9149993
fix symbols for transAlias in Russian lang
Dmi3yy Apr 30, 2017
34632cb
Fix manager manager multiple fields support with tinymce4(need change…
Dmi3yy Apr 30, 2017
7085679
update dropdown menu theme
Dmi3yy Apr 30, 2017
cf23219
Managermanager multiple fields gets redactor from mode settings
Dmi3yy Apr 30, 2017
63adf9b
Merge pull request #1318 from Pathologic/patch-1
Dmi3yy May 2, 2017
29fd46a
Update jqueryui in manager manager
Dmi3yy May 2, 2017
8b91d7b
fix double use makeUrl
Dmi3yy May 2, 2017
729f77f
Fix font in dropdown theme
Dmi3yy May 2, 2017
9bf33e9
revert add responcivemanager
Dmi3yy May 2, 2017
de0c078
fix OnParseProperties event
Pathologic May 2, 2017
57e8ab9
Merge pull request #1325 from Pathologic/patch-1
Dmi3yy May 2, 2017
58f9d74
fix sendForward method
Pathologic May 3, 2017
21f7d67
[F] #1320 Comments in snippets call are not work correct now
yama May 3, 2017
36b2468
Merge pull request #1327 from Pathologic/patch-1
Dmi3yy May 3, 2017
f1da529
[fix] fix argument in IE
Dmi3yy May 3, 2017
b90b812
[F] Rich text field in popup window is now working correctly without …
MrSwed May 3, 2017
ed3a433
[F] No scrolls in Rich text field popup window. Correct window and el…
MrSwed May 3, 2017
688691e
[-] old jQuery UI
MrSwed May 3, 2017
baccce8
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
May 3, 2017
08888b5
Navbar styles
May 3, 2017
c9a9272
[F] Again fix vertical align
MrSwed May 4, 2017
96a2697
Merge pull request #1328 from MrSwed/MM_richtext_popup
Dmi3yy May 13, 2017
24c7cc6
Merge pull request #1329 from MrSwed/MM_patch
Dmi3yy May 13, 2017
0a53f0b
Merge pull request #1330 from pmfx/develop
Dmi3yy May 13, 2017
bc43d8d
Merge pull request #1331 from MrSwed/cssfix
Dmi3yy May 13, 2017
6c0e492
Fix style
Dmi3yy May 13, 2017
199028a
Merge pull request #1 from modxcms/develop
mnoskov May 14, 2017
ec4b299
some fixes in installer and version checking
mnoskov May 14, 2017
8c94327
some fixes in installer and version checking
mnoskov May 14, 2017
8311639
installer fixes and version checking
mnoskov May 14, 2017
2881922
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
May 14, 2017
da6a6a1
Merge pull request #1333 from sunhaim/develop
Dmi3yy May 15, 2017
11e81c2
alias_visible fix - select children of hidden parents
mnoskov May 17, 2017
31f49e7
Merge pull request #1334 from sunhaim/develop
Dmi3yy May 17, 2017
9879f1e
Update tinyMCУ. to 4.6.1
Dmi3yy May 17, 2017
7030390
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
May 17, 2017
c141aa5
[I] v1.4 - added "Custom Conditions" to if-snippet
Deesen May 21, 2017
632ecf3
Merge pull request #1335 from Deesen/develop
Dmi3yy May 21, 2017
4c959fe
Fix for multiple custom conditions
Deesen May 22, 2017
fdc00e8
Merge pull request #1337 from Deesen/develop
Dmi3yy May 22, 2017
3e9a472
-Update theme modxre_dropdownmenu
Dmi3yy May 22, 2017
533ba39
[fix]. Document work with get tab
Dmi3yy May 22, 2017
30ea56a
Up version. 1.2.2-beta3
Dmi3yy May 22, 2017
451767f
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
May 25, 2017
3b5e047
Polish language update
May 26, 2017
3394929
[F] Avoid JS-errors in case of missing permissions
Deesen May 28, 2017
0ca78d8
[F] #1340 Display mainframe when no elements-permission are given
Deesen May 28, 2017
a3b9b16
Merge pull request #1341 from pmfx/develop
Dmi3yy May 29, 2017
13c8047
Merge pull request #1342 from Deesen/develop
Dmi3yy May 29, 2017
c2e5084
Update DocLister
Dmi3yy May 29, 2017
dbc7a49
update DocLister
Dmi3yy May 29, 2017
98bde17
Fix icon to FA
Dmi3yy May 29, 2017
5bfc03e
update dropdown theme
Dmi3yy May 29, 2017
522c6c0
Mainframe can work without jQuery
Dmi3yy May 29, 2017
2a2805f
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
May 29, 2017
d3fdc02
Ajaxsearch fix version
Dmi3yy May 29, 2017
78bb429
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
May 29, 2017
ef20d7c
Polish language update
May 29, 2017
bd660c8
Update tinymce to 4.6.3
Dmi3yy Jun 3, 2017
b32f765
Merge pull request #1344 from pmfx/develop
Dmi3yy Jun 3, 2017
ef2b99c
[F] prevent multiple drop events
mnoskov Jun 7, 2017
ec59467
[F] black background in png images changed to tile
mnoskov Jun 7, 2017
b7cd11a
Merge pull request #1352 from sunhaim/devel2
Dmi3yy Jun 7, 2017
e3ca7d3
[I] Enable CTRL-Key to open "Edit Resource" in new tab / target="_blank"
Deesen Jun 8, 2017
4aa4297
[F] Remove "$ not defined"-error
Deesen Jun 8, 2017
006329f
Merge pull request #1353 from Deesen/develop
Dmi3yy Jun 9, 2017
1ed25c2
Merge pull request #1351 from sunhaim/devel
Dmi3yy Jun 9, 2017
c565800
update theme Dropdown + clear code
Dmi3yy Jun 9, 2017
2116cc5
For cyrillic URL
atomoc Jun 10, 2017
c846f92
[C] #1354 Removed unnecessary additional TinyMCE4-package
Deesen Jun 11, 2017
9025ac1
[C] Replaced short-tag <? by <?php
Deesen Jun 11, 2017
fc764b9
[F] #1346 Allow users with permission "Allow root" to create doc in root
Deesen Jun 11, 2017
fa82430
[I] #1332 Highlight actual viewed or edited file
Deesen Jun 11, 2017
9f3871d
Merge pull request #1357 from Deesen/develop
Dmi3yy Jun 11, 2017
eaddeec
Manager Polish translation update
Jun 11, 2017
8d91029
fix for cyriclic
Dmi3yy Jun 11, 2017
31c5591
fix 3 lever for top menu
Dmi3yy Jun 11, 2017
fff9651
add FormLister
Dmi3yy Jun 11, 2017
ee390bb
add DocInfo
Dmi3yy Jun 11, 2017
88ff322
add DlBuildMenu
Dmi3yy Jun 11, 2017
75ae056
add DLcrumbs
Dmi3yy Jun 11, 2017
342bd02
fix bootstrap empty file error
Dmi3yy Jun 11, 2017
3ece0b5
Create core.php
Dmi3yy Jun 11, 2017
63e7d61
[F] Edit a role - check boxes were inline instead of block
bossloper Jun 12, 2017
21438b2
[F] Update TinyMCE version numbers to match
bossloper Jun 12, 2017
b329356
Update plugin.tinymce.php
bossloper Jun 12, 2017
6cbfec3
[F] Remove img tag so Font Awesome icons display for locked resource …
bossloper Jun 12, 2017
625838c
[F] #907 Quick Manager+ : Vertical align text
bossloper Jun 12, 2017
465d1da
update theme dropdown and extend codemirror
Dmi3yy Jun 13, 2017
1e94cac
Module Extras/Store parse chunk version
bossloper Jun 14, 2017
e402e27
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Jun 15, 2017
50c1b6b
Merge pull request #1355 from atomoc/patch-1
Dmi3yy Jun 16, 2017
4355e52
small fix
Dmi3yy Jun 16, 2017
33cbc42
Merge pull request #1359 from pmfx/develop
Dmi3yy Jun 16, 2017
39b9492
Merge pull request #1364 from bossloper/patch-5
Dmi3yy Jun 16, 2017
790edf6
Merge pull request #1365 from bossloper/patch-6
Dmi3yy Jun 16, 2017
76de20c
fix bug with add tv to tamplate with diferent window
Dmi3yy Jun 16, 2017
7778639
Merge pull request #1366 from bossloper/patch-7
Dmi3yy Jun 16, 2017
70b664c
Merge pull request #1367 from bossloper/patch-8
Dmi3yy Jun 16, 2017
5e715d0
Merge pull request #1368 from bossloper/patch-9
Dmi3yy Jun 16, 2017
34d27d4
some fix on dashboard
Dmi3yy Jun 16, 2017
58bae4a
[i] - set name from Request use with new mechanism create elements fr…
Dmi3yy Jun 16, 2017
66a67ad
[i] - set name from Request use with new mechanism create elements fr…
Dmi3yy Jun 16, 2017
53e8ab9
[i] - set name from Request use with new mechanism create elements fr…
Dmi3yy Jun 16, 2017
9e87bdb
update dropdown theme
Dmi3yy Jun 16, 2017
02eddad
no message
Dmi3yy Jun 16, 2017
e40365f
change some def values
Dmi3yy Jun 16, 2017
30e63a1
add sample head scripts
Dmi3yy Jun 16, 2017
826937e
add sample tv for head and SEO tab
Dmi3yy Jun 16, 2017
71b3389
update dropdown theme
Dmi3yy Jun 16, 2017
7fbb699
sql fix
Dmi3yy Jun 16, 2017
7dc6e4c
fix style
Dmi3yy Jun 16, 2017
e1a1648
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Jun 17, 2017
e13199a
[F] check for 'register_globals' fixed #1370
mnoskov Jun 19, 2017
5a85a24
Again! [-] old jQuery UI. Please be careful!
MrSwed Jun 19, 2017
dfa610e
Merge pull request #1372 from MrSwed/clean_again
Dmi3yy Jun 19, 2017
1de50da
Merge pull request #1371 from sunhaim/issue-1370
Dmi3yy Jun 19, 2017
4beccfd
update libs
Dmi3yy Jun 19, 2017
2560fbf
update doclister
Dmi3yy Jun 19, 2017
ae1f3a4
fix menu class
Dmi3yy Jun 19, 2017
a77bfeb
fix style for dashboard
Dmi3yy Jun 19, 2017
a03a7da
fix ajax.php in modxre_dropdownmenu
Dmi3yy Jun 19, 2017
814e234
fix css in modxre_dropdownmenu
Dmi3yy Jun 19, 2017
eadc9d5
update nodes
Dmi3yy Jun 19, 2017
aa2f48e
update modx.js
Dmi3yy Jun 19, 2017
bbac6e7
remove mootols from home page
Dmi3yy Jun 19, 2017
b4293cd
fix in modxre_dropdownmenu
Dmi3yy Jun 19, 2017
b10ef8e
fast work in manager after save document
Dmi3yy Jun 19, 2017
6e61ad5
fast work in manager after save document
Dmi3yy Jun 19, 2017
68cf1aa
fast work in manager after save document
Dmi3yy Jun 19, 2017
a6ff6ae
fast work in manager after save document
Dmi3yy Jun 19, 2017
c4ae736
fast work in manager after save document
Dmi3yy Jun 19, 2017
8b7fd2c
fast work in manager after save document
Dmi3yy Jun 19, 2017
f39b7e4
fast work in manager after save document
Dmi3yy Jun 19, 2017
46ad7dd
fast work in manager after save document
Dmi3yy Jun 19, 2017
1293a05
fast work in manager after save document
Dmi3yy Jun 19, 2017
6776e42
need only for settings
Dmi3yy Jun 19, 2017
d43f500
modxre_dropdown
Dmi3yy Jun 19, 2017
1881bdd
modxre2_dropdown
Dmi3yy Jun 19, 2017
5ec31bd
Merge remote-tracking branch 'refs/remotes/modxcms/develop' into develop
Jun 20, 2017
59c7db2
Small bug in tinymce translation
Jun 23, 2017
97538cc
Merge pull request #1376 from pmfx/develop
Dmi3yy Jun 26, 2017
c8843b0
[f] fix image position in backend tinmymce4
Dmi3yy Jun 30, 2017
8e18b04
Merge branch 'develop' of https://github.com/modxcms/evolution into d…
Dmi3yy Jun 30, 2017
97627c8
update formLister
Dmi3yy Jun 30, 2017
461b7ab
[F] snippet if fix php7 notice
Dmi3yy Jun 30, 2017
30b80cf
update userHelper plugin version
Dmi3yy Jun 30, 2017
09f9d25
FormLister 1.6.2
Dmi3yy Jun 30, 2017
e044e9d
no need bootstrap css in catecogy manager
Dmi3yy Jun 30, 2017
7564438
fix style
Dmi3yy Jun 30, 2017
91b54bf
[F] php7 notice
Dmi3yy Jun 30, 2017
1ae4c4e
default config max size images
Dmi3yy Jun 30, 2017
f27eee4
[F] php7 notices
Dmi3yy Jun 30, 2017
0dca7be
[F] php7 notices
Dmi3yy Jun 30, 2017
50267d2
update russian lang
Dmi3yy Jun 30, 2017
6f9cc55
update datapicker
Dmi3yy Jun 30, 2017
2d4202c
fix php7.2 error
Dmi3yy Jun 30, 2017
dfe5ae5
fix calendar path
Dmi3yy Jun 30, 2017
8b6b555
fix style
Dmi3yy Jun 30, 2017
d0b4f69
update login page
Dmi3yy Jun 30, 2017
8e8a5e6
update lockout page
Dmi3yy Jun 30, 2017
adcdd86
update in new theme
Dmi3yy Jun 30, 2017
368c037
update in new theme
Dmi3yy Jun 30, 2017
a91e1f6
update in new theme
Dmi3yy Jun 30, 2017
5faaacb
update in new theme
Dmi3yy Jun 30, 2017
9ed6ad5
update bkmanager in new theme
Dmi3yy Jun 30, 2017
4931690
update mutatу module for new theme
Dmi3yy Jun 30, 2017
f4b894b
update styles
Dmi3yy Jun 30, 2017
82192f0
update tree.php in new theme
Dmi3yy Jun 30, 2017
89e31b0
[f] fix in OnManagerNodePrepender
Dmi3yy Jun 30, 2017
11b63fe
fix in OnManagerMenuPrepender
Dmi3yy Jun 30, 2017
6a69cd4
update tree size
Dmi3yy Jun 30, 2017
eb144aa
fix modx.js
Dmi3yy Jun 30, 2017
8d8ce5c
add new jquery ui in managermanager
Dmi3yy Jun 30, 2017
ea70ac6
update FormLister
Dmi3yy Jun 30, 2017
d33c46c
add FormLister docs
Dmi3yy Jun 30, 2017
352b2b0
add lost files
Dmi3yy Jun 30, 2017
3f2573f
fix for ios iframe scroll
Dmi3yy Jun 30, 2017
3411e53
update ajax.php in new theme
Dmi3yy Jul 1, 2017
4cfc644
remove unused style
Dmi3yy Jul 1, 2017
9ad2877
remove ios css. used from 1.php
Dmi3yy Jul 1, 2017
c9bb1c0
fix js bug
Dmi3yy Jul 1, 2017
97b95d3
fix code style
Dmi3yy Jul 1, 2017
a003dc0
update js
Dmi3yy Jul 1, 2017
a6a1efd
clear code
Dmi3yy Jul 2, 2017
deec530
clear code
Dmi3yy Jul 2, 2017
66f22d1
del unused code
Dmi3yy Jul 2, 2017
25afbce
fix permission in new theme
Dmi3yy Jul 2, 2017
b48f800
fix style for action buttons in new theme
Dmi3yy Jul 2, 2017
efaddd7
clear code style
Dmi3yy Jul 2, 2017
992ca52
fix sidebar position
Dmi3yy Jul 2, 2017
d7cee5e
refactior action buttons
Dmi3yy Jul 2, 2017
d719b6e
fix sidebar width position
Dmi3yy Jul 2, 2017
42e5a9f
fix permision
Dmi3yy Jul 2, 2017
aaf61e6
fix css
Dmi3yy Jul 2, 2017
1394e01
add actionbuttons css
Dmi3yy Jul 2, 2017
04e4d12
fix action buttons in modules
Dmi3yy Jul 2, 2017
afbc8bf
fix action buttons in content
Dmi3yy Jul 2, 2017
34eff03
fix action buttons in files manager
Dmi3yy Jul 2, 2017
3a30e81
refactor action buttons
Dmi3yy Jul 2, 2017
9398228
refactor action buttons
Dmi3yy Jul 2, 2017
19093aa
refactor action buttons
Dmi3yy Jul 2, 2017
402cddb
refactor action buttons
Dmi3yy Jul 2, 2017
37a4ef3
refactor action buttons
Dmi3yy Jul 2, 2017
84880c7
refactor action buttons
Dmi3yy Jul 2, 2017
ce8d39c
refactor action buttons
Dmi3yy Jul 2, 2017
d867fc2
refactor action buttons
Dmi3yy Jul 2, 2017
a04ce19
update jeasy-ui
Dmi3yy Jul 3, 2017
fc0bcd7
add new file for jeasy-ui
Dmi3yy Jul 3, 2017
bcd7d0a
update DocLister to 2.3.3
Dmi3yy Jul 3, 2017
c76457b
fix lang
Dmi3yy Jul 3, 2017
f5dc2d6
update modxre2_dropdownmenu theme
Dmi3yy Jul 3, 2017
949d090
update phpmailer to 5.2.23
Dmi3yy Jul 3, 2017
565e25b
[Fix] #1377 $modx->getDocumentChildrenTVars()
yama Jul 4, 2017
ed84bbe
thumb generation fixed on some php7 systems
mnoskov Jul 7, 2017
13e4be6
[F] when modx installed in folder, request of home page with paramete…
mnoskov Jul 7, 2017
3b898ec
Merge pull request #1380 from sunhaim/folder_index_fix
Dmi3yy Jul 7, 2017
ed9b8ec
Merge pull request #1381 from sunhaim/tile_thumb_fix
Dmi3yy Jul 7, 2017
862d298
[F] #1343 Init Quicksearch after Tree-Reload for all tabs
Deesen Jul 8, 2017
540c87e
Merge pull request #1382 from Deesen/develop
yama Jul 9, 2017
4c7d864
first step for composer
Dmi3yy Jul 10, 2017
879cacc
update FormLister to 1.7.2
Dmi3yy Jul 10, 2017
7266067
fix tynyMCE
Dmi3yy Jul 10, 2017
5e7636e
[F] Days allowed to manager access #568
Dmi3yy Jul 10, 2017
33898ec
update modxre2_dropdown theme
Dmi3yy Jul 10, 2017
d033a23
update ru lang
Dmi3yy Jul 10, 2017
73e2210
fix &else in snippet if
Dmi3yy Jul 10, 2017
c937e4e
add one-dark theme in codemirror
Dmi3yy Jul 10, 2017
7854a19
fix send mail via smtp
Dmi3yy Jul 10, 2017
32c3319
fix doc parser
Dmi3yy Jul 10, 2017
e9000c2
update DocLister
Dmi3yy Jul 10, 2017
a7c01f6
update Plugins version
Dmi3yy Jul 10, 2017
1a6ad1f
for composer
Dmi3yy Jul 10, 2017
9a0da74
fix params for richtext
Dmi3yy Jul 10, 2017
e18d5d3
fix mm multiplefields for php 7
Dmi3yy Jul 10, 2017
99d1b62
[F] fix properties for instal snippet,modules,plugins
Dmi3yy Jul 10, 2017
ea5c7e9
Merge branch 'develop' of https://github.com/modxcms/evolution into d…
Dmi3yy Jul 10, 2017
9c8cf8e
Merge pull request #1383 from modxcms/develop
Dmi3yy Jul 10, 2017
b2adf44
version 1.2.2
Dmi3yy Jul 10, 2017
3ba038c
update Changelog
Dmi3yy Jul 10, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
232 changes: 232 additions & 0 deletions assets/docs/changelog.txt

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions assets/js/easy-ui/easyloader.js
100755 → 100644
Original file line number Diff line number Diff line change
@@ -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){
Expand Down
4 changes: 2 additions & 2 deletions assets/js/easy-ui/editors/fileBrowser.js
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
fileBrowser: {
init: function (container, options) {
var input = $('<input type="text" style="width:'+(container.width()-25)+'px;">').appendTo(container);
var button = $('<a href="javascript:void(0)"><img style="' + options.css + '" src="'+ options.icon +'"></a>').appendTo(container);
var button = $('<a href="javascript:void(0)">' + (options.hasOwnProperty('icon') ? '<img style="' + options.css + '" src="'+ options.icon +'">' : '<i class="'+ options.cls +'"></i>')+'</a>').appendTo(container);
button.click({
target: this,
field: input,
Expand All @@ -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;
Expand Down
Loading