- Nuiton-js-commits - mailman.cloud.codelutin.com

r169 - trunk/src/site
by echatellier＠users.nuiton.org July 19, 2013

July 19, 2013

Author: echatellier Date: 2013-07-19 23:54:22 +0200 (Fri, 19 Jul 2013) New Revision: 169 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/169 Log: Remove fr site Removed: trunk/src/site/fr/

1 0

r168 - in trunk: . nuiton-js-wro nuiton-js-wro/src/license nuiton-js-wro/src/main/java/org/nuiton/js/wro nuiton-js-wro/src/main/resources/META-INF src/site src/site/rst
by echatellier＠users.nuiton.org July 19, 2013

July 19, 2013

Author: echatellier Date: 2013-07-19 23:53:33 +0200 (Fri, 19 Jul 2013) New Revision: 168 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/168 Log: Update nuiton js (keywords) Removed: trunk/src/site/site_fr.xml Modified: trunk/LICENSE.txt trunk/README.txt trunk/nuiton-js-wro/LICENSE.txt trunk/nuiton-js-wro/README.txt trunk/nuiton-js-wro/pom.xml trunk/nuiton-js-wro/src/license/THIRD-PARTY.properties trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ForceCssDataUriPreProcessor.java trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ImportWildcardXmlModelFactory.java trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsFilter.java trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsMavenWroManagerFactory.java trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroConfigurationFactory.java trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroManagerFactory.java trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsXmlModelFactory.java trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ProtectedXmlModelFactory.java trunk/nuiton-js-wro/src/main/resources/META-INF/web-fragment.xml trunk/pom.xml trunk/src/site/rst/deploy.rst trunk/src/site/rst/index.rst.vm trunk/src/site/rst/packaging.rst.vm trunk/src/site/site_en.xml Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-js-wro/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-js-wro/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-js-wro/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-js-wro/src/license/THIRD-PARTY.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ForceCssDataUriPreProcessor.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ForceCssDataUriPreProcessor.java 2013-07-19 21:51:14 UTC (rev 167) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ForceCssDataUriPreProcessor.java 2013-07-19 21:53:33 UTC (rev 168) @@ -3,8 +3,8 @@ /* * #%L * Nuiton JS :: WRO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 CodeLutin * %% Property changes on: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ForceCssDataUriPreProcessor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ImportWildcardXmlModelFactory.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ImportWildcardXmlModelFactory.java 2013-07-19 21:51:14 UTC (rev 167) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ImportWildcardXmlModelFactory.java 2013-07-19 21:53:33 UTC (rev 168) @@ -3,8 +3,8 @@ /* * #%L * Nuiton JS :: WRO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 CodeLutin * %% Property changes on: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ImportWildcardXmlModelFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsFilter.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsFilter.java 2013-07-19 21:51:14 UTC (rev 167) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsFilter.java 2013-07-19 21:53:33 UTC (rev 168) @@ -3,8 +3,8 @@ /* * #%L * Nuiton JS :: WRO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 CodeLutin * %% Property changes on: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsMavenWroManagerFactory.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsMavenWroManagerFactory.java 2013-07-19 21:51:14 UTC (rev 167) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsMavenWroManagerFactory.java 2013-07-19 21:53:33 UTC (rev 168) @@ -3,8 +3,8 @@ /* * #%L * Nuiton JS :: WRO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 CodeLutin * %% Property changes on: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsMavenWroManagerFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroConfigurationFactory.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroConfigurationFactory.java 2013-07-19 21:51:14 UTC (rev 167) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroConfigurationFactory.java 2013-07-19 21:53:33 UTC (rev 168) @@ -3,8 +3,8 @@ /* * #%L * Nuiton JS :: WRO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 CodeLutin * %% Property changes on: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroConfigurationFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroManagerFactory.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroManagerFactory.java 2013-07-19 21:51:14 UTC (rev 167) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroManagerFactory.java 2013-07-19 21:53:33 UTC (rev 168) @@ -3,8 +3,8 @@ /* * #%L * Nuiton JS :: WRO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 CodeLutin * %% Property changes on: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroManagerFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsXmlModelFactory.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsXmlModelFactory.java 2013-07-19 21:51:14 UTC (rev 167) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsXmlModelFactory.java 2013-07-19 21:53:33 UTC (rev 168) @@ -3,8 +3,8 @@ /* * #%L * Nuiton JS :: WRO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 - 2013 CodeLutin * %% Property changes on: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsXmlModelFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ProtectedXmlModelFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-js-wro/src/main/resources/META-INF/web-fragment.xml =================================================================== --- trunk/nuiton-js-wro/src/main/resources/META-INF/web-fragment.xml 2013-07-19 21:51:14 UTC (rev 167) +++ trunk/nuiton-js-wro/src/main/resources/META-INF/web-fragment.xml 2013-07-19 21:53:33 UTC (rev 168) @@ -1,8 +1,8 @@  -<project name="${project.name}"> - - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <sideBarEnabled>true</sideBarEnabled> - <searchEnabled>false</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> - </poweredBy> - - <body> - - <head> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> - </head> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> - </breadcrumbs> - - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="chorem.org" href="http://www.chorem.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> - - <menu name="Utilisateurs"> - <item name="Accueil" href="index.html"/> - </menu> - - <menu name="Survol"> - <item name="Usage" href="index.html"/> - <item name="Créer un package" href="packaging.html"/> - </menu> - - <menu name="Packages disponible"> - <item name="angular" href="nuiton-js-lib/nuiton-js-angular/index.html"/> - <item name="backbone" href="nuiton-js-lib/nuiton-js-backbone/index.html"/> - <item name="bootstrap" href="nuiton-js-lib/nuiton-js-bootstrap/index.html"/> - <item name="canjs" href="nuiton-js-lib/nuiton-js-canjs/index.html"/> - <item name="font-awesome" href="nuiton-js-lib/nuiton-js-font-awesome/index.html"/> - <item name="jqgrid" href="nuiton-js-lib/nuiton-js-jqgrid/index.html"/> - <item name="jqplot" href="nuiton-js-lib/nuiton-js-jqplot/index.html"/> - <item name="jquery" href="nuiton-js-lib/nuiton-js-jquery/index.html"/> - <item name="jquery-i18n-properties" href="nuiton-js-lib/nuiton-js-jquery-i18n-properties/index.html"/> - <item name="jquery-ui" href="nuiton-js-lib/nuiton-js-jquery-ui/index.html"/> - <item name="jstree" href="nuiton-js-lib/nuiton-js-jstree/index.html"/> - <item name="moment" href="nuiton-js-lib/nuiton-js-moment/index.html"/> - <item name="mustache" href="nuiton-js-lib/nuiton-js-mustache/index.html"/> - </menu> - - <footer> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> - - </body> - -</project>

1 0

r167 - in sandbox/nuiton-js-jqplot: . src/main/resources/META-INF/nuiton-js src/main/resources/nuiton-js-jqplot src/main/resources/nuiton-js-jqplot/plugins src/site src/site/rst
by echatellier＠users.nuiton.org July 19, 2013

July 19, 2013

Author: echatellier Date: 2013-07-19 23:51:14 +0200 (Fri, 19 Jul 2013) New Revision: 167 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/167 Log: Update jqplot Removed: sandbox/nuiton-js-jqplot/changelog.txt Modified: sandbox/nuiton-js-jqplot/LICENSE.txt sandbox/nuiton-js-jqplot/README.txt sandbox/nuiton-js-jqplot/generate-plugin-group.sh sandbox/nuiton-js-jqplot/pom.xml sandbox/nuiton-js-jqplot/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/excanvas.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.css sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.BezierCurveRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.barRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.blockRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.bubbleRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisLabelRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisTickRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasOverlay.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasTextRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.categoryAxisRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ciParser.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.cursor.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dateAxisRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.donutRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dragable.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.enhancedLegendRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.funnelRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.highlighter.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.json2.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.logAxisRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoAxisRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.meterGaugeRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mobile.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ohlcRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pieRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pointLabels.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidAxisRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidGridRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.trendline.js sandbox/nuiton-js-jqplot/src/site/rst/index.rst.vm sandbox/nuiton-js-jqplot/src/site/site_en.xml Property changes on: sandbox/nuiton-js-jqplot/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/README.txt =================================================================== (Binary files differ) Property changes on: sandbox/nuiton-js-jqplot/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: sandbox/nuiton-js-jqplot/changelog.txt =================================================================== --- sandbox/nuiton-js-jqplot/changelog.txt 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/changelog.txt 2013-07-19 21:51:14 UTC (rev 167) @@ -1,2 +0,0 @@ -Please refer to the release note : - http://maven-site.nuiton.org/nuiton-js/changes-report.html Property changes on: sandbox/nuiton-js-jqplot/generate-plugin-group.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/pom.xml =================================================================== (Binary files differ) Property changes on: sandbox/nuiton-js-jqplot/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml 2013-07-19 21:51:14 UTC (rev 167) @@ -1,8 +1,8 @@ <!-- #%L Nuiton JS :: jqPlot - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin %% Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/excanvas.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.css =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.css 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.css 2013-07-19 21:51:14 UTC (rev 167) @@ -1,5 +1,5 @@ -/*%%Ignore-License - rules for the plot target div. These will be cascaded down to all plot elements according to css rules*/ +/*%%Ignore-License +rules for the plot target div. These will be cascaded down to all plot elements according to css rules*/ .jqplot-target { position: relative; color: #666666; @@ -63,12 +63,12 @@ } .jqplot-yaxis-tick.jqplot-breakTick { - right: -20px; - margin-right: 0px; - padding:1px 5px 1px 5px; -/* background-color: white;*/ - z-index: 2; - font-size: 1.5em; + right: -20px; + margin-right: 0px; + padding:1px 5px 1px 5px; + /*background-color: white;*/ + z-index: 2; + font-size: 1.5em; } .jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick { @@ -255,6 +255,6 @@ } div.jqplot-noData-container { - text-align: center; - background-color: rgba(96%, 96%, 96%, 0.3); + text-align: center; + background-color: rgba(96%, 96%, 96%, 0.3); } Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.js 2013-07-19 21:51:14 UTC (rev 167) @@ -5,12 +5,12 @@ * * About: Version * - * version: 1.0.4 - * revision: 1121 + * version: 1.0.8 + * revision: 1250 * * About: Copyright & License * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT and GPL version 2.0 licenses. This means that you can * choose the license that best suits your project and use it accordingly. @@ -244,8 +244,8 @@ } }; - $.jqplot.version = "1.0.4"; - $.jqplot.revision = "1121"; + $.jqplot.version = "1.0.8"; + $.jqplot.revision = "1250"; $.jqplot.targetCounter = 1; @@ -395,7 +395,7 @@ return $.jqplot.support_canvas_text.result; }; - $.jqplot.use_excanvas = ($.browser.msie && !$.jqplot.support_canvas()) ? true : false; + $.jqplot.use_excanvas = ((!$.support.boxModel || !$.support.objectAll || !$support.leadingWhitespace) && !$.jqplot.support_canvas()) ? true : false; /** * @@ -511,7 +511,7 @@ /** * Class: Axis * An individual axis object. Cannot be instantiated directly, but created - * by the Plot oject. Axis properties can be set or overriden by the + * by the Plot object. Axis properties can be set or overridden by the * options passed in from the user. * */ @@ -848,7 +848,7 @@ /** * Class: Legend * Legend object. Cannot be instantiated directly, but created - * by the Plot oject. Legend properties can be set or overriden by the + * by the Plot object. Legend properties can be set or overridden by the * options passed in from the user. */ function Legend(options) { @@ -1077,7 +1077,7 @@ /** * Class: Title * Plot Title object. Cannot be instantiated directly, but created - * by the Plot oject. Title properties can be set or overriden by the + * by the Plot object. Title properties can be set or overridden by the * options passed in from the user. * * Parameters: @@ -1091,7 +1091,7 @@ // text of the title; this.text = text; // prop: show - // wether or not to show the title + // whether or not to show the title this.show = true; // prop: fontFamily // css font-family spec for the text. @@ -1140,7 +1140,7 @@ /** * Class: Series * An individual data series object. Cannot be instantiated directly, but created - * by the Plot oject. Series properties can be set or overriden by the + * by the Plot object. Series properties can be set or overridden by the * options passed in from the user. */ function Series(options) { @@ -1159,7 +1159,7 @@ // > } // prop: show - // wether or not to draw the series. + // whether or not to draw the series. this.show = true; // prop: xaxis // which x axis to use with this series, either 'xaxis' or 'x2axis'. @@ -1233,16 +1233,16 @@ // see <$.jqplot.MarkerRenderer>. this.markerOptions = {}; // prop: showLine - // wether to actually draw the line or not. Series will still be renderered, even if no line is drawn. + // whether to actually draw the line or not. Series will still be renderered, even if no line is drawn. this.showLine = true; // prop: showMarker - // wether or not to show the markers at the data points. + // whether or not to show the markers at the data points. this.showMarker = true; // prop: index // 0 based index of this series in the plot series array. this.index; // prop: fill - // true or false, wether to fill under lines or in bars. + // true or false, whether to fill under lines or in bars. // May not be implemented in all renderers. this.fill = false; // prop: fillColor @@ -1369,7 +1369,7 @@ this.markerOptions.show = this.showMarker; } this.showMarker = this.markerOptions.show; - // the markerRenderer is called within it's own scaope, don't want to overwrite series options!! + // the markerRenderer is called within its own scope, don't want to overwrite series options!! this.markerRenderer.init(this.markerOptions); }; @@ -1524,15 +1524,15 @@ * Object representing the grid on which the plot is drawn. The grid in this * context is the area bounded by the axes, the area which will contain the series. * Note, the series are drawn on their own canvas. - * The Grid object cannot be instantiated directly, but is created by the Plot oject. - * Grid properties can be set or overriden by the options passed in from the user. + * The Grid object cannot be instantiated directly, but is created by the Plot object. + * Grid properties can be set or overridden by the options passed in from the user. */ function Grid() { $.jqplot.ElemContainer.call(this); // Group: Properties // prop: drawGridlines - // wether to draw the gridlines on the plot. + // whether to draw the gridlines on the plot. this.drawGridlines = true; // prop: gridLineColor // color of the grid lines. @@ -1553,7 +1553,7 @@ // True to draw border around grid. this.drawBorder = true; // prop: shadow - // wether to show a shadow behind the grid. + // whether to show a shadow behind the grid. this.shadow = true; // prop: shadowAngle // shadow angle in degrees @@ -1741,7 +1741,7 @@ // animation in these situations can cause problems. this.animateReplot = false; // prop: axes - // up to 4 axes are supported, each with it's own options, + // up to 4 axes are supported, each with its own options, // See <Axis> for axis specific options. this.axes = {xaxis: new Axis('xaxis'), yaxis: new Axis('yaxis'), x2axis: new Axis('x2axis'), y2axis: new Axis('y2axis'), y3axis: new Axis('y3axis'), y4axis: new Axis('y4axis'), y5axis: new Axis('y5axis'), y6axis: new Axis('y6axis'), y7axis: new Axis('y7axis'), y8axis: new Axis('y8axis'), y9axis: new Axis('y9axis'), yMidAxis: new Axis('yMidAxis')}; this.baseCanvas = new $.jqplot.GenericCanvas(); @@ -1757,7 +1757,8 @@ this.data = []; // prop: dataRenderer // A callable which can be used to preprocess data passed into the plot. - // Will be called with 2 arguments, the plot data and a reference to the plot. + // Will be called with 3 arguments: the plot data, a reference to the plot, + // and the value of dataRendererOptions. this.dataRenderer; // prop: dataRendererOptions // Options that will be passed to the dataRenderer. @@ -1820,7 +1821,6 @@ this.legend = new Legend(); // prop: noDataIndicator // Options to set up a mock plot with a data loading indicator if no data is specified. - this.negativeSeriesColors = $.jqplot.config.defaultNegativeColors; this.noDataIndicator = { show: false, indicator: 'Loading Data...', @@ -1839,16 +1839,19 @@ } } }; + // prop: negativeSeriesColors + // colors to use for portions of the line below zero. + this.negativeSeriesColors = $.jqplot.config.defaultNegativeColors; // container to hold all of the merged options. Convienence for plugins. this.options = {}; this.previousSeriesStack = []; - // Namespece to hold plugins. Generally non-renderer plugins add themselves to here. + // Namespace to hold plugins. Generally non-renderer plugins add themselves to here. this.plugins = {}; // prop: series // Array of series object options. // see <Series> for series specific options. this.series = []; - // array of series indicies. Keep track of order + // array of series indices. Keep track of order // which series canvases are displayed, lowest // to highest, back to front. this.seriesStack = []; @@ -1860,7 +1863,7 @@ this.seriesColors = $.jqplot.config.defaultColors; // prop: sortData // false to not sort the data passed in by the user. - // Many bar, stakced and other graphs as well as many plugins depend on + // Many bar, stacked and other graphs as well as many plugins depend on // having sorted data. this.sortData = true; // prop: stackSeries @@ -1887,7 +1890,7 @@ // Mostly used to test if plot has never been dran (=0), has been successfully drawn // into a visible container once (=1) or draw more than once into a visible container. // Can use this in tests to see if plot has been visibly drawn at least one time. - // After plot has been visibly drawn once, it generally doesn't need redrawn if its + // After plot has been visibly drawn once, it generally doesn't need redrawing if its // container is hidden and shown. this._drawCount = 0; // sum of y values for all series in plot. @@ -1963,7 +1966,7 @@ // remove any error class that may be stuck on target. this.target.removeClass('jqplot-error'); if (!this.target.get(0)) { - throw "No plot target specified"; + throw new Error("No plot target specified"); } // make sure the target is positioned by some means and set css @@ -2022,7 +2025,7 @@ this.eventCanvas._plotDimensions = this._plotDimensions; this.legend._plotDimensions = this._plotDimensions; if (this._height <=0 || this._width <=0 || !this._height || !this._width) { - throw "Canvas dimension not set"; + throw new Error("Canvas dimension not set"); } if (options.dataRenderer && $.isFunction(options.dataRenderer)) { @@ -2040,7 +2043,7 @@ if (data == null || $.isArray(data) == false || data.length == 0 || $.isArray(data[0]) == false || data[0].length == 0) { if (this.noDataIndicator.show == false) { - throw "No Data"; + throw new Error("No data specified"); } else { @@ -2205,7 +2208,7 @@ this._width = this.target.width(); if (this._height <=0 || this._width <=0 || !this._height || !this._width) { - throw "Target dimension not set"; + throw new Error("Target dimension not set"); } this._plotDimensions.height = this._height; @@ -2361,7 +2364,7 @@ this._width = this.target.width(); if (this._height <=0 || this._width <=0 || !this._height || !this._width) { - throw "Target dimension not set"; + throw new Error("Target dimension not set"); } this._plotDimensions.height = this._height; @@ -2924,7 +2927,7 @@ for (i=0, l=$.jqplot.preDrawHooks.length; i<l; i++) { $.jqplot.preDrawHooks[i].call(this); } - for (i=0, l=this.preDrawHooks.length; i<l; i++) { + for (i=0, l=this.preDrawHooks.hooks.length; i<l; i++) { this.preDrawHooks.hooks[i].apply(this, this.preDrawSeriesHooks.args[i]); } // create an underlying canvas to be used for special features. @@ -3296,7 +3299,7 @@ minang = (j>0) ? s.gridData[j-1][1]+sm : sm; maxang = s.gridData[j][1]; if (theta > minang && theta < maxang) { - return {seriesIndex:s.index, pointIndex:j, gridData:s.gridData[j], data:s.data[j]}; + return {seriesIndex:s.index, pointIndex:j, gridData:[gridpos.x,gridpos.y], data:s.data[j]}; } } } @@ -3341,7 +3344,7 @@ minang = (j>0) ? s.gridData[j-1][1]+sm : sm; maxang = s.gridData[j][1]; if (theta > minang && theta < maxang) { - return {seriesIndex:s.index, pointIndex:j, gridData:s.gridData[j], data:s.data[j]}; + return {seriesIndex:s.index, pointIndex:j, gridData:[gridpos.x,gridpos.y], data:s.data[j]}; } } } @@ -3906,7 +3909,7 @@ return $.jqplot.hex2rgb(s, a); } else { - throw 'invalid color spec'; + throw new Error('Invalid color spec'); } }; @@ -4082,6 +4085,7 @@ + // class: $.jqplot.AxisLabelRenderer // Renderer to place labels on the axes. $.jqplot.AxisLabelRenderer = function(options) { @@ -4090,7 +4094,7 @@ // name of the axis associated with this tick this.axis; // prop: show - // wether or not to show the tick (mark and label). + // whether or not to show the tick (mark and label). this.show = true; // prop: label // The text or html for the label. @@ -4159,10 +4163,10 @@ // name of the axis associated with this tick this.axis; // prop: showMark - // wether or not to show the mark on the axis. + // whether or not to show the mark on the axis. this.showMark = true; // prop: showGridline - // wether or not to draw the gridline on the grid at this tick. + // whether or not to draw the gridline on the grid at this tick. this.showGridline = true; // prop: isMinorTick // if this is a minor tick. @@ -4176,12 +4180,12 @@ // will be stoked above and below axis, so total length will be twice this. this.markSize = 6; // prop: show - // wether or not to show the tick (mark and label). + // whether or not to show the tick (mark and label). // Setting this to false requires more testing. It is recommended // to set showLabel and showMark to false instead. this.show = true; // prop: showLabel - // wether or not to show the label. + // whether or not to show the label. this.showLabel = true; this.label = null; this.value = null; @@ -4213,7 +4217,7 @@ // true to escape HTML entities in the label. this.escapeHTML = false; this._elem; - this._breakTick = false; + this._breakTick = false; $.extend(true, this, options); }; @@ -4273,9 +4277,9 @@ if (this.textColor) { this._elem.css('color', this.textColor); } - if (this._breakTick) { - this._elem.addClass('jqplot-breakTick'); - } + if (this._breakTick) { + this._elem.addClass('jqplot-breakTick'); + } return this._elem; }; @@ -4349,8 +4353,8 @@ this._elem.addClass('jqplot-grid-canvas'); this._elem.css({ position: 'absolute', left: 0, top: 0 }); - elem = plot.canvasManager.initCanvas(elem); - + elem = plot.canvasManager.initCanvas(elem); + this._top = this._offsets.top; this._bottom = h - this._offsets.bottom; this._left = this._offsets.left; @@ -4754,11 +4758,11 @@ $.jqplot.LinePattern = function (ctx, pattern) { - var defaultLinePatterns = { - dotted: [ dotlen, $.jqplot.config.dotGapLength ], - dashed: [ $.jqplot.config.dashLength, $.jqplot.config.gapLength ], - solid: null - }; + var defaultLinePatterns = { + dotted: [ dotlen, $.jqplot.config.dotGapLength ], + dashed: [ $.jqplot.config.dashLength, $.jqplot.config.gapLength ], + solid: null + }; if (typeof pattern === 'string') { if (pattern[0] === '.' || pattern[0] === '-') { @@ -5732,7 +5736,7 @@ tempgd.push(gd[i]); this._areaPoints.push(gd[i]); // do we have an axis crossing? - if (pd[i][1] * pd[i+1][1] < 0) { + if (pd[i][1] * pd[i+1][1] <= 0) { if (pd[i][1] < 0) { isnegative = true; opts.fillStyle = negativeColor; @@ -5992,7 +5996,7 @@ plot.target.trigger(evt1, ins); if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.lineRenderer.highlightedSeriesIndex)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -6009,7 +6013,7 @@ var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.lineRenderer.highlightedSeriesIndex)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -6032,7 +6036,7 @@ if (neighbor) { var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; var evt = jQuery.Event('jqplotDataClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -6047,7 +6051,7 @@ unhighlight(plot); } var evt = jQuery.Event('jqplotDataRightClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -6142,7 +6146,7 @@ // call it within the scope of the axis. this.renderer.createTicks.call(this, plot); // fill a div with axes labels in the right direction. - // Need to pregenerate each axis to get it's bounds and + // Need to pregenerate each axis to get its bounds and // position it and the labels correctly on the plot. var dim=0; var temp; @@ -7399,7 +7403,7 @@ // Group: Properties // prop: show - // wether or not to show the marker. + // whether or not to show the marker. this.show = true; // prop: style // One of diamond, circle, square, x, plus, dash, filledDiamond, filledCircle, filledSquare @@ -7414,7 +7418,7 @@ // color of marker. Will be set to color of series by default on init. this.color = '#666666'; // prop: shadow - // wether or not to draw a shadow on the line + // whether or not to draw a shadow on the line this.shadow = true; // prop: shadowAngle // Shadow angle in degrees @@ -7625,7 +7629,7 @@ this.depth = 3; this.strokeStyle = 'rgba(0,0,0,0.1)'; // prop: isarc - // wether the shadow is an arc or not. + // whether the shadow is an arc or not. this.isarc = false; $.extend(true, this, options); @@ -7727,7 +7731,7 @@ // whether to fill the shape. this.fill = false; // prop: isarc - // wether the shadow is an arc or not. + // whether the shadow is an arc or not. this.isarc = false; // prop: fillRect // true to draw shape as a filled rectangle. @@ -7950,7 +7954,7 @@ var pad = false, reverse = false, - s; + s; for (var i = 0; i< series.length; i++) { s = series[i]; if (s._stack || s.renderer.constructor == $.jqplot.BezierCurveRenderer){ @@ -9283,7 +9287,7 @@ return str; }; - // Not gauranteed to work, even on canvas supporting browsers due to + // Not guaranteed to work, even on canvas supporting browsers due to // limitations with location.href and browser support. $.fn.jqplotSaveImage = function() { var imgData = $(this).jqplotToImageStr({}); @@ -9293,7 +9297,7 @@ }; - // Not gauranteed to work, even on canvas supporting browsers due to + // Not guaranteed to work, even on canvas supporting browsers due to // limitations with window.open and arbitrary data. $.fn.jqplotViewImage = function() { var imgStr = $(this).jqplotToImageElemStr({}); @@ -9323,12 +9327,12 @@ * @author Chris Leonello * @date #date# * @version #VERSION# - * @copyright (c) 2010 Chris Leonello + * @copyright (c) 2010-2013 Chris Leonello * jsDate is currently available for use in all personal or commercial projects * under both the MIT and GPL version 2.0 licenses. This means that you can * choose the license that best suits your project and use it accordingly. * - * <p>Ken's origianl Date Instance Methods and copyright notice:</p> + * <p>Ken's original Date Instance Methods and copyright notice:</p> * <pre> * Ken Snyder (ken d snyder at gmail dot com) * 2008-09-10 @@ -9616,7 +9620,7 @@ jsDate.prototype.getIsoWeek = function() { var d = this.proxy; - var woy = d.getWeekOfYear(); + var woy = this.getWeekOfYear(); var dow1_1 = (new Date('' + d.getFullYear() + '/1/1')).getDay(); // First week is 01 and not 00 as in the case of %U and %W, // so we add 1 to the final result except if day 1 of the year @@ -10010,8 +10014,31 @@ dayNames: ['Domingo','Segunda-feira','Terça-feira','Quarta-feira','Quinta-feira','Sexta-feira','Sábado'], dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'], formatString: '%Y-%m-%d %H:%M:%S' + }, + + 'pl': { + monthNames: ['Styczeń','Luty','Marzec','Kwiecień','Maj','Czerwiec','Lipiec','Sierpień','Wrzesień','Październik','Listopad','Grudzień'], + monthNamesShort: ['Sty', 'Lut', 'Mar', 'Kwi', 'Maj', 'Cze','Lip', 'Sie', 'Wrz', 'Paź', 'Lis', 'Gru'], + dayNames: ['Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota'], + dayNamesShort: ['Ni', 'Pn', 'Wt', 'Śr', 'Cz', 'Pt', 'Sb'], + formatString: '%Y-%m-%d %H:%M:%S' + }, + + 'nl': { + monthNames: ['Januari','Februari','Maart','April','Mei','Juni','July','Augustus','September','Oktober','November','December'], + monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun','Jul','Aug','Sep','Okt','Nov','Dec'], + dayNames:','['Zondag','Maandag','Dinsdag','Woensdag','Donderdag','Vrijdag','Zaterdag'], + dayNamesShort: ['Zo','Ma','Di','Wo','Do','Vr','Za'], + formatString: '%Y-%m-%d %H:%M:%S' + }, + + 'sv': { + monthNames: ['januari','februari','mars','april','maj','juni','juli','augusti','september','oktober','november','december'], + monthNamesShort: ['jan','feb','mar','apr','maj','jun','jul','aug','sep','okt','nov','dec'], + dayNames: ['söndag','måndag','tisdag','onsdag','torsdag','fredag','lördag'], + dayNamesShort: ['sön','mån','tis','ons','tor','fre','lör'], + formatString: '%Y-%m-%d %H:%M:%S' } - }; @@ -10976,15 +11003,18 @@ var method = ['toExponential', 'toFixed', 'toPrecision']['efg'.indexOf(type.toLowerCase())]; var textTransform = ['toString', 'toUpperCase']['eEfFgG'.indexOf(type) % 2]; var number_str = Math.abs(number)[method](precision); - number_str = thousandSeparation ? thousand_separate(number_str): number_str; + + // Apply the decimal mark properly by splitting the number by the + // decimalMark, applying thousands separator, and then placing it + // back in. + var parts = number_str.toString().split('.'); + parts[0] = thousandSeparation ? thousand_separate(parts[0]) : parts[0]; + number_str = parts.join($.jqplot.sprintf.decimalMark); + value = prefix + number_str; var justified = justify(value, prefix, leftJustify, minWidth, zeroPad, htmlSpace)[textTransform](); - - if ($.jqplot.sprintf.decimalMark !== '.' && $.jqplot.sprintf.decimalMark !== $.jqplot.sprintf.thousandsSeparator) { - return justified.replace(/\./, $.jqplot.sprintf.decimalMark); - } else { - return justified; - } + + return justified; } case 'p': case 'P': @@ -10997,7 +11027,7 @@ var prefix = number < 0 ? '-' : positivePrefix; var parts = String(Number(Math.abs(number)).toExponential()).split(/e|E/); - var sd = (parts[0].indexOf('.') != -1) ? parts[0].length - 1 : parts[0].length; + var sd = (parts[0].indexOf('.') != -1) ? parts[0].length - 1 : String(number).length; var zeros = (parts[1] < 0) ? -parts[1] - 1 : 0; if (Math.abs(number) < 1) { @@ -11053,7 +11083,7 @@ return $.jqplot.getSignificantFigures(number).digitsRight; }; -})(jQuery); + var backCompat = $.uiBackCompat !== false; @@ -11378,4 +11408,4 @@ }; - +})(jQuery); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.BezierCurveRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.BezierCurveRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.BezierCurveRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -289,6 +289,7 @@ function preInit(target, data, options) { options = options || {}; options.axesDefaults = $.extend(true, {pad:0}, options.axesDefaults); + options.seriesDefaults = options.seriesDefaults || {}; options.legend = $.extend(true, {placement:'outside'}, options.legend); // only set these if there is a pie series var setopts = false; Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.BezierCurveRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.barRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.barRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.barRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -115,7 +115,7 @@ ////// // This is probably wrong here. - // After going back and forth on wether renderer should be the thing + // After going back and forth on whether renderer should be the thing // or extend the thing, it seems that it it best if it is a property // on the thing. This should be something that is commonized // among series renderers in the future. @@ -350,7 +350,7 @@ var nvals = temp[0]; var nseries = temp[1]; var pos = temp[2]; - var points = []; + var points = []; if (this._stack) { this._barNudge = 0; @@ -366,9 +366,9 @@ negativeColor = opts.fillStyle; } var positiveColor = opts.fillStyle; - var base; - var xstart; - var ystart; + var base; + var xstart; + var ystart; if (this.barDirection == 'vertical') { for (var i=0; i<gridData.length; i++) { @@ -438,20 +438,20 @@ opts.fillStyle = positiveColor; } } - - if (!this.fillToZero || this._plotData[i][1] >= 0) { - points.push([base-this.barWidth/2, ystart]); - points.push([base-this.barWidth/2, gridData[i][1]]); - points.push([base+this.barWidth/2, gridData[i][1]]); - points.push([base+this.barWidth/2, ystart]); - } - // for negative bars make sure points are always ordered clockwise - else { - points.push([base-this.barWidth/2, gridData[i][1]]); - points.push([base-this.barWidth/2, ystart]); - points.push([base+this.barWidth/2, ystart]); - points.push([base+this.barWidth/2, gridData[i][1]]); - } + + if (!this.fillToZero || this._plotData[i][1] >= 0) { + points.push([base-this.barWidth/2, ystart]); + points.push([base-this.barWidth/2, gridData[i][1]]); + points.push([base+this.barWidth/2, gridData[i][1]]); + points.push([base+this.barWidth/2, ystart]); + } + // for negative bars make sure points are always ordered clockwise + else { + points.push([base-this.barWidth/2, gridData[i][1]]); + points.push([base-this.barWidth/2, ystart]); + points.push([base+this.barWidth/2, ystart]); + points.push([base+this.barWidth/2, gridData[i][1]]); + } this._barPoints.push(points); // now draw the shadows if not stacked. // for stacked plots, they are predrawn by drawShadow @@ -513,7 +513,7 @@ xstart = 0; } } - if ((this.fillToZero && this._plotData[i][1] < 0) || (this.waterfall && this._data[i][1] < 0)) { + if ((this.fillToZero && this._plotData[i][0] < 0) || (this.waterfall && this._data[i][0] < 0)) { if (this.varyBarColor && !this._stack) { if (this.useNegativeColors) { opts.fillStyle = negativeColors.next(); @@ -522,6 +522,9 @@ opts.fillStyle = positiveColors.next(); } } + else { + opts.fillStyle = negativeColor; + } } else { if (this.varyBarColor && !this._stack) { @@ -729,9 +732,10 @@ evt1.pageX = ev.pageX; evt1.pageY = ev.pageY; plot.target.trigger(evt1, ins); - if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.barRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { + if (plot.series[ins[0]].show && plot.series[ins[0]].highlightMouseOver && + !(ins[0] == plot.plugins.barRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -748,7 +752,7 @@ var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.barRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -771,7 +775,7 @@ if (neighbor) { var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; var evt = jQuery.Event('jqplotDataClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -786,7 +790,7 @@ unhighlight(plot); } var evt = jQuery.Event('jqplotDataRightClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -794,4 +798,4 @@ } -})(jQuery); \ No newline at end of file +})(jQuery); \ No newline at end of file Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.barRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.blockRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.blockRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.blockRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.blockRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.bubbleRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.bubbleRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.bubbleRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -632,7 +632,7 @@ plot.target.trigger(evt1, ins); if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.bubbleRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -651,7 +651,7 @@ var ins = [si, pi, neighbor.data, plot.series[si].gridData[pi][2]]; if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.bubbleRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -676,7 +676,7 @@ var pi = neighbor.pointIndex; var ins = [si, pi, neighbor.data, plot.series[si].gridData[pi][2]]; var evt = jQuery.Event('jqplotDataClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -693,7 +693,7 @@ unhighlight(plot); } var evt = jQuery.Event('jqplotDataRightClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.bubbleRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisLabelRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisLabelRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisLabelRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -52,10 +52,10 @@ // name of the axis associated with this tick this.axis; // prop: show - // wether or not to show the tick (mark and label). + // whether or not to show the tick (mark and label). this.show = true; // prop: showLabel - // wether or not to show the label. + // whether or not to show the label. this.showLabel = true; // prop: label // label for the axis. @@ -186,8 +186,8 @@ elem.style.width = w; elem.style.height = h; - elem = plot.canvasManager.initCanvas(elem); - + elem = plot.canvasManager.initCanvas(elem); + this._elem = $(elem); this._elem.css({ position: 'absolute'}); this._elem.addClass('jqplot-'+this.axis+'-label'); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisLabelRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisTickRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisTickRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisTickRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -49,10 +49,10 @@ // tick mark on the axis. One of 'inside', 'outside', 'cross', '' or null. this.mark = 'outside'; // prop: showMark - // wether or not to show the mark on the axis. + // whether or not to show the mark on the axis. this.showMark = true; // prop: showGridline - // wether or not to draw the gridline on the grid at this tick. + // whether or not to draw the gridline on the grid at this tick. this.showGridline = true; // prop: isMinorTick // if this is a minor tick. @@ -65,10 +65,10 @@ // will be stoked above and below axis, so total length will be twice this. this.markSize = 4; // prop: show - // wether or not to show the tick (mark and label). + // whether or not to show the tick (mark and label). this.show = true; // prop: showLabel - // wether or not to show the label. + // whether or not to show the label. this.showLabel = true; // prop: labelPosition // 'auto', 'start', 'middle' or 'end'. @@ -180,6 +180,16 @@ return w; } }; + + // return top. + $.jqplot.CanvasAxisTickRenderer.prototype.getTop = function(ctx) { + if (this._elem) { + return this._elem.position().top; + } + else { + return null; + } + }; $.jqplot.CanvasAxisTickRenderer.prototype.getAngleRad = function() { var a = this.angle * Math.PI/180; @@ -225,13 +235,13 @@ elem.style.height = h; elem.style.textAlign = 'left'; elem.style.position = 'absolute'; - - elem = plot.canvasManager.initCanvas(elem); - + + elem = plot.canvasManager.initCanvas(elem); + this._elem = $(elem); this._elem.css(this._styles); this._elem.addClass('jqplot-'+this.axis+'-tick'); - + elem = null; return this._elem; }; Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisTickRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasOverlay.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasOverlay.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasOverlay.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -66,6 +66,9 @@ case 'dashedVerticalLine': this.addDashedVerticalLine(obj[n]); break; + case 'rectangle': + this.addRectangle(obj[n]); + break; default: break; } @@ -107,7 +110,7 @@ // color of the line color: '#666666', // prop: shadow - // wether or not to draw a shadow on the line + // whether or not to draw a shadow on the line shadow: true, // prop: shadowAngle // Shadow angle in degrees @@ -153,7 +156,41 @@ tooltipFormatString: '%d, %d' }; } + + + function Rectangle(options) { + LineBase.call(this); + this.type = 'rectangle'; + var opts = { + // prop: xmin + // x value for the start of the line, null to scale to axis min. + xmin: null, + // prop: xmax + // x value for the end of the line, null to scale to axis max. + xmax: null, + // prop xOffset + // offset ends of the line inside the grid. Number + xOffset: '6px', // number or string. Number interpreted as units, string as pixels. + xminOffset: null, + xmaxOffset: null, + + ymin: null, + ymax: null, + yOffset: '6px', // number or string. Number interpreted as units, string as pixels. + yminOffset: null, + ymaxOffset: null + }; + $.extend(true, this.options, opts, options); + if (this.options.showTooltipPrecision < 0.01) { + this.options.showTooltipPrecision = 0.01; + } + } + + Rectangle.prototype = new LineBase(); + Rectangle.prototype.constructor = Rectangle; + + /** * Class: Line * A straight line. @@ -338,6 +375,13 @@ this.objectNames.push(line.options.name); }; + $.jqplot.CanvasOverlay.prototype.addRectangle = function(opts) { + var line = new Rectangle(opts); + line.uid = objCounter++; + this.objects.push(line); + this.objectNames.push(line.options.name); + }; + $.jqplot.CanvasOverlay.prototype.removeObject = function(idx) { // check if integer, remove by index if ($.type(idx) == 'number') { @@ -621,7 +665,81 @@ } } break; + + case 'rectangle': + // style and shadow properties should be set before + // every draw of marker renderer. + mr.style = 'line'; + opts.closePath = true; + + var xaxis = plot.axes[obj.options.xaxis], + xstart, + xstop, + y = plot.axes[obj.options.yaxis].series_u2p(obj.options.y), + xminoff = obj.options.xminOffset || obj.options.xOffset, + xmaxoff = obj.options.xmaxOffset || obj.options.xOffset; + if (obj.options.xmin != null) { + xstart = xaxis.series_u2p(obj.options.xmin); + } + else if (xminoff != null) { + if ($.type(xminoff) == "number") { + xstart = xaxis.series_u2p(xaxis.min + xminoff); + } + else if ($.type(xminoff) == "string") { + xstart = xaxis.series_u2p(xaxis.min) + parseFloat(xminoff); + } + } + if (obj.options.xmax != null) { + xstop = xaxis.series_u2p(obj.options.xmax); + } + else if (xmaxoff != null) { + if ($.type(xmaxoff) == "number") { + xstop = xaxis.series_u2p(xaxis.max - xmaxoff); + } + else if ($.type(xmaxoff) == "string") { + xstop = xaxis.series_u2p(xaxis.max) - parseFloat(xmaxoff); + } + } + + var yaxis = plot.axes[obj.options.yaxis], + ystart, + ystop, + x = plot.axes[obj.options.xaxis].series_u2p(obj.options.x), + yminoff = obj.options.yminOffset || obj.options.yOffset, + ymaxoff = obj.options.ymaxOffset || obj.options.yOffset; + if (obj.options.ymin != null) { + ystart = yaxis.series_u2p(obj.options.ymin); + } + else if (yminoff != null) { + if ($.type(yminoff) == "number") { + ystart = yaxis.series_u2p(yaxis.min - yminoff); + } + else if ($.type(yminoff) == "string") { + ystart = yaxis.series_u2p(yaxis.min) - parseFloat(yminoff); + } + } + if (obj.options.ymax != null) { + ystop = yaxis.series_u2p(obj.options.ymax); + } + else if (ymaxoff != null) { + if ($.type(ymaxoff) == "number") { + ystop = yaxis.series_u2p(yaxis.max + ymaxoff); + } + else if ($.type(ymaxoff) == "string") { + ystop = yaxis.series_u2p(yaxis.max) + parseFloat(ymaxoff); + } + } + + if (xstop != null && xstart != null && ystop != null && ystart != null) { + obj.gridStart = [xstart, ystart]; + obj.gridStop = [xstop, ystop]; + + this.canvas._ctx.fillStyle = obj.options.color; + this.canvas._ctx.fillRect(xstart, ystart, xstop - xstart, ystop - ystart); + } + break; + default: break; } @@ -738,6 +856,24 @@ var ret = (res < eps) ? true : false; return ret; } + + function isNearRectangle(point, lstart, lstop, width) { + // r is point to test, p and q are end points. + var rx = point[0]; + var ry = point[1]; + var px = Math.round(lstop[0]); + var py = Math.round(lstop[1]); + var qx = Math.round(lstart[0]); + var qy = Math.round(lstart[1]); + + var temp; + if (px > qx) { temp = px; px = qx; qx = temp; } + if (py > qy) { temp = py; py = qy; qy = temp; } + + var ret = (rx >= px && rx <= qx && ry >= py && ry <= qy); + + return ret; + } function handleMove(ev, gridpos, datapos, neighbor, plot) { @@ -749,7 +885,12 @@ for (var i=0; i<l; i++) { obj = objs[i]; if (obj.options.showTooltip) { - var n = isNearLine([gridpos.x, gridpos.y], obj.gridStart, obj.gridStop, obj.tooltipWidthFactor); + var n; + if (obj.type === 'rectangle') { + n = isNearRectangle([gridpos.x, gridpos.y], obj.gridStart, obj.gridStop, obj.tooltipWidthFactor); + } else { + n = isNearLine([gridpos.x, gridpos.y], obj.gridStart, obj.gridStop, obj.tooltipWidthFactor); + } datapos = [plot.axes[obj.options.xaxis].series_p2u(gridpos.x), plot.axes[obj.options.yaxis].series_p2u(gridpos.y)]; // cases: @@ -775,6 +916,11 @@ case 'dashedVerticalLine': showTooltip(plot, obj, [obj.gridStart[0], gridpos.y], [obj.options.x, datapos[1]]); break; + + case 'rectangle': + showTooltip(plot, obj, [obj.gridStart[0], gridpos.y], [obj.options.x, datapos[1]]); + break; + default: break; } @@ -809,6 +955,11 @@ case 'dashedVerticalLine': showTooltip(plot, obj, [obj.gridStart[0], gridpos.y], [obj.options.x, datapos[1]]); break; + + case 'rectangle': + showTooltip(plot, obj, [obj.gridStart[0], gridpos.y], [obj.options.x, datapos[1]]); + break; + default: break; } @@ -834,6 +985,11 @@ case 'dashedVerticalLine': showTooltip(plot, obj, [obj.gridStart[0], gridpos.y], [obj.options.x, datapos[1]]); break; + + case 'rectangle': + showTooltip(plot, obj, [obj.gridStart[0], gridpos.y], [obj.options.x, datapos[1]]); + break; + default: break; } Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasOverlay.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasTextRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasTextRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasTextRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -29,7 +29,7 @@ * * included jsDate library by Chris Leonello: * - * Copyright (c) 2010-2012 Chris Leonello + * Copyright (c) 2010-2013 Chris Leonello * * jsDate is currently available for use in all personal or commercial projects * under both the MIT and GPL version 2.0 licenses. This means that you can @@ -38,7 +38,7 @@ * jsDate borrows many concepts and ideas from the Date Instance * Methods by Ken Snyder along with some parts of Ken's actual code. * - * Ken's origianl Date Instance Methods and copyright notice: + * Ken's original Date Instance Methods and copyright notice: * * Ken Snyder (ken d snyder at gmail dot com) * 2008-09-10 Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasTextRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.categoryAxisRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.categoryAxisRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.categoryAxisRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -211,7 +211,11 @@ } if (isMerged && this.sortMergedLabels) { - labels.sort(function(a,b) { return a - b; }); + if (typeof labels[0] == "string") { + labels.sort(); + } else { + labels.sort(function(a,b) { return a - b; }); + } } // keep a reference to these tick labels to use for redrawing plot (see bug #57) @@ -306,7 +310,7 @@ // call it within the scope of the axis. this.renderer.createTicks.call(this); // fill a div with axes labels in the right direction. - // Need to pregenerate each axis to get it's bounds and + // Need to pregenerate each axis to get its bounds and // position it and the labels correctly on the plot. var dim=0; var temp; @@ -432,7 +436,7 @@ var offmin = offsets.min; var lshow = (this._label == null) ? false : this._label.show; var i; - + for (var p in pos) { this._elem.css(p, pos[p]); } @@ -564,11 +568,12 @@ } // draw the group labels - var step = parseInt(this._ticks.length/this.groups, 10); + var step = parseInt(this._ticks.length/this.groups, 10) + 1; for (i=0; i<this._groupLabels.length; i++) { var mid = 0; var count = 0; - for (var j=i*step; j<=(i+1)*step; j++) { + for (var j=i*step; j<(i+1)*step; j++) { + if (j >= this._ticks.length-1) continue; // the last tick does not exist as there is no other group in order to have an empty one. if (this._ticks[j]._elem && this._ticks[j].label != " ") { var t = this._ticks[j]._elem; var p = t.position(); @@ -648,11 +653,12 @@ } // draw the group labels, position top here, do left after label position. - var step = parseInt(this._ticks.length/this.groups, 10); + var step = parseInt(this._ticks.length/this.groups, 10) + 1; // step is one more than before as we don't want to have overlaps in loops for (i=0; i<this._groupLabels.length; i++) { var mid = 0; var count = 0; - for (var j=i*step; j<=(i+1)*step; j++) { + for (var j=i*step; j<(i+1)*step; j++) { // j must never reach (i+1)*step as we don't want to have overlap between loops + if (j >= this._ticks.length-1) continue; // the last tick does not exist as there is no other group in order to have an empty one. if (this._ticks[j]._elem && this._ticks[j].label != " ") { var t = this._ticks[j]._elem; var p = t.position(); @@ -670,4 +676,4 @@ }; -})(jQuery); \ No newline at end of file +})(jQuery); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.categoryAxisRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ciParser.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ciParser.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ciParser.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -54,7 +54,7 @@ $.jqplot.ciParser = function (data, plot) { var ret = [], line, - temp, + temp, i, j, k, kk; if (typeof(data) == "string") { Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ciParser.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.cursor.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.cursor.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.cursor.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -42,7 +42,7 @@ this.style = 'crosshair'; this.previousCursor = 'auto'; // prop: show - // wether to show the cursor or not. + // whether to show the cursor or not. this.show = $.jqplot.config.enablePlugins; // prop: showTooltip // show a cursor position tooltip. Location of the tooltip @@ -654,7 +654,7 @@ elem.css('left', x); elem.css('top', y); - elem = null; + elem = null; } function positionTooltip(plot) { @@ -1048,7 +1048,7 @@ if (this.show) { var series = this._series, s; // make a table. one line label per row. - var elem = document.createElement('div'); + var elem = document.createElement('table'); this._elem = $(elem); elem = null; this._elem.addClass('jqplot-legend jqplot-cursor-legend'); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.cursor.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dateAxisRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dateAxisRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dateAxisRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -33,7 +33,7 @@ * Class: $.jqplot.DateAxisRenderer * A plugin for a jqPlot to render an axis as a series of date values. * This renderer has no options beyond those supplied by the <Axis> class. - * It supplies it's own tick formatter, so the tickOptions.formatter option + * It supplies its own tick formatter, so the tickOptions.formatter option * should not be overridden. * * Thanks to Ken Synder for his enhanced Date instance methods which are @@ -334,14 +334,35 @@ var tt, i; var threshold = 30; var insetMult = 1; + var daTickInterval = null; + + // if user specified a tick interval, convert to usable. + if (this.tickInterval != null) + { + // if interval is a number or can be converted to one, use it. + // Assume it is in SECONDS!!! + if (Number(this.tickInterval)) { + daTickInterval = [Number(this.tickInterval), 'seconds']; + } + // else, parse out something we can build from. + else if (typeof this.tickInterval == "string") { + var parts = this.tickInterval.split(' '); + if (parts.length == 1) { + daTickInterval = [1, parts[0]]; + } + else if (parts.length == 2) { + daTickInterval = [parts[0], parts[1]]; + } + } + } var tickInterval = this.tickInterval; // if we already have ticks, use them. // ticks must be in order of increasing value. - min = ((this.min != null) ? new $.jsDate(this.min).getTime() : db.min); - max = ((this.max != null) ? new $.jsDate(this.max).getTime() : db.max); + min = new $.jsDate((this.min != null) ? this.min : db.min).getTime(); + max = new $.jsDate((this.max != null) ? this.max : db.max).getTime(); // see if we're zooming. if we are, don't use the min and max we're given, // but compute some nice ones. They will be reset later. @@ -459,16 +480,16 @@ } // If tickInterval is specified, we'll try to honor it. - // Not gauranteed to get this interval, but we'll get as close as + // Not guaranteed to get this interval, but we'll get as close as // we can. // tickInterval will be used before numberTicks, that is if // both are specified, numberTicks will be ignored. else if (this.tickInterval) { - titarget = this.tickInterval; + titarget = new $.jsDate(0).add(daTickInterval[0], daTickInterval[1]).getTime(); } // if numberTicks specified, try to honor it. - // Not gauranteed, but will try to get close. + // Not guaranteed, but will try to get close. else if (this.numberTicks) { nttarget = this.numberTicks; titarget = (max - min) / (nttarget - 1); @@ -480,9 +501,8 @@ var tempti = ret[0]; this._autoFormatString = ret[1]; - min = Math.floor(min/tempti) * tempti; min = new $.jsDate(min); - min = min.getTime() + min.getUtcOffset(); + min = Math.floor((min.getTime() - min.getUtcOffset())/tempti) * tempti + min.getUtcOffset(); nttarget = Math.ceil((max - min) / tempti) + 1; this.min = min; @@ -640,24 +660,8 @@ this.tickInterval = null; } - // if user specified a tick interval, convert to usable. - if (this.tickInterval != null) - { - // if interval is a number or can be converted to one, use it. - // Assume it is in SECONDS!!! - if (Number(this.tickInterval)) { - this.daTickInterval = [Number(this.tickInterval), 'seconds']; - } - // else, parse out something we can build from. - else if (typeof this.tickInterval == "string") { - var parts = this.tickInterval.split(' '); - if (parts.length == 1) { - this.daTickInterval = [1, parts[0]]; - } - else if (parts.length == 2) { - this.daTickInterval = [parts[0], parts[1]]; - } - } + if (this.tickInterval != null && daTickInterval != null) { + this.daTickInterval = daTickInterval; } // if min and max are same, space them out a bit Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dateAxisRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.donutRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.donutRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.donutRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -101,7 +101,7 @@ // null will compute ringMargin based on sliceMargin. this.ringMargin = null; // prop: fill - // true or false, wether to fil the slices. + // true or false, whether to fil the slices. this.fill = true; // prop: shadowOffset // offset of the shadow from the slice and offset of @@ -703,7 +703,7 @@ plot.target.trigger(evt1, ins); if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.donutRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -720,7 +720,7 @@ var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.donutRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -743,7 +743,7 @@ if (neighbor) { var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; var evt = jQuery.Event('jqplotDataClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -758,7 +758,7 @@ unhighlight(plot); } var evt = jQuery.Event('jqplotDataRightClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.donutRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dragable.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dragable.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dragable.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dragable.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.enhancedLegendRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.enhancedLegendRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.enhancedLegendRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -73,7 +73,7 @@ var legend = this; if (this.show) { var series = this._series; - var s; + var s; var ss = 'position:absolute;'; ss += (this.background) ? 'background:'+this.background+';' : ''; ss += (this.border) ? 'border:'+this.border+';' : ''; Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.enhancedLegendRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.funnelRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.funnelRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.funnelRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -102,7 +102,7 @@ // spacing between funnel sections in pixels. this.sectionMargin = 6; // prop: fill - // true or false, wether to fill the areas. + // true or false, whether to fill the areas. this.fill = true; // prop: shadowOffset // offset of the shadow from the area and offset of @@ -841,7 +841,7 @@ plot.target.trigger(evt1, ins); if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.funnelRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -858,7 +858,7 @@ var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.funnelRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -881,7 +881,7 @@ if (neighbor) { var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; var evt = jQuery.Event('jqplotDataClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -896,7 +896,7 @@ unhighlight(plot); } var evt = jQuery.Event('jqplotDataRightClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.funnelRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.highlighter.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.highlighter.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.highlighter.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -44,7 +44,7 @@ * To disable the tooltip, set "showTooltip" to false. * * You can control what data is displayed in the tooltip with various - * options. The "tooltipAxes" option controls wether the x, y or both + * options. The "tooltipAxes" option controls whether the x, y or both * data values are displayed. * * Some chart types (e.g. hi-low-close) have more than one y value per @@ -339,12 +339,12 @@ if (series.markerRenderer.show == true) { ms = (series.markerRenderer.size + opts.sizeAdjust)/2; } - - var loc = locations; - if (series.fillToZero && series.fill && neighbor.data[1] < 0) { - loc = oppositeLocations; - } - + + var loc = locations; + if (series.fillToZero && series.fill && neighbor.data[1] < 0) { + loc = oppositeLocations; + } + switch (loc[locationIndicies[opts.tooltipLocation]]) { case 'nw': var x = gridpos.x + plot._gridPadding.left - elem.outerWidth(true) - opts.tooltipOffset - fact * ms; @@ -432,7 +432,7 @@ if (hl.showMarker) { draw(plot, neighbor); } - if (hl.showTooltip && (!c || !c._zoom.started)) { + if (plot.series[neighbor.seriesIndex].show && hl.showTooltip && (!c || !c._zoom.started)) { showTooltip(plot, plot.series[neighbor.seriesIndex], neighbor); } if (hl.bringSeriesToFront) { @@ -452,7 +452,7 @@ if (hl.showMarker) { draw(plot, neighbor); } - if (hl.showTooltip && (!c || !c._zoom.started)) { + if (plot.series[neighbor.seriesIndex].show && hl.showTooltip && (!c || !c._zoom.started)) { showTooltip(plot, plot.series[neighbor.seriesIndex], neighbor); } if (hl.bringSeriesToFront) { Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.highlighter.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.json2.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.json2.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.json2.js 2013-07-19 21:51:14 UTC (rev 167) @@ -1,4 +1,4 @@ -/* %%Ignore-License +/* 2010-11-01 Chris Leonello Slightly modified version of the original json2.js to put JSON Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.json2.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.logAxisRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.logAxisRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.logAxisRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -161,10 +161,10 @@ // perform some checks if (this.min != null && this.min <= 0) { - throw('log axis minimum must be greater than 0'); + throw new Error("Log axis minimum must be greater than 0"); } if (this.max != null && this.max <= 0) { - throw('log axis maximum must be greater than 0'); + throw new Error("Log axis maximum must be greater than 0"); } function findCeil (val) { @@ -192,6 +192,11 @@ // rmax = rmax*(1+adj); // } + // Handle case where a data value was zero + if (rmin === 0) { + rmin = 1; + } + var order = Math.round(Math.log(rmin)/Math.LN10); if (this.tickOptions == null || !this.tickOptions.formatString) { Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.logAxisRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoAxisRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoAxisRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoAxisRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -91,7 +91,7 @@ // call it within the scope of the axis. this.renderer.createTicks.call(this); // fill a div with axes labels in the right direction. - // Need to pregenerate each axis to get it's bounds and + // Need to pregenerate each axis to get its bounds and // position it and the labels correctly on the plot. var dim=0; var temp; Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoAxisRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -33,7 +33,7 @@ * Class: $.jqplot.MekkoRenderer * Draws a Mekko style chart which shows 3 dimensional data on a 2 dimensional graph. * the <$.jqplot.MekkoAxisRenderer> should be used with mekko charts. The mekko renderer - * overrides the default legend renderer with it's own $.jqplot.MekkoLegendRenderer + * overrides the default legend renderer with its own $.jqplot.MekkoLegendRenderer * which allows more flexibility to specify number of rows and columns in the legend. * * Data is specified per bar in the chart. You can specify data as an array of y values, or as @@ -434,4 +434,4 @@ $.jqplot.preInitHooks.push(preInit); -})(jQuery); \ No newline at end of file +})(jQuery); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.meterGaugeRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.meterGaugeRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.meterGaugeRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -94,7 +94,7 @@ this.needleColor = "#C3D3E5"; // prop: tickColor // color of the tick marks around the gauge. - this.tickColor = "989898"; + this.tickColor = "#989898"; // prop: ringWidth // width of the ring around the gauge. Auto computed by default. this.ringWidth = null; @@ -358,7 +358,7 @@ - // pre-draw so can get it's dimensions. + // pre-draw so can get its dimensions. if (this.label) { this._labelElem = $('<div class="jqplot-meterGauge-label" style="position:absolute;">'+this.label+'</div>'); this.canvas._elem.after(this._labelElem); @@ -413,13 +413,12 @@ // will be center of hub. this._center = [(cw-trans*offx)/2 + trans * offx, (ch-trans*offy)/2 + trans * offy]; } + if (this._labelElem && this.labelPosition == 'bottom') { + this._center[1] -= this._labelElem.outerHeight(true); + } + } - - if (this._labelElem && this.labelPosition == 'bottom') { - this._center[1] -= this._labelElem.outerHeight(true); - } - this._radius = this.diameter/2; this.tickSpacing = 6000/this.diameter; @@ -719,7 +718,7 @@ l = this._tickPoints[i][0] - ew * (this._tickPoints[i][2]-Math.PI)/Math.PI - tp * Math.cos(this._tickPoints[i][2]); t = this._tickPoints[i][1] - eh/2 + eh/2 * Math.pow(Math.abs((Math.sin(this._tickPoints[i][2]))), 0.5) + tp/3 * Math.pow(Math.abs((Math.sin(this._tickPoints[i][2]))), 0.5) ; // t = this._tickPoints[i][1] - eh/2 - eh/2 * Math.sin(this._tickPoints[i][2]) - tp/2 * Math.sin(this._tickPoints[i][2]); - elem.css({left:l, top:t}); + elem.css({left:l, top:t, color: this.tickColor}); dim = ew*Math.cos(this._tickPoints[i][2]) + eh*Math.sin(Math.PI/2+this._tickPoints[i][2]/2); maxdim = (dim > maxdim) ? dim : maxdim; } @@ -739,7 +738,7 @@ else if (this.label && this.labelPosition == 'bottom') { var l = this._center[0] + this.canvas._offsets.left - this._labelElem.outerWidth(true)/2; - var t = this._center[1] + this.canvas._offsets.top + this.innerPad + + this.ringWidth + this.padding + this.labelHeightAdjust; + var t = this._center[1] + this.canvas._offsets.top + this.innerPad + this.ringWidth + this.padding + this.labelHeightAdjust; this._labelElem.css({left:l, top:t}); } @@ -1027,4 +1026,4 @@ })(jQuery); - \ No newline at end of file + Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.meterGaugeRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mobile.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mobile.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mobile.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,8 +2,8 @@ * jqplot.jquerymobile plugin * jQuery Mobile virtual event support. * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * * Copyright (c) 2011 Takashi Okamoto * jqPlot is currently available for use in all personal or commercial projects Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mobile.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ohlcRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ohlcRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ohlcRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -65,7 +65,7 @@ * */ $.jqplot.OHLCRenderer = function(){ - // subclass line renderer to make use of some of it's methods. + // subclass line renderer to make use of some of its methods. $.jqplot.LineRenderer.call(this); // prop: candleStick // true to render chart as candleStick. @@ -370,4 +370,4 @@ //$.jqplot.preInitHooks.push($.jqplot.OHLCRenderer.checkOptions); -})(jQuery); \ No newline at end of file +})(jQuery); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ohlcRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pieRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pieRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pieRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -88,7 +88,7 @@ // angular spacing between pie slices in degrees. this.sliceMargin = 0; // prop: fill - // true or false, wether to fil the slices. + // true or false, whether to fil the slices. this.fill = true; // prop: shadowOffset // offset of the shadow from the slice and offset of @@ -801,7 +801,7 @@ plot.target.trigger(evt1, ins); if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.pieRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -818,7 +818,7 @@ var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.pieRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -841,7 +841,7 @@ if (neighbor) { var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; var evt = jQuery.Event('jqplotDataClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -856,7 +856,7 @@ unhighlight(plot); } var evt = jQuery.Event('jqplotDataRightClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pieRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pointLabels.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pointLabels.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pointLabels.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -155,7 +155,7 @@ labelIdx = p.seriesLabelIndex; } else if (this.renderer.constructor === $.jqplot.BarRenderer && this.barDirection === 'horizontal') { - labelIdx = 0; + labelIdx = (this._plotData[0].length < 3) ? 0 : this._plotData[0].length -1; } else { labelIdx = (this._plotData.length === 0) ? 0 : this._plotData[0].length -1; @@ -294,13 +294,11 @@ for (var i=0, l=p._labels.length; i < l; i++) { var label = p._labels[i]; - if (p.hideZeros && parseInt(p._labels[i], 10) == 0) { - label = ''; + if (label == null || (p.hideZeros && parseInt(label, 10) == 0)) { + continue; } - if (label != null) { - label = p.formatter(p.formatString, label); - } + label = p.formatter(p.formatString, label); helem = document.createElement('div'); p._elems[i] = $(helem); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pointLabels.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidAxisRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidAxisRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidAxisRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -111,7 +111,7 @@ // call it within the scope of the axis. this.renderer.createTicks.call(this, plot); // fill a div with axes labels in the right direction. - // Need to pregenerate each axis to get it's bounds and + // Need to pregenerate each axis to get its bounds and // position it and the labels correctly on the plot. var dim=0; var temp; @@ -725,4 +725,4 @@ ticks = null; }; -})(jQuery); \ No newline at end of file +})(jQuery); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidAxisRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidGridRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidGridRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidGridRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidGridRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -495,7 +495,7 @@ plot.target.trigger(evt1, ins); if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.pyramidRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.trendline.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.trendline.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.trendline.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 Chris Leonello * jqPlot is currently available for use in all personal or commercial projects * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can @@ -60,7 +60,7 @@ // Either 'exponential', 'exp', or 'linear'. this.type = 'linear'; // prop: shadow - // true or false, wether or not to show the shadow. + // true or false, whether or not to show the shadow. this.shadow = true; // prop: markerRenderer // Renderer to use to draw markers on the line. Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.trendline.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/site/rst/index.rst.vm =================================================================== --- sandbox/nuiton-js-jqplot/src/site/rst/index.rst.vm 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/site/rst/index.rst.vm 2013-07-19 21:51:14 UTC (rev 167) @@ -1,8 +1,8 @@ .. - .. * #%L .. * Nuiton JS :: jqPlot -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2012 - 2013 CodeLutin .. * %% @@ -33,7 +33,7 @@ .. _documentation: http://www.jqplot.com/docs/files/usage-txt.html Use -=== +--- Maven part:: Property changes on: sandbox/nuiton-js-jqplot/src/site/rst/index.rst.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/site/site_en.xml =================================================================== --- sandbox/nuiton-js-jqplot/src/site/site_en.xml 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/site/site_en.xml 2013-07-19 21:51:14 UTC (rev 167) @@ -1,8 +1,8 @@ <!-- #%L Nuiton JS :: jqPlot - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin %% @@ -45,8 +45,8 @@ <menu ref="parent"/> - <menu name="Utilisateurs"> - <item name="Accueil" href="index.html"/> + <menu name="Users"> + <item name="Home" href="index.html"/> </menu> <menu ref="reports"/> Property changes on: sandbox/nuiton-js-jqplot/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r166 - in sandbox/nuiton-js-jqgrid: . src/main/resources/META-INF/nuiton-js src/main/resources/nuiton-js-jqgrid/css src/main/resources/nuiton-js-jqgrid/js src/main/resources/nuiton-js-jqgrid/js/i18n src/main/resources/nuiton-js-jqgrid/plugins src/site src/site/rst
by echatellier＠users.nuiton.org July 19, 2013

July 19, 2013

Author: echatellier Date: 2013-07-19 23:45:03 +0200 (Fri, 19 Jul 2013) New Revision: 166 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/166 Log: Update jqgrid Added: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-id.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-vi.js Removed: sandbox/nuiton-js-jqgrid/changelog.txt Modified: sandbox/nuiton-js-jqgrid/.classpath sandbox/nuiton-js-jqgrid/LICENSE.txt sandbox/nuiton-js-jqgrid/README.txt sandbox/nuiton-js-jqgrid/generate-i18n-group.sh sandbox/nuiton-js-jqgrid/pom.xml sandbox/nuiton-js-jqgrid/src/main/resources/META-INF/nuiton-js/wro-jqgrid.xml sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/css/ellipsis-xbl.xml sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/css/ui.jqgrid.css sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ar.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-bg.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-bg1251.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-cat.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-cn.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-cs.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-da.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-de.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-dk.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-el.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-en.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-es.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-fa.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-fi.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-fr.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-gl.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-he.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-hr.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-hr1250.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-hu.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-is.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-it.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ja.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-kr.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-lt.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-mne.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-nl.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-no.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pl.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pt-br.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pt.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ro.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ru.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sk.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sr-latin.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sr.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sv.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-th.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-tr.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-tw.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ua.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/jquery.jqGrid.src.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/grid.addons.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/grid.postext.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/grid.setcolumns.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/jquery.contextmenu.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/jquery.searchFilter.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/jquery.tablednd.js sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/searchFilter.css sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/ui.multiselect.css sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/ui.multiselect.js sandbox/nuiton-js-jqgrid/src/site/rst/index.rst.vm sandbox/nuiton-js-jqgrid/src/site/site_en.xml Property changes on: sandbox/nuiton-js-jqgrid/.classpath ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jqgrid/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/README.txt =================================================================== --- sandbox/nuiton-js-jqgrid/README.txt 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/README.txt 2013-07-19 21:45:03 UTC (rev 166) @@ -1 +1,2 @@ +for f in src/main/resources/nuiton-js-jqgrid/js/i18n/*.js; do sed -i '1i// %%Ignore-License' $f; done Property changes on: sandbox/nuiton-js-jqgrid/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: sandbox/nuiton-js-jqgrid/changelog.txt =================================================================== --- sandbox/nuiton-js-jqgrid/changelog.txt 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/changelog.txt 2013-07-19 21:45:03 UTC (rev 166) @@ -1,2 +0,0 @@ -Please refer to the release note : - http://maven-site.nuiton.org/nuiton-js/changes-report.html Property changes on: sandbox/nuiton-js-jqgrid/generate-i18n-group.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/pom.xml =================================================================== --- sandbox/nuiton-js-jqgrid/pom.xml 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/pom.xml 2013-07-19 21:45:03 UTC (rev 166) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-js-jqgrid</artifactId> - <version>4.4.1-1</version> + <version>4.5.2-1-SNAPSHOT</version> <name>Nuiton JS :: jqGrid</name> <description>jqGrid jar packaging</description> @@ -29,9 +29,9 @@ </licenses> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-jqgrid-4.4.1-1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-jqgrid-4.4.1-1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-js/tags/nuiton-js-jqgrid-4…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-jqgrid-4.5.2-1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-jqgrid-4.5.2-1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-js/tags/nuiton-js-jqgrid-4…</url> </scm> <dependencies> Property changes on: sandbox/nuiton-js-jqgrid/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/META-INF/nuiton-js/wro-jqgrid.xml =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/META-INF/nuiton-js/wro-jqgrid.xml 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/META-INF/nuiton-js/wro-jqgrid.xml 2013-07-19 21:45:03 UTC (rev 166) @@ -1,8 +1,8 @@  http://cldr.unicode.org/index) - * Tomasz Pęczek tpeczek(a)gmail.com - * http://tpeczek.blogspot.com; http://tpeczek.codeplex.com - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html -**/ -$.jgrid = $.jgrid || {}; -$.extend($.jgrid,{ - defaults : { - recordtext: "Pokaż {0} - {1} z {2}", - emptyrecords: "Brak rekordów do pokazania", - loadtext: "Ładowanie...", - pgtext : "Strona {0} z {1}" - }, - search : { - caption: "Wyszukiwanie...", - Find: "Szukaj", - Reset: "Czyść", - odata : ['dokładnie', 'różne od', 'mniejsze od', 'mniejsze lub równe', 'większe od', 'większe lub równe', 'zaczyna się od', 'nie zaczyna się od', 'jest w', 'nie jest w', 'kończy się na', 'nie kończy się na', 'zawiera', 'nie zawiera'], - groupOps: [ { op: "AND", text: "oraz" }, { op: "OR", text: "lub" } ], - matchText: " pasuje", - rulesText: " reguły" - }, - edit : { - addCaption: "Dodaj rekord", - editCaption: "Edytuj rekord", - bSubmit: "Zapisz", - bCancel: "Anuluj", - bClose: "Zamknij", - saveData: "Dane zostały zmienione! Zapisać zmiany?", - bYes: "Tak", - bNo: "Nie", - bExit: "Anuluj", - msg: { - required: "Pole jest wymagane", - number: "Proszę wpisać poprawną liczbę", - minValue: "wartość musi być większa lub równa od", - maxValue: "wartość musi być mniejsza lub równa od", - email: "nie jest poprawnym adresem e-mail", - integer: "Proszę wpisać poprawną liczbę", - date: "Proszę podaj poprawną datę", - url: "jest niewłaściwym adresem URL. Pamiętaj o prefiksie ('http://' lub 'https://')", - nodefined: " niezdefiniowane!", - novalue: " wymagana jest wartość zwracana!", - customarray: "Funkcja niestandardowa powinna zwracać tablicę!", - customfcheck: "Funkcja niestandardowa powinna być obecna w przypadku niestandardowego sprawdzania!" - } - }, - view : { - caption: "Pokaż rekord", - bClose: "Zamknij" - }, - del : { - caption: "Usuń", - msg: "Czy usunąć wybrany rekord(y)?", - bSubmit: "Usuń", - bCancel: "Anuluj" - }, - nav : { - edittext: "", - edittitle: "Edytuj wybrany wiersz", - addtext: "", - addtitle: "Dodaj nowy wiersz", - deltext: "", - deltitle: "Usuń wybrany wiersz", - searchtext: "", - searchtitle: "Wyszukaj rekord", - refreshtext: "", - refreshtitle: "Przeładuj", - alertcap: "Uwaga", - alerttext: "Proszę wybrać wiersz", - viewtext: "", - viewtitle: "Pokaż wybrany wiersz" - }, - col : { - caption: "Pokaż/Ukryj kolumny", - bSubmit: "Zatwierdź", - bCancel: "Anuluj" - }, - errors : { - errcap: "Błąd", - nourl: "Brak adresu url", - norecords: "Brak danych", - model : "Długość colNames <> colModel!" - }, - formatter : { - integer : {thousandsSeparator: " ", defaultValue: '0'}, - number : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0,00'}, - currency : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:" zł", defaultValue: '0,00'}, - date : { - dayNames: [ - "niedz.", "pon.", "wt.", "śr.", "czw.", "pt.", "sob.", - "niedziela", "poniedziałek", "wtorek", "środa", "czwartek", "piątek", "sobota" - ], - monthNames: [ - "sty", "lut", "mar", "kwi", "maj", "cze", "lip", "sie", "wrz", "paź", "lis", "gru", - "styczeń", "luty", "marzec", "kwiecień", "maj", "czerwiec", "lipiec", "sierpień", "wrzesień", "październik", "listopad", "grudzień" - ], - AmPm : ["","","",""], - S: function (j) {return '';}, - srcformat: 'Y-m-d', - newformat: 'd.m.Y', - masks : { - ISO8601Long: "Y-m-d H:i:s", - ISO8601Short: "Y-m-d", - ShortDate: "d.m.y", - LongDate: "l, j F Y", - FullDateTime: "l, j F Y H:i:s", - MonthDay: "j F", - ShortTime: "H:i", - LongTime: "H:i:s", - SortableDateTime: "Y-m-d\\TH:i:s", - UniversalSortableDateTime: "Y-m-d H:i:sO", - YearMonth: "F Y" - }, - reformatAfterEdit : false - }, - baseLinkUrl: '', - showAction: '', - target: '', - checkbox : {disabled:true}, - idName : 'id' - } -}); +// %%Ignore-License +;(function($){ +/** + * jqGrid Polish Translation + * Łukasz Schab lukasz(a)freetree.pl + * http://FreeTree.pl + * + * Updated names, abbreviations, currency and date/time formats for Polish norms (also corresponding with CLDR v21.0.1 --> http://cldr.unicode.org/index) + * Tomasz Pęczek tpeczek(a)gmail.com + * http://tpeczek.blogspot.com; http://tpeczek.codeplex.com + * + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html +**/ +$.jgrid = $.jgrid || {}; +$.extend($.jgrid,{ + defaults : { + recordtext: "Pokaż {0} - {1} z {2}", + emptyrecords: "Brak rekordów do pokazania", + loadtext: "Ładowanie...", + pgtext : "Strona {0} z {1}" + }, + search : { + caption: "Wyszukiwanie...", + Find: "Szukaj", + Reset: "Czyść", + odata: [{ oper:'eq', text:"dokładnie"},{ oper:'ne', text:"różne od"},{ oper:'lt', text:"mniejsze od"},{ oper:'le', text:"mniejsze lub równe"},{ oper:'gt', text:"większe od"},{ oper:'ge', text:"większe lub równe"},{ oper:'bw', text:"zaczyna się od"},{ oper:'bn', text:"nie zaczyna się od"},{ oper:'in', text:"jest w"},{ oper:'ni', text:"nie jest w"},{ oper:'ew', text:"kończy się na"},{ oper:'en', text:"nie kończy się na"},{ oper:'cn', text:"zawiera"},{ oper:'nc', text:"nie zawiera"}], + groupOps: [ { op: "AND", text: "oraz" }, { op: "OR", text: "lub" } ] + }, + edit : { + addCaption: "Dodaj rekord", + editCaption: "Edytuj rekord", + bSubmit: "Zapisz", + bCancel: "Anuluj", + bClose: "Zamknij", + saveData: "Dane zostały zmienione! Zapisać zmiany?", + bYes: "Tak", + bNo: "Nie", + bExit: "Anuluj", + msg: { + required: "Pole jest wymagane", + number: "Proszę wpisać poprawną liczbę", + minValue: "wartość musi być większa lub równa od", + maxValue: "wartość musi być mniejsza lub równa od", + email: "nie jest poprawnym adresem e-mail", + integer: "Proszę wpisać poprawną liczbę", + date: "Proszę podaj poprawną datę", + url: "jest niewłaściwym adresem URL. Pamiętaj o prefiksie ('http://' lub 'https://')", + nodefined: " niezdefiniowane!", + novalue: " wymagana jest wartość zwracana!", + customarray: "Funkcja niestandardowa powinna zwracać tablicę!", + customfcheck: "Funkcja niestandardowa powinna być obecna w przypadku niestandardowego sprawdzania!" + } + }, + view : { + caption: "Pokaż rekord", + bClose: "Zamknij" + }, + del : { + caption: "Usuń", + msg: "Czy usunąć wybrany rekord(y)?", + bSubmit: "Usuń", + bCancel: "Anuluj" + }, + nav : { + edittext: "", + edittitle: "Edytuj wybrany wiersz", + addtext: "", + addtitle: "Dodaj nowy wiersz", + deltext: "", + deltitle: "Usuń wybrany wiersz", + searchtext: "", + searchtitle: "Wyszukaj rekord", + refreshtext: "", + refreshtitle: "Przeładuj", + alertcap: "Uwaga", + alerttext: "Proszę wybrać wiersz", + viewtext: "", + viewtitle: "Pokaż wybrany wiersz" + }, + col : { + caption: "Pokaż/Ukryj kolumny", + bSubmit: "Zatwierdź", + bCancel: "Anuluj" + }, + errors : { + errcap: "Błąd", + nourl: "Brak adresu url", + norecords: "Brak danych", + model : "Długość colNames <> colModel!" + }, + formatter : { + integer : {thousandsSeparator: " ", defaultValue: '0'}, + number : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0,00'}, + currency : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:" zł", defaultValue: '0,00'}, + date : { + dayNames: [ + "niedz.", "pon.", "wt.", "śr.", "czw.", "pt.", "sob.", + "niedziela", "poniedziałek", "wtorek", "środa", "czwartek", "piątek", "sobota" + ], + monthNames: [ + "sty", "lut", "mar", "kwi", "maj", "cze", "lip", "sie", "wrz", "paź", "lis", "gru", + "styczeń", "luty", "marzec", "kwiecień", "maj", "czerwiec", "lipiec", "sierpień", "wrzesień", "październik", "listopad", "grudzień" + ], + AmPm : ["","","",""], + S: function (j) {return '';}, + srcformat: 'Y-m-d', + newformat: 'd.m.Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, + masks : { + ISO8601Long: "Y-m-d H:i:s", + ISO8601Short: "Y-m-d", + ShortDate: "d.m.y", + LongDate: "l, j F Y", + FullDateTime: "l, j F Y H:i:s", + MonthDay: "j F", + ShortTime: "H:i", + LongTime: "H:i:s", + SortableDateTime: "Y-m-d\\TH:i:s", + UniversalSortableDateTime: "Y-m-d H:i:sO", + YearMonth: "F Y" + }, + reformatAfterEdit : false + }, + baseLinkUrl: '', + showAction: '', + target: '', + checkbox : {disabled:true}, + idName : 'id' + } +}); })(jQuery); \ No newline at end of file Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pl.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pt-br.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pt-br.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pt-br.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,6 +1,6 @@ +// %%Ignore-License ;(function($){ /** - * %%Ignore-License * jqGrid Brazilian-Portuguese Translation * Sergio Righi sergio.righi(a)gmail.com * http://curve.com.br @@ -23,10 +23,8 @@ caption: "Procurar...", Find: "Procurar", Reset: "Resetar", - odata : ['igual', 'diferente', 'menor', 'menor ou igual','maior','maior ou igual', 'inicia com','não inicia com','está em','não está em','termina com','não termina com','contém','não contém','nulo','não nulo'], - groupOps: [ { op: "AND", text: "all" }, { op: "OR", text: "any" } ], - matchText: " igual a", - rulesText: " regras" + odata: [{ oper:'eq', text:"igual"},{ oper:'ne', text:"diferente"},{ oper:'lt', text:"menor"},{ oper:'le', text:"menor ou igual"},{ oper:'gt', text:"maior"},{ oper:'ge', text:"maior ou igual"},{ oper:'bw', text:"inicia com"},{ oper:'bn', text:"não inicia com"},{ oper:'in', text:"está em"},{ oper:'ni', text:"não está em"},{ oper:'ew', text:"termina com"},{ oper:'en', text:"não termina com"},{ oper:'cn', text:"contém"},{ oper:'nc', text:"não contém"},{ oper:'nu', text:"nulo"},{ oper:'nn', text:"não nulo"}], + groupOps: [ { op: "AND", text: "all" }, { op: "OR", text: "any" } ] }, edit : { addCaption: "Incluir", @@ -107,6 +105,7 @@ S: function (j) {return j < 11 || j > 13 ? ['º', 'º', 'º', 'º'][Math.min((j - 1) % 10, 3)] : 'º'}, srcformat: 'Y-m-d', newformat: 'd/m/Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, masks : { ISO8601Long:"Y-m-d H:i:s", ISO8601Short:"Y-m-d", Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pt-br.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pt.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pt.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pt.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,6 +1,6 @@ +// %%Ignore-License ;(function($){ /** - * %%Ignore-License * jqGrid Portuguese Translation * Tradu��o da jqGrid em Portugues por Frederico Carvalho, http://www.eyeviewdesign.pt * Dual licensed under the MIT and GPL licenses: @@ -19,10 +19,8 @@ caption: "Busca...", Find: "Procurar", Reset: "Limpar", - odata : ['equal', 'not equal', 'less', 'less or equal','greater','greater or equal', 'begins with','does not begin with','is in','is not in','ends with','does not end with','contains','does not contain'], - groupOps: [ { op: "AND", text: "all" }, { op: "OR", text: "any" } ], - matchText: " match", - rulesText: " rules" + odata: [{ oper:'eq', text:'equal'},{ oper:'ne', text:'not equal'},{ oper:'lt', text:'less'},{ oper:'le', text:'less or equal'},{ oper:'gt', text:'greater'},{ oper:'ge', text:'greater or equal'},{ oper:'bw', text:'begins with'},{ oper:'bn', text:'does not begin with'},{ oper:'in', text:'is in'},{ oper:'ni', text:'is not in'},{ oper:'ew', text:'ends with'},{ oper:'en', text:'does not end with'},{ oper:'cn', text:'contains'},{ oper:'nc', text:'does not contain'}], + groupOps: [ { op: "AND", text: "all" }, { op: "OR", text: "any" } ] }, edit : { addCaption: "Adicionar Registo", @@ -102,6 +100,7 @@ S: function (j) {return j < 11 || j > 13 ? ['�', '�', '�', '�'][Math.min((j - 1) % 10, 3)] : '�'}, srcformat: 'Y-m-d', newformat: 'd/m/Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, masks : { ISO8601Long:"Y-m-d H:i:s", ISO8601Short:"Y-m-d", Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pt.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ro.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ro.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ro.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,6 +1,6 @@ +// %%Ignore-License ;(function($){ /** - * %%Ignore-License * jqGrid Romanian Translation * Alexandru Emil Lupu contact(a)alecslupu.ro * http://www.alecslupu.ro/ @@ -20,10 +20,8 @@ caption: "Caută...", Find: "Caută", Reset: "Resetare", - odata : ['egal', 'diferit', 'mai mic', 'mai mic sau egal','mai mare','mai mare sau egal', 'începe cu','nu începe cu','se găsește în','nu se găsește în','se termină cu','nu se termină cu','conține',''], - groupOps: [ { op: "AND", text: "toate" }, { op: "OR", text: "oricare" } ], - matchText: " găsite", - rulesText: " reguli" + odata: [{ oper:'eq', text:"egal"},{ oper:'ne', text:"diferit"},{ oper:'lt', text:"mai mic"},{ oper:'le', text:"mai mic sau egal"},{ oper:'gt', text:"mai mare"},{ oper:'ge', text:"mai mare sau egal"},{ oper:'bw', text:"începe cu"},{ oper:'bn', text:"nu începe cu"},{ oper:'in', text:"se găsește în"},{ oper:'ni', text:"nu se găsește în"},{ oper:'ew', text:"se termină cu"},{ oper:'en', text:"nu se termină cu"},{ oper:'cn', text:"conține"},{ oper:'nc', text:""}], + groupOps: [ { op: "AND", text: "toate" }, { op: "OR", text: "oricare" } ] }, edit : { addCaption: "Adăugare înregistrare", @@ -116,6 +114,7 @@ S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'}, srcformat: 'Y-m-d', newformat: 'd/m/Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, masks : { ISO8601Long:"Y-m-d H:i:s", ISO8601Short:"Y-m-d", Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ro.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ru.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ru.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ru.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,6 +1,6 @@ +// %%Ignore-License ;(function($){ /** - * %%Ignore-License * jqGrid Russian Translation v1.0 02.07.2009 (based on translation by Alexey Kanaev v1.1 21.01.2009, http://softcore.com.ru) * Sergey Dyagovchenko * http://d.sumy.ua @@ -20,10 +20,8 @@ caption: "Поиск...", Find: "Найти", Reset: "Сброс", - odata : ['равно', 'не равно', 'меньше', 'меньше или равно','больше','больше или равно', 'начинается с','не начинается с','находится в','не находится в','заканчивается на','не заканчивается на','содержит','не содержит'], - groupOps: [ { op: "AND", text: "все" }, { op: "OR", text: "любой" } ], - matchText: " совпадает", - rulesText: " правила" + odata: [{ oper:'eq', text:"равно"},{ oper:'ne', text:"не равно"},{ oper:'lt', text:"меньше"},{ oper:'le', text:"меньше или равно"},{ oper:'gt', text:"больше"},{ oper:'ge', text:"больше или равно"},{ oper:'bw', text:"начинается с"},{ oper:'bn', text:"не начинается с"},{ oper:'in', text:"находится в"},{ oper:'ni', text:"не находится в"},{ oper:'ew', text:"заканчивается на"},{ oper:'en', text:"не заканчивается на"},{ oper:'cn', text:"содержит"},{ oper:'nc', text:"не содержит"}], + groupOps: [ { op: "AND", text: "все" }, { op: "OR", text: "любой" } ] }, edit : { addCaption: "Добавить запись", @@ -43,11 +41,11 @@ email: "некорректное значение e-mail", integer: "Пожалуйста, введите целое число", date: "Пожалуйста, введите правильную дату", - url: "неверная ссылка. Необходимо ввести префикс ('http://' or 'https://')", - nodefined : " is not defined!", - novalue : " return value is required!", - customarray : "Custom function should return array!", - customfcheck : "Custom function should be present in case of custom checking!" + url: "неверная ссылка. Необходимо ввести префикс ('http://' или 'https://')", + nodefined : " не определено!", + novalue : " возвращаемое значение обязательно!", + customarray : "Пользовательская функция должна возвращать массив!", + customfcheck : "Пользовательская функция должна присутствовать в случаи пользовательской проверки!" } }, view : { @@ -104,6 +102,7 @@ S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'}, srcformat: 'Y-m-d', newformat: 'd.m.Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, masks : { ISO8601Long:"Y-m-d H:i:s", ISO8601Short:"Y-m-d", Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ru.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sk.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sk.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sk.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,6 +1,6 @@ +// %%Ignore-License ;(function($){ /** - * %%Ignore-License * jqGrid Slovak Translation * Milan Cibulka * http://trirand.com/blog/ @@ -20,10 +20,8 @@ caption: "Vyhľadávam...", Find: "Hľadať", Reset: "Reset", - odata : ['rovná sa', 'nerovná sa', 'menšie', 'menšie alebo rovnajúce sa','väčšie', 'väčšie alebo rovnajúce sa', 'začína s', 'nezačína s', 'je v', 'nie je v', 'končí s', 'nekončí s', 'obahuje', 'neobsahuje'], - groupOps: [ { op: "AND", text: "všetkých" }, { op: "OR", text: "niektorého z" } ], - matchText: " hľadať podla", - rulesText: " pravidiel" + odata: [{ oper:'eq', text:"rovná sa"},{ oper:'ne', text:"nerovná sa"},{ oper:'lt', text:"menšie"},{ oper:'le', text:"menšie alebo rovnajúce sa"},{ oper:'gt', text:"väčšie"},{ oper:'ge', text:"väčšie alebo rovnajúce sa"},{ oper:'bw', text:"začína s"},{ oper:'bn', text:"nezačína s"},{ oper:'in', text:"je v"},{ oper:'ni', text:"nie je v"},{ oper:'ew', text:"končí s"},{ oper:'en', text:"nekončí s"},{ oper:'cn', text:"obahuje"},{ oper:'nc', text:"neobsahuje"}], + groupOps: [ { op: "AND", text: "všetkých" }, { op: "OR", text: "niektorého z" } ] }, edit : { addCaption: "Pridať záznam", @@ -104,6 +102,7 @@ S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'}, srcformat: 'Y-m-d', newformat: 'd/m/Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, masks : { ISO8601Long:"Y-m-d H:i:s", ISO8601Short:"Y-m-d", Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sk.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sr-latin.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sr-latin.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sr-latin.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,6 +1,6 @@ +// %%Ignore-License ;(function($){ /** - * %%Ignore-License * jqGrid Serbian latin Translation * Bild Studio info(a)bild-studio.net * http://www.bild-studio.com @@ -13,17 +13,15 @@ defaults : { recordtext: "Pregled {0} - {1} od {2}", emptyrecords: "Ne postoji nijedan zapis", - loadtext: "Učitivanje...", + loadtext: "Učitavanje…", pgtext : "Strana {0} od {1}" }, search : { caption: "Traženje...", Find: "Traži", Reset: "Resetuj", - odata : ['jednako', 'nije jednako', 'manje', 'manje ili jednako','veće','veće ili jednako', 'počinje sa','ne počinje sa','je u','nije u','završava sa','ne završava sa','sadrži','ne sadrži'], - groupOps: [ { op: "AND", text: "sva" }, { op: "OR", text: "bilo koje" } ], - matchText: " primeni", - rulesText: " pravila" + odata: [{ oper:'eq', text:"jednako"},{ oper:'ne', text:"nije jednako"},{ oper:'lt', text:"manje"},{ oper:'le', text:"manje ili jednako"},{ oper:'gt', text:"veće"},{ oper:'ge', text:"veće ili jednako"},{ oper:'bw', text:"počinje sa"},{ oper:'bn', text:"ne počinje sa"},{ oper:'in', text:"je u"},{ oper:'ni', text:"nije u"},{ oper:'ew', text:"završava sa"},{ oper:'en', text:"ne završava sa"},{ oper:'cn', text:"sadrži"},{ oper:'nc', text:"ne sadrži"}], + groupOps: [ { op: "AND", text: "sva" }, { op: "OR", text: "bilo koje" } ] }, edit : { addCaption: "Dodaj zapis", @@ -105,6 +103,7 @@ S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'}, srcformat: 'Y-m-d', newformat: 'd/m/Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, masks : { ISO8601Long:"Y-m-d H:i:s", ISO8601Short:"Y-m-d", Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sr-latin.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sr.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sr.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sr.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,6 +1,6 @@ +// %%Ignore-License ;(function($){ /** - * %%Ignore-License * jqGrid Serbian Translation * Александар Миловац(Aleksandar Milovac) aleksandar.milovac(a)gmail.com * http://trirand.com/blog/ @@ -20,10 +20,8 @@ caption: "Тражење...", Find: "Тражи", Reset: "Ресетуј", - odata : ['једнако', 'није једнако', 'мање', 'мање или једнако','веће','веће или једнако', 'почиње са','не почиње са','је у','није у','завршава са','не завршава са','садржи','не садржи'], - groupOps: [ { op: "И", text: "сви" }, { op: "ИЛИ", text: "сваки" } ], - matchText: " match", - rulesText: " правила" + odata: [{ oper:'eq', text:"једнако"},{ oper:'ne', text:"није једнако"},{ oper:'lt', text:"мање"},{ oper:'le', text:"мање или једнако"},{ oper:'gt', text:"веће"},{ oper:'ge', text:"веће или једнако"},{ oper:'bw', text:"почиње са"},{ oper:'bn', text:"не почиње са"},{ oper:'in', text:"је у"},{ oper:'ni', text:"није у"},{ oper:'ew', text:"завршава са"},{ oper:'en', text:"не завршава са"},{ oper:'cn', text:"садржи"},{ oper:'nc', text:"не садржи"}], + groupOps: [ { op: "И", text: "сви" }, { op: "ИЛИ", text: "сваки" } ] }, edit : { addCaption: "Додај запис", @@ -105,6 +103,7 @@ S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'}, srcformat: 'Y-m-d', newformat: 'd/m/Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, masks : { ISO8601Long:"Y-m-d H:i:s", ISO8601Short:"Y-m-d", Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sr.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sv.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sv.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sv.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,6 +1,6 @@ +// %%Ignore-License ;(function($){ /** - * %%Ignore-License * jqGrid Swedish Translation * Harald Normann harald.normann(a)wts.se, harald.normann(a)gmail.com * http://www.worldteamsoftware.com @@ -20,10 +20,8 @@ caption: "Sök Poster - Ange sökvillkor", Find: "Sök", Reset: "Nollställ Villkor", - odata : ['lika', 'ej lika', 'mindre', 'mindre eller lika','större','större eller lika', 'börjar med','börjar inte med','tillhör','tillhör inte','slutar med','slutar inte med','innehåller','innehåller inte'], - groupOps: [ { op: "AND", text: "alla" }, { op: "OR", text: "eller" } ], - matchText: " träff", - rulesText: " regler" + odata: [{ oper:'eq', text:"lika"},{ oper:'ne', text:"ej lika"},{ oper:'lt', text:"mindre"},{ oper:'le', text:"mindre eller lika"},{ oper:'gt', text:"större"},{ oper:'ge', text:"större eller lika"},{ oper:'bw', text:"börjar med"},{ oper:'bn', text:"börjar inte med"},{ oper:'in', text:"tillhör"},{ oper:'ni', text:"tillhör inte"},{ oper:'ew', text:"slutar med"},{ oper:'en', text:"slutar inte med"},{ oper:'cn', text:"innehåller"},{ oper:'nc', text:"innehåller inte"}], + groupOps: [ { op: "AND", text: "alla" }, { op: "OR", text: "eller" } ] }, edit : { addCaption: "Ny Post", @@ -104,6 +102,7 @@ S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'}, srcformat: 'Y-m-d', newformat: 'Y-m-d', + parseRe : /[Tt\\\/:_;.,\t\s-]/, masks : { ISO8601Long:"Y-m-d H:i:s", ISO8601Short:"Y-m-d", Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sv.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-th.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-th.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-th.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,6 +1,6 @@ +// %%Ignore-License ;(function($){ /** - * %%Ignore-License * jqGrid Thai Translation * Kittituch Manakul m.kittituch(a)Gmail.com * http://trirand.com/blog/ @@ -20,10 +20,8 @@ caption: "กำลังค้นหา...", Find: "ค้นหา", Reset: "คืนค่ากลับ", - odata : ['เท่ากับ', 'ไม่เท่ากับ', 'น้อยกว่า', 'ไม่มากกว่า','มากกกว่า','ไม่น้อยกว่า', 'ขึ้นต้นด้วย','ไม่ขึ้นต้นด้วย','มีคำใดคำหนึ่งใน','ไม่มีคำใดคำหนึ่งใน','ลงท้ายด้วย','ไม่ลงท้ายด้วย','มีคำว่า','ไม่มีคำว่า'], - groupOps: [ { op: "และ", text: "ทั้งหมด" }, { op: "หรือ", text: "ใดๆ" } ], - matchText: " ตรงกันกับ", - rulesText: " ตามกฏ" + odata: [{ oper:'eq', text:"เท่ากับ"},{ oper:'ne', text:"ไม่เท่ากับ"},{ oper:'lt', text:"น้อยกว่า"},{ oper:'le', text:"ไม่มากกว่า"},{ oper:'gt', text:"มากกกว่า"},{ oper:'ge', text:"ไม่น้อยกว่า"},{ oper:'bw', text:"ขึ้นต้นด้วย"},{ oper:'bn', text:"ไม่ขึ้นต้นด้วย"},{ oper:'in', text:"มีคำใดคำหนึ่งใน"},{ oper:'ni', text:"ไม่มีคำใดคำหนึ่งใน"},{ oper:'ew', text:"ลงท้ายด้วย"},{ oper:'en', text:"ไม่ลงท้ายด้วย"},{ oper:'cn', text:"มีคำว่า"},{ oper:'nc', text:"ไม่มีคำว่า"}], + groupOps: [ { op: "และ", text: "ทั้งหมด" }, { op: "หรือ", text: "ใดๆ" } ] }, edit : { addCaption: "เพิ่มข้อมูล", @@ -105,6 +103,7 @@ S: function (j) {return ''}, srcformat: 'Y-m-d', newformat: 'd/m/Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, masks : { ISO8601Long:"Y-m-d H:i:s", ISO8601Short:"Y-m-d", Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-th.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-tr.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-tr.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-tr.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,6 +1,6 @@ +// %%Ignore-License ;(function($){ /** - * %%Ignore-License * jqGrid Turkish Translation * Erhan Gündoğan (erhan(a)trposta.net) * http://blog.zakkum.com @@ -20,10 +20,8 @@ caption: "Arama...", Find: "Bul", Reset: "Temizle", - odata : ['eşit', 'eşit değil', 'daha az', 'daha az veya eşit', 'daha fazla', 'daha fazla veya eşit', 'ile başlayan', 'ile başlamayan', 'içinde', 'içinde değil', 'ile biten', 'ile bitmeyen', 'içeren', 'içermeyen'], - groupOps: [ { op: "VE", text: "tüm" }, { op: "VEYA", text: "herhangi" } ], - matchText: " uyan", - rulesText: " kurallar" + odata: [{ oper:'eq', text:"eşit"},{ oper:'ne', text:"eşit değil"},{ oper:'lt', text:"daha az"},{ oper:'le', text:"daha az veya eşit"},{ oper:'gt', text:"daha fazla"},{ oper:'ge', text:"daha fazla veya eşit"},{ oper:'bw', text:"ile başlayan"},{ oper:'bn', text:"ile başlamayan"},{ oper:'in', text:"içinde"},{ oper:'ni', text:"içinde değil"},{ oper:'ew', text:"ile biten"},{ oper:'en', text:"ile bitmeyen"},{ oper:'cn', text:"içeren"},{ oper:'nc', text:"içermeyen"}], + groupOps: [ { op: "VE", text: "tüm" }, { op: "VEYA", text: "herhangi" } ] }, edit : { addCaption: "Kayıt Ekle", @@ -103,6 +101,7 @@ S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'}, srcformat: 'Y-m-d', newformat: 'd/m/Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, masks : { ISO8601Long:"Y-m-d H:i:s", ISO8601Short:"Y-m-d", Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-tr.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-tw.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-tw.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-tw.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,6 +1,6 @@ +// %%Ignore-License ;(function($){ /** - * %%Ignore-License * jqGrid Chinese (Taiwan) Translation for v4.2 * linquize * https://github.com/linquize/jqGrid @@ -21,10 +21,8 @@ caption: "搜尋...", Find: "搜尋", Reset: "重設", - odata : ['等於 ', '不等於 ', '小於 ', '小於等於 ','大於 ','大於等於 ', '開始於 ','不開始於 ','在其中 ','不在其中 ','結束於 ','不結束於 ','包含 ','不包含 '], - groupOps: [ { op: "AND", text: "所有" }, { op: "OR", text: "任一" } ], - matchText: " 匹配", - rulesText: " 規則" + odata: [{ oper:'eq', text:"等於 "},{ oper:'ne', text:"不等於 "},{ oper:'lt', text:"小於 "},{ oper:'le', text:"小於等於 "},{ oper:'gt', text:"大於 "},{ oper:'ge', text:"大於等於 "},{ oper:'bw', text:"開始於 "},{ oper:'bn', text:"不開始於 "},{ oper:'in', text:"在其中 "},{ oper:'ni', text:"不在其中 "},{ oper:'ew', text:"結束於 "},{ oper:'en', text:"不結束於 "},{ oper:'cn', text:"包含 "},{ oper:'nc', text:"不包含 "}], + groupOps: [ { op: "AND", text: "所有" }, { op: "OR", text: "任一" } ] }, edit : { addCaption: "新增記錄", @@ -106,6 +104,7 @@ S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'}, srcformat: 'Y-m-d', newformat: 'm-d-Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, masks : { ISO8601Long:"Y-m-d H:i:s", ISO8601Short:"Y-m-d", Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-tw.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ua.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ua.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ua.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,6 +1,6 @@ +// %%Ignore-License ;(function($){ /** - * %%Ignore-License * jqGrid Ukrainian Translation v1.0 02.07.2009 * Sergey Dyagovchenko * http://d.sumy.ua @@ -20,10 +20,8 @@ caption: "Пошук...", Find: "Знайти", Reset: "Скидання", - odata : ['рівно', 'не рівно', 'менше', 'менше або рівне','більше','більше або рівне', 'починається з','не починається з','знаходиться в','не знаходиться в','закінчується на','не закінчується на','містить','не містить'], - groupOps: [ { op: "AND", text: "все" }, { op: "OR", text: "будь-який" } ], - matchText: " збігається", - rulesText: " правила" + odata: [{ oper:'eq', text:"рівно"},{ oper:'ne', text:"не рівно"},{ oper:'lt', text:"менше"},{ oper:'le', text:"менше або рівне"},{ oper:'gt', text:"більше"},{ oper:'ge', text:"більше або рівне"},{ oper:'bw', text:"починається з"},{ oper:'bn', text:"не починається з"},{ oper:'in', text:"знаходиться в"},{ oper:'ni', text:"не знаходиться в"},{ oper:'ew', text:"закінчується на"},{ oper:'en', text:"не закінчується на"},{ oper:'cn', text:"містить"},{ oper:'nc', text:"не містить"}], + groupOps: [ { op: "AND", text: "все" }, { op: "OR", text: "будь-який" } ] }, edit : { addCaption: "Додати запис", @@ -104,6 +102,7 @@ S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'}, srcformat: 'Y-m-d', newformat: 'd.m.Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, masks : { ISO8601Long:"Y-m-d H:i:s", ISO8601Short:"Y-m-d", Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ua.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-vi.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-vi.js (rev 0) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/i18n/grid.locale-vi.js 2013-07-19 21:45:03 UTC (rev 166) @@ -0,0 +1,169 @@ +// %%Ignore-License +;(function($){ +/** + * jqGrid Vietnamese Translation + * Lê Đình Dũng dungtdc(a)gmail.com + * http://trirand.com/blog/ + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html +**/ +$.jgrid = $.jgrid || {}; +$.extend($.jgrid,{ + defaults : { + recordtext: "View {0} - {1} of {2}", + emptyrecords: "Không có dữ liệu", + loadtext: "Đang nạp dữ liệu...", + pgtext : "Trang {0} trong tổng số {1}" + }, + search : { + caption: "Tìm kiếm...", + Find: "Tìm", + Reset: "Khởi tạo lại", + odata: [{ oper:'eq', text:"bằng"},{ oper:'ne', text:"không bằng"},{ oper:'lt', text:"bé hơn"},{ oper:'le', text:"bé hơn hoặc bằng"},{ oper:'gt', text:"lớn hơn"},{ oper:'ge', text:"lớn hơn hoặc bằng"},{ oper:'bw', text:"bắt đầu với"},{ oper:'bn', text:"không bắt đầu với"},{ oper:'in', text:"trong"},{ oper:'ni', text:"không nằm trong"},{ oper:'ew', text:"kết thúc với"},{ oper:'en', text:"không kết thúc với"},{ oper:'cn', text:"chứa"},{ oper:'nc', text:"không chứa"}], + groupOps: [ { op: "VÀ", text: "tất cả" }, { op: "HOẶC", text: "bất kỳ" } ] + }, + edit : { + addCaption: "Thêm bản ghi", + editCaption: "Sửa bản ghi", + bSubmit: "Gửi", + bCancel: "Hủy bỏ", + bClose: "Đóng", + saveData: "Dữ liệu đã thay đổi! Có lưu thay đổi không?", + bYes : "Có", + bNo : "Không", + bExit : "Hủy bỏ", + msg: { + required:"Trường dữ liệu bắt buộc có", + number:"Hãy điền đúng số", + minValue:"giá trị phải lớn hơn hoặc bằng với ", + maxValue:"giá trị phải bé hơn hoặc bằng", + email: "không phải là một email đúng", + integer: "Hãy điền đúng số nguyên", + date: "Hãy điền đúng ngày tháng", + url: "không phải là URL. Khởi đầu bắt buộc là ('http://' hoặc 'https://')", + nodefined : " chưa được định nghĩa!", + novalue : " giá trị trả về bắt buộc phải có!", + customarray : "Hàm nên trả về một mảng!", + customfcheck : "Custom function should be present in case of custom checking!" + + } + }, + view : { + caption: "Xem bản ghi", + bClose: "Đóng" + }, + del : { + caption: "Xóa", + msg: "Xóa bản ghi đã chọn?", + bSubmit: "Xóa", + bCancel: "Hủy bỏ" + }, + nav : { + edittext: "", + edittitle: "Sửa dòng đã chọn", + addtext:"", + addtitle: "Thêm mới 1 dòng", + deltext: "", + deltitle: "Xóa dòng đã chọn", + searchtext: "", + searchtitle: "Tìm bản ghi", + refreshtext: "", + refreshtitle: "Nạp lại lưới", + alertcap: "Cảnh báo", + alerttext: "Hãy chọn một dòng", + viewtext: "", + viewtitle: "Xem dòng đã chọn" + }, + col : { + caption: "Chọn cột", + bSubmit: "OK", + bCancel: "Hủy bỏ" + }, + errors : { + errcap : "Lỗi", + nourl : "không url được đặt", + norecords: "Không có bản ghi để xử lý", + model : "Chiều dài của colNames <> colModel!" + }, + formatter : { + integer : {thousandsSeparator: ".", defaultValue: '0'}, + number : {decimalSeparator:",", thousandsSeparator: ".", decimalPlaces: 2, defaultValue: '0'}, + currency : {decimalSeparator:",", thousandsSeparator: ".", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0'}, + date : { + dayNames: [ + "CN", "T2", "T3", "T4", "T5", "T6", "T7", + "Chủ nhật", "Thứ hai", "Thứ ba", "Thứ tư", "Thứ năm", "Thứ sáu", "Thứ bảy" + ], + monthNames: [ + "Th1", "Th2", "Th3", "Th4", "Th5", "Th6", "Th7", "Th8", "Th9", "Th10", "Th11", "Th12", + "Tháng một", "Tháng hai", "Tháng ba", "Tháng tư", "Tháng năm", "Tháng sáu", "Tháng bảy", "Tháng tám", "Tháng chín", "Tháng mười", "Tháng mười một", "Tháng mười hai" + ], + AmPm : ["sáng","chiều","SÁNG","CHIỀU"], + S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th';}, + srcformat: 'Y-m-d', + newformat: 'n/j/Y', + parseRe : /[Tt\\\/:_;.,\t\s-]/, + masks : { + // see http://php.net/manual/en/function.date.php for PHP format used in jqGrid + // and see http://docs.jquery.com/UI/Datepicker/formatDate + // and https://github.com/jquery/globalize#dates for alternative formats used frequently + // one can find on https://github.com/jquery/globalize/tree/master/lib/cultures many + // information about date, time, numbers and currency formats used in different countries + // one should just convert the information in PHP format + ISO8601Long:"Y-m-d H:i:s", + ISO8601Short:"Y-m-d", + // short date: + // n - Numeric representation of a month, without leading zeros + // j - Day of the month without leading zeros + // Y - A full numeric representation of a year, 4 digits + // example: 3/1/2012 which means 1 March 2012 + ShortDate: "n/j/Y", // in jQuery UI Datepicker: "M/d/yyyy" + // long date: + // l - A full textual representation of the day of the week + // F - A full textual representation of a month + // d - Day of the month, 2 digits with leading zeros + // Y - A full numeric representation of a year, 4 digits + LongDate: "l, F d, Y", // in jQuery UI Datepicker: "dddd, MMMM dd, yyyy" + // long date with long time: + // l - A full textual representation of the day of the week + // F - A full textual representation of a month + // d - Day of the month, 2 digits with leading zeros + // Y - A full numeric representation of a year, 4 digits + // g - 12-hour format of an hour without leading zeros + // i - Minutes with leading zeros + // s - Seconds, with leading zeros + // A - Uppercase Ante meridiem and Post meridiem (AM or PM) + FullDateTime: "l, F d, Y g:i:s A", // in jQuery UI Datepicker: "dddd, MMMM dd, yyyy h:mm:ss tt" + // month day: + // F - A full textual representation of a month + // d - Day of the month, 2 digits with leading zeros + MonthDay: "F d", // in jQuery UI Datepicker: "MMMM dd" + // short time (without seconds) + // g - 12-hour format of an hour without leading zeros + // i - Minutes with leading zeros + // A - Uppercase Ante meridiem and Post meridiem (AM or PM) + ShortTime: "g:i A", // in jQuery UI Datepicker: "h:mm tt" + // long time (with seconds) + // g - 12-hour format of an hour without leading zeros + // i - Minutes with leading zeros + // s - Seconds, with leading zeros + // A - Uppercase Ante meridiem and Post meridiem (AM or PM) + LongTime: "g:i:s A", // in jQuery UI Datepicker: "h:mm:ss tt" + SortableDateTime: "Y-m-d\\TH:i:s", + UniversalSortableDateTime: "Y-m-d H:i:sO", + // month with year + // Y - A full numeric representation of a year, 4 digits + // F - A full textual representation of a month + YearMonth: "F, Y" // in jQuery UI Datepicker: "MMMM, yyyy" + }, + reformatAfterEdit : false + }, + baseLinkUrl: '', + showAction: '', + target: '', + checkbox : {disabled:true}, + idName : 'id' + } +}); +})(jQuery); Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/jquery.jqGrid.src.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/jquery.jqGrid.src.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/jquery.jqGrid.src.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,3 +1,4 @@ +// %%Ignore-License // ==ClosureCompiler== // @compilation_level SIMPLE_OPTIMIZATIONS @@ -2,12 +3,12 @@ /** - * %%Ignore-License - * @license jqGrid 4.4.1 - jQuery Grid + * @license jqGrid 4.5.2 - jQuery Grid * Copyright (c) 2008, Tony Tomov, tony(a)trirand.com * Dual licensed under the MIT and GPL licenses * http://www.opensource.org/licenses/mit-license.php * http://www.gnu.org/licenses/gpl-2.0.html - * Date: 2012-08-28 + * Date: 2013-05-21 */ //jsHint options -/*global document, window, jQuery, DOMParser, ActiveXObject, $, alert */ +/*jshint evil:true, eqeqeq:false, eqnull:true, devel:true */ +/*global jQuery */ @@ -17,9 +18,9 @@ "use strict"; $.jgrid = $.jgrid || {}; $.extend($.jgrid,{ - version : "4.4.1", + version : "4.5.2", htmlDecode : function(value){ - if(value && (value==' ' || value==' ' || (value.length===1 && value.charCodeAt(0)===160))) { return "";} + if(value && (value===' ' || value===' ' || (value.length===1 && value.charCodeAt(0)===160))) { return "";} return !value ? value : String(value).replace(/>/g, ">").replace(/</g, "<").replace(/"/g, '"').replace(/&/g, "&"); }, htmlEncode : function (value){ @@ -27,127 +28,221 @@ }, format : function(format){ //jqgformat var args = $.makeArray(arguments).slice(1); - if(format===undefined) { format = ""; } + if(format==null) { format = ""; } return format.replace(/\{(\d+)\}/g, function(m, i){ return args[i]; }); }, + msie : navigator.appName === 'Microsoft Internet Explorer', + msiever : function () { + var rv = -1; + var ua = navigator.userAgent; + var re = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})"); + if (re.exec(ua) != null) { + rv = parseFloat( RegExp.$1 ); + } + return rv; + }, getCellIndex : function (cell) { var c = $(cell); if (c.is('tr')) { return -1; } c = (!c.is('td') && !c.is('th') ? c.closest("td,th") : c)[0]; - if ($.browser.msie) { return $.inArray(c, c.parentNode.cells); } + if ($.jgrid.msie) { return $.inArray(c, c.parentNode.cells); } return c.cellIndex; }, stripHtml : function(v) { - v = v+""; + v = String(v); var regexp = /<("[^"]*"|'[^']*'|[^'">])*>/gi; if (v) { v = v.replace(regexp,""); return (v && v !== ' ' && v !== ' ') ? v.replace(/\"/g,"'") : ""; - } else { + } return v; - } }, stripPref : function (pref, id) { var obj = $.type( pref ); - if( obj == "string" || obj =="number") { + if( obj === "string" || obj === "number") { pref = String(pref); id = pref !== "" ? String(id).replace(String(pref), "") : id; } return id; }, - stringToDoc : function (xmlString) { - var xmlDoc; - if(typeof xmlString !== 'string') { return xmlString; } - try { - var parser = new DOMParser(); - xmlDoc = parser.parseFromString(xmlString,"text/xml"); - } - catch(e) { - xmlDoc = new ActiveXObject("Microsoft.XMLDOM"); - xmlDoc.async=false; - xmlDoc.loadXML(xmlString); - } - return (xmlDoc && xmlDoc.documentElement && xmlDoc.documentElement.tagName != 'parsererror') ? xmlDoc : null; - }, parse : function(jsonString) { var js = jsonString; - if (js.substr(0,9) == "while(1);") { js = js.substr(9); } - if (js.substr(0,2) == "/*") { js = js.substr(2,js.length-4); } + if (js.substr(0,9) === "while(1);") { js = js.substr(9); } + if (js.substr(0,2) === "/*") { js = js.substr(2,js.length-4); } if(!js) { js = "{}"; } - return ($.jgrid.useJSON===true && typeof (JSON) === 'object' && typeof (JSON.parse) === 'function') ? + return ($.jgrid.useJSON===true && typeof JSON === 'object' && typeof JSON.parse === 'function') ? JSON.parse(js) : eval('(' + js + ')'); }, - parseDate : function(format, date) { - var tsp = {m : 1, d : 1, y : 1970, h : 0, i : 0, s : 0, u:0},k,hl,dM, regdate = /[\\\/:_;.,\t\T\s-]/; - if(date && date !== null && date !== undefined){ - date = $.trim(date); - date = date.split(regdate); - if ($.jgrid.formatter.date.masks[format] !== undefined) { - format = $.jgrid.formatter.date.masks[format]; - } - format = format.split(regdate); - var dfmt = $.jgrid.formatter.date.monthNames; - var afmt = $.jgrid.formatter.date.AmPm; - var h12to24 = function(ampm, h){ - if (ampm === 0){ if (h === 12) { h = 0;} } - else { if (h !== 12) { h += 12; } } - return h; - }; - for(k=0,hl=format.length;k<hl;k++){ - if(format[k] == 'M') { - dM = $.inArray(date[k],dfmt); - if(dM !== -1 && dM < 12){ - date[k] = dM+1; - tsp.m = date[k]; - } + parseDate : function(format, date, newformat, opts) { + var token = /\\.|[dDjlNSwzWFmMntLoYyaABgGhHisueIOPTZcrU]/g, + timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g, + timezoneClip = /[^-+\dA-Z]/g, + msDateRegExp = new RegExp("^\/Date\$(([-+])?[0-9]+)(([-+])([0-9]{2})([0-9]{2}))?\$\/$"), + msMatch = ((typeof date === 'string') ? date.match(msDateRegExp): null), + pad = function (value, length) { + value = String(value); + length = parseInt(length,10) || 2; + while (value.length < length) { value = '0' + value; } + return value; + }, + ts = {m : 1, d : 1, y : 1970, h : 0, i : 0, s : 0, u:0}, + timestamp=0, dM, k,hl, + h12to24 = function(ampm, h){ + if (ampm === 0){ if (h === 12) { h = 0;} } + else { if (h !== 12) { h += 12; } } + return h; + }; + if(opts === undefined) { + opts = $.jgrid.formatter.date; + } + // old lang files + if(opts.parseRe === undefined ) { + opts.parseRe = /[Tt\\\/:_;.,\t\s-]/; + } + if( opts.masks.hasOwnProperty(format) ) { format = opts.masks[format]; } + if(date && date != null) { + if( !isNaN( date - 0 ) && String(format).toLowerCase() === "u") { + //Unix timestamp + timestamp = new Date( parseFloat(date)*1000 ); + } else if(date.constructor === Date) { + timestamp = date; + // Microsoft date format support + } else if( msMatch !== null ) { + timestamp = new Date(parseInt(msMatch[1], 10)); + if (msMatch[3]) { + var offset = Number(msMatch[5]) * 60 + Number(msMatch[6]); + offset *= ((msMatch[4] === '-') ? 1 : -1); + offset -= timestamp.getTimezoneOffset(); + timestamp.setTime(Number(Number(timestamp) + (offset * 60 * 1000))); } - if(format[k] == 'F') { - dM = $.inArray(date[k],dfmt); - if(dM !== -1 && dM > 11){ - date[k] = dM+1-12; - tsp.m = date[k]; + } else { + date = String(date).replace(/\\T/g,"T").replace(/\\t/,"t").split(opts.parseRe); + format = format.replace(/\\T/g,"T").replace(/\\t/,"t").split(opts.parseRe); + // parsing for month names + for(k=0,hl=format.length;k<hl;k++){ + if(format[k] === 'M') { + dM = $.inArray(date[k],opts.monthNames); + if(dM !== -1 && dM < 12){date[k] = dM+1; ts.m = date[k];} } - } - if(format[k] == 'a') { - dM = $.inArray(date[k],afmt); - if(dM !== -1 && dM < 2 && date[k] == afmt[dM]){ - date[k] = dM; - tsp.h = h12to24(date[k], tsp.h); + if(format[k] === 'F') { + dM = $.inArray(date[k],opts.monthNames,12); + if(dM !== -1 && dM > 11){date[k] = dM+1-12; ts.m = date[k];} } - } - if(format[k] == 'A') { - dM = $.inArray(date[k],afmt); - if(dM !== -1 && dM > 1 && date[k] == afmt[dM]){ - date[k] = dM-2; - tsp.h = h12to24(date[k], tsp.h); + if(format[k] === 'a') { + dM = $.inArray(date[k],opts.AmPm); + if(dM !== -1 && dM < 2 && date[k] === opts.AmPm[dM]){ + date[k] = dM; + ts.h = h12to24(date[k], ts.h); + } } + if(format[k] === 'A') { + dM = $.inArray(date[k],opts.AmPm); + if(dM !== -1 && dM > 1 && date[k] === opts.AmPm[dM]){ + date[k] = dM-2; + ts.h = h12to24(date[k], ts.h); + } + } + if (format[k] === 'g') { + ts.h = parseInt(date[k], 10); + } + if(date[k] !== undefined) { + ts[format[k].toLowerCase()] = parseInt(date[k],10); + } } - if (format[k] === 'g') { - tsp.h = parseInt(date[k], 10); + if(ts.f) {ts.m = ts.f;} + if( ts.m === 0 && ts.y === 0 && ts.d === 0) { + return " " ; } - if(date[k] !== undefined) { - tsp[format[k].toLowerCase()] = parseInt(date[k],10); - } + ts.m = parseInt(ts.m,10)-1; + var ty = ts.y; + if (ty >= 70 && ty <= 99) {ts.y = 1900+ts.y;} + else if (ty >=0 && ty <=69) {ts.y= 2000+ts.y;} + timestamp = new Date(ts.y, ts.m, ts.d, ts.h, ts.i, ts.s, ts.u); } - tsp.m = parseInt(tsp.m,10)-1; - var ty = tsp.y; - if (ty >= 70 && ty <= 99) {tsp.y = 1900+tsp.y;} - else if (ty >=0 && ty <=69) {tsp.y= 2000+tsp.y;} - if(tsp.j !== undefined) { tsp.d = tsp.j; } - if(tsp.n !== undefined) { tsp.m = parseInt(tsp.n,10)-1; } + } else { + timestamp = new Date(ts.y, ts.m, ts.d, ts.h, ts.i, ts.s, ts.u); } - return new Date(tsp.y, tsp.m, tsp.d, tsp.h, tsp.i, tsp.s, tsp.u); + if( newformat === undefined ) { + return timestamp; + } + if( opts.masks.hasOwnProperty(newformat) ) { + newformat = opts.masks[newformat]; + } else if ( !newformat ) { + newformat = 'Y-m-d'; + } + var + G = timestamp.getHours(), + i = timestamp.getMinutes(), + j = timestamp.getDate(), + n = timestamp.getMonth() + 1, + o = timestamp.getTimezoneOffset(), + s = timestamp.getSeconds(), + u = timestamp.getMilliseconds(), + w = timestamp.getDay(), + Y = timestamp.getFullYear(), + N = (w + 6) % 7 + 1, + z = (new Date(Y, n - 1, j) - new Date(Y, 0, 1)) / 86400000, + flags = { + // Day + d: pad(j), + D: opts.dayNames[w], + j: j, + l: opts.dayNames[w + 7], + N: N, + S: opts.S(j), + //j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th', + w: w, + z: z, + // Week + W: N < 5 ? Math.floor((z + N - 1) / 7) + 1 : Math.floor((z + N - 1) / 7) || ((new Date(Y - 1, 0, 1).getDay() + 6) % 7 < 4 ? 53 : 52), + // Month + F: opts.monthNames[n - 1 + 12], + m: pad(n), + M: opts.monthNames[n - 1], + n: n, + t: '?', + // Year + L: '?', + o: '?', + Y: Y, + y: String(Y).substring(2), + // Time + a: G < 12 ? opts.AmPm[0] : opts.AmPm[1], + A: G < 12 ? opts.AmPm[2] : opts.AmPm[3], + B: '?', + g: G % 12 || 12, + G: G, + h: pad(G % 12 || 12), + H: pad(G), + i: pad(i), + s: pad(s), + u: u, + // Timezone + e: '?', + I: '?', + O: (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4), + P: '?', + T: (String(timestamp).match(timezone) || [""]).pop().replace(timezoneClip, ""), + Z: '?', + // Full Date/Time + c: '?', + r: '?', + U: Math.floor(timestamp / 1000) + }; + return newformat.replace(token, function ($0) { + return flags.hasOwnProperty($0) ? flags[$0] : $0.substring(1); + }); }, jqID : function(sid){ - return String(sid).replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g,"\\$&"); + return String(sid).replace(/[!"#$%&'()*+,.\/:; <=>?@\[\\\]\^`{|}~]/g,"\\$&"); }, guid : 1, uidPref: 'jqg', randId : function( prefix ) { - return (prefix? prefix: $.jgrid.uidPref) + ($.jgrid.guid++); + return (prefix || $.jgrid.uidPref) + ($.jgrid.guid++); }, getAccessor : function(obj, expr) { var ret,p,prm = [], i; @@ -171,19 +266,18 @@ return ret; }, getXmlData: function (obj, expr, returnObj) { - var ret, m = typeof (expr) === 'string' ? expr.match(/^(.*)\[(\w+)\]$/) : null; - if (typeof (expr) === 'function') { return expr(obj); } + var ret, m = typeof expr === 'string' ? expr.match(/^(.*)\[(\w+)\]$/) : null; + if (typeof expr === 'function') { return expr(obj); } if (m && m[2]) { // m[2] is the attribute selector // m[1] is an optional element selector // examples: "[id]", "rows[page]" return m[1] ? $(m[1], obj).attr(m[2]) : $(obj).attr(m[2]); - } else { + } ret = $(expr, obj); if (returnObj) { return ret; } //$(expr, obj).filter(':last'); // we use ':last' to be more compatible with old version of jqGrid return ret.length > 0 ? $(ret).text() : undefined; - } }, cellWidth : function () { var $testDiv = $("<div class='ui-jqgrid' style='left:10000px'><table class='ui-jqgrid-btable' style='width:5px;'><tr class='jqgrow'><td style='width:5px;'></td></tr></table></div>"), @@ -193,12 +287,13 @@ $testDiv.remove(); return testCell !== 5; }, + cell_width : true, ajaxOptions: {}, from : function(source){ // Original Author Hugo Bonacci // License MIT http://jlinq.codeplex.com/license var QueryObject=function(d,q){ - if(typeof(d)=="string"){ + if(typeof d==="string"){ d=$.data(d); } var self=this, @@ -214,9 +309,9 @@ _queuedOperator="", _sorting=[], _useProperties=true; - if(typeof(d)=="object"&&d.push) { + if(typeof d==="object"&&d.push) { if(d.length>0){ - if(typeof(d[0])!="object"){ + if(typeof d[0]!=="object"){ _useProperties=false; }else{ _useProperties=true; @@ -243,11 +338,10 @@ return phrase.join(""); }; this._strComp=function(val){ - if(typeof(val)=="string"){ + if(typeof val==="string"){ return".toString()"; - }else{ - return""; } + return""; }; this._group=function(f,u){ return({field:f.toString(),unique:u,items:[]}); @@ -328,9 +422,9 @@ if (a > b) { return d; } return 0; } - if(!_usecase && typeof(a) !== "number" && typeof(b) !== "number" ) { - a=String(a).toLowerCase(); - b=String(b).toLowerCase(); + if(!_usecase && typeof a !== "number" && typeof b !== "number" ) { + a=String(a); + b=String(b); } if(a<b){return -d;} if(a>b){return d;} @@ -345,35 +439,34 @@ dir=_sorting[q].dir, type = _sorting[q].type, dfmt = _sorting[q].datefmt; - if(q==_sorting.length-1){ + if(q===_sorting.length-1){ return self._getOrder(d, by, dir, type, dfmt); } q++; - var values=self._getGroup(d,by,dir,type,dfmt); - var results=[]; - for(var i=0;i<values.length;i++){ - var sorted=self._doSort(values[i].items,q); - for(var j=0;j<sorted.length;j++){ + var values=self._getGroup(d,by,dir,type,dfmt), results=[], i, j, sorted; + for(i=0;i<values.length;i++){ + sorted=self._doSort(values[i].items,q); + for(j=0;j<sorted.length;j++){ results.push(sorted[j]); } } return results; }; this._getOrder=function(data,by,dir,type, dfmt){ - var sortData=[],_sortData=[], newDir = dir=="a" ? 1 : -1, i,ab,j, + var sortData=[],_sortData=[], newDir = dir==="a" ? 1 : -1, i,ab,j, findSortKey; if(type === undefined ) { type = "text"; } - if (type == 'float' || type== 'number' || type== 'currency' || type== 'numeric') { + if (type === 'float' || type=== 'number' || type=== 'currency' || type=== 'numeric') { findSortKey = function($cell) { var key = parseFloat( String($cell).replace(_stripNum, '')); return isNaN(key) ? 0.00 : key; }; - } else if (type=='int' || type=='integer') { + } else if (type==='int' || type==='integer') { findSortKey = function($cell) { return $cell ? parseFloat(String($cell).replace(_stripNum, '')) : 0; }; - } else if(type == 'date' || type == 'datetime') { + } else if(type === 'date' || type === 'datetime') { findSortKey = function($cell) { return $.jgrid.parseDate(dfmt,$cell).getTime(); }; @@ -381,8 +474,8 @@ findSortKey = type; } else { findSortKey = function($cell) { - if(!$cell) {$cell ="";} - return $.trim(String($cell).toUpperCase()); + $cell = $cell ? $.trim(String($cell)) : ""; + return _usecase ? $cell : $cell.toLowerCase(); }; } $.each(data,function(i,v){ @@ -413,7 +506,7 @@ last=null, val; $.each(self._getOrder(data,by,dir,type, dfmt),function(i,v){ val = $.jgrid.getAccessor(v, by); - if(val === undefined) { val = ""; } + if(val == null) { val = ""; } if(!self._equals(last,val)){ last=val; if(group !== null){ @@ -582,7 +675,7 @@ return self._compareValues(self.lessOrEquals,f,v,"<=",t); }; this.startsWith=function(f,v){ - var val = (v===undefined || v===null) ? f: v, + var val = (v==null) ? f: v, length=_trim ? $.trim(val.toString()).length : val.toString().length; if(_useProperties){ self._append(self._getStr('jQuery.jgrid.getAccessor(this,\''+f+'\')')+'.substr(0,'+length+') == '+self._getStr('"'+self._toStr(v)+'"')); @@ -595,7 +688,7 @@ return self; }; this.endsWith=function(f,v){ - var val = (v===undefined || v===null) ? f: v, + var val = (v==null) ? f: v, length=_trim ? $.trim(val.toString()).length:val.toString().length; if(_useProperties){ self._append(self._getStr('jQuery.jgrid.getAccessor(this,\''+f+'\')')+'.substr('+self._getStr('jQuery.jgrid.getAccessor(this,\''+f+'\')')+'.length-'+length+','+length+') == "'+self._toStr(v)+'"'); @@ -622,11 +715,11 @@ return self._getGroup(_data,by,dir,type, datefmt); }; this.orderBy=function(by,dir,stype, dfmt){ - dir = dir === undefined || dir === null ? "a" :$.trim(dir.toString().toLowerCase()); - if(stype === null || stype === undefined) { stype = "text"; } - if(dfmt === null || dfmt === undefined) { dfmt = "Y-m-d"; } - if(dir=="desc"||dir=="descending"){dir="d";} - if(dir=="asc"||dir=="ascending"){dir="a";} + dir = dir == null ? "a" :$.trim(dir.toString().toLowerCase()); + if(stype == null) { stype = "text"; } + if(dfmt == null) { dfmt = "Y-m-d"; } + if(dir==="desc"||dir==="descending"){dir="d";} + if(dir==="asc"||dir==="ascending"){dir="a";} _sorting.push({by:by,dir:dir,type:stype, datefmt: dfmt}); return self; }; @@ -634,6 +727,9 @@ }; return new QueryObject(source,null); }, + getMethod: function (name) { + return this.getAccessor($.fn.jqGrid, name); + }, extend : function(methods) { $.extend($.fn.jqGrid,methods); if (!this.no_legacy_api) { @@ -643,9 +739,8 @@ }); $.fn.jqGrid = function( pin ) { - if (typeof pin == 'string') { - //var fn = $.fn.jqGrid[pin]; - var fn = $.jgrid.getAccessor($.fn.jqGrid,pin); + if (typeof pin === 'string') { + var fn = $.jgrid.getMethod(pin); if (!fn) { throw ("jqGrid - No such method: " + pin); } @@ -691,6 +786,7 @@ onRightClickRow: null, onPaging: null, onSelectAll: null, + onInitGrid : null, loadComplete: null, gridComplete: null, loadError: null, @@ -754,10 +850,11 @@ data : [], _index : {}, grouping : false, - groupingView : {groupField:[],groupOrder:[], groupText:[],groupColumnShow:[],groupSummary:[], showSummaryOnHide: false, sortitems:[], sortnames:[], summary:[],summaryval:[], plusicon: 'ui-icon-circlesmall-plus', minusicon: 'ui-icon-circlesmall-minus'}, + groupingView : {groupField:[],groupOrder:[], groupText:[],groupColumnShow:[],groupSummary:[], showSummaryOnHide: false, sortitems:[], sortnames:[], summary:[],summaryval:[], plusicon: 'ui-icon-circlesmall-plus', minusicon: 'ui-icon-circlesmall-minus', displayField: []}, ignoreCase : false, cmTemplate : {}, - idPrefix : "" + idPrefix : "", + multiSort : false }, $.jgrid.defaults, pin || {}); var ts= this, grid={ headers:[], @@ -769,7 +866,7 @@ this.curGbox = $("#rs_m"+$.jgrid.jqID(p.id),"#gbox_"+$.jgrid.jqID(p.id)); this.curGbox.css({display:"block",left:y[0],top:y[1],height:y[2]}); $(ts).triggerHandler("jqGridResizeStart", [x, i]); - if($.isFunction(p.resizeStart)) { p.resizeStart.call(this,x,i); } + if($.isFunction(p.resizeStart)) { p.resizeStart.call(ts,x,i); } document.onselectstart=function(){return false;}; }, dragMove: function(x) { @@ -824,7 +921,7 @@ } } $(ts).triggerHandler("jqGridResizeStop", [nw, idx]); - if($.isFunction(p.resizeStop)) { p.resizeStop.call(this,nw,idx); } + if($.isFunction(p.resizeStop)) { p.resizeStop.call(ts,nw,idx); } } this.curGbox = null; document.onselectstart=function(){return true;}; @@ -869,7 +966,7 @@ empty = true; } if (npage) { - if (p.lastpage && page > p.lastpage || p.lastpage==1 || (page === p.page && page===p.lastpage) ) { + if (p.lastpage && (page > p.lastpage || p.lastpage===1 || (page === p.page && page===p.lastpage)) ) { return; } if (grid.hDiv.loading) { @@ -888,7 +985,7 @@ if(p.scroll) { var scrollTop = grid.bDiv.scrollTop; if(grid.scrollTop === undefined) { grid.scrollTop = 0; } - if (scrollTop != grid.scrollTop) { + if (scrollTop !== grid.scrollTop) { grid.scrollTop = scrollTop; if (grid.timer) { clearTimeout(grid.timer); } grid.timer = setTimeout(grid.populateVisible, p.scrollTimeout); @@ -910,7 +1007,7 @@ p.selarrrow = []; if(p.multiselect && sra && sra.length>0) { for(i=0;i<sra.length;i++){ - if (sra[i] != sr) { + if (sra[i] !== sr) { $(ts).jqGrid("setSelection",sra[i],false, null); } } @@ -924,7 +1021,7 @@ $(ts).bind('jqGridGridComplete.selectionPreserver', restoreSelection); } }; - if(this.tagName.toUpperCase()!='TABLE') { + if(this.tagName.toUpperCase() !== 'TABLE') { alert("Element is not a table"); return; } @@ -934,7 +1031,7 @@ return; } } - $(this).empty().attr("tabindex","1"); + $(this).empty().attr("tabindex","0"); this.p = p ; this.p.useProp = !!$.fn.prop; var i, dir; @@ -947,28 +1044,25 @@ alert($.jgrid.errors.model); return; } - var gv = $("<div class='ui-jqgrid-view'></div>"), ii, - isMSIE = $.browser.msie ? true:false; + var gv = $("<div class='ui-jqgrid-view'></div>"), + isMSIE = $.jgrid.msie; ts.p.direction = $.trim(ts.p.direction.toLowerCase()); - if($.inArray(ts.p.direction,["ltr","rtl"]) == -1) { ts.p.direction = "ltr"; } + if($.inArray(ts.p.direction,["ltr","rtl"]) === -1) { ts.p.direction = "ltr"; } dir = ts.p.direction; $(gv).insertBefore(this); - $(this).appendTo(gv).removeClass("scroll"); + $(this).removeClass("scroll").appendTo(gv); var eg = $("<div class='ui-jqgrid ui-widget ui-widget-content ui-corner-all'></div>"); - $(eg).insertBefore(gv).attr({"id" : "gbox_"+this.id,"dir":dir}); - $(gv).appendTo(eg).attr("id","gview_"+this.id); - if (isMSIE && $.browser.version <= 6) { - ii = '<iframe style="display:block;position:absolute;z-index:-1;filter:Alpha(Opacity=\'0\');" src="javascript:false;"></iframe>'; - } else { ii="";} - $("<div class='ui-widget-overlay jqgrid-overlay' id='lui_"+this.id+"'></div>").append(ii).insertBefore(gv); + $(eg).attr({"id" : "gbox_"+this.id,"dir":dir}).insertBefore(gv); + $(gv).attr("id","gview_"+this.id).appendTo(eg); + $("<div class='ui-widget-overlay jqgrid-overlay' id='lui_"+this.id+"'></div>").insertBefore(gv); $("<div class='loading ui-state-default ui-state-active' id='load_"+this.id+"'>"+this.p.loadtext+"</div>").insertBefore(gv); $(this).attr({cellspacing:"0",cellpadding:"0",border:"0","role":"grid","aria-multiselectable":!!this.p.multiselect,"aria-labelledby":"gbox_"+this.id}); var sortkeys = ["shiftKey","altKey","ctrlKey"], intNum = function(val,defval) { val = parseInt(val,10); - if (isNaN(val)) { return defval ? defval : 0;} - else {return val;} + if (isNaN(val)) { return defval || 0;} + return val; }, formatCol = function (pos, rowInd, tv, rawObject, rowId, rdata){ var cm = ts.p.colModel[pos], @@ -980,11 +1074,11 @@ } else if (cm.cellattr && $.isFunction(cm.cellattr)) { celp = cm.cellattr.call(ts, rowId, tv, rawObject, cm, rdata); - if(celp && typeof(celp) === "string") { + if(celp && typeof celp === "string") { celp = celp.replace(/style/i,'style').replace(/title/i,'title'); if(celp.indexOf('title') > -1) { cm.title=false;} if(celp.indexOf('class') > -1) { clas = undefined;} - acp = celp.split("style"); + acp = celp.split(/[^-]style/); if(acp.length === 2 ) { acp[1] = $.trim(acp[1].replace("=","")); if(acp[1].indexOf("'") === 0 || acp[1].indexOf('"') === 0) { @@ -1002,11 +1096,12 @@ return result + acp[0]; }, cellVal = function (val) { - return val === undefined || val === null || val === "" ? " " : (ts.p.autoencode ? $.jgrid.htmlEncode(val) : val+""); + return val == null || val === "" ? " " : (ts.p.autoencode ? $.jgrid.htmlEncode(val) : String(val)); }, formatter = function (rowId, cellval , colpos, rwdat, _act){ var cm = ts.p.colModel[colpos],v; - if(typeof cm.formatter !== 'undefined') { + if(cm.formatter !== undefined) { + rowId = String(ts.p.idPrefix) !== "" ? $.jgrid.stripPref(ts.p.idPrefix, rowId) : rowId; var opts= {rowId: rowId, colModel:cm, gid:ts.p.id, pos:colpos }; if($.isFunction( cm.formatter ) ) { v = cm.formatter.call(ts,cellval,opts,rwdat,_act); @@ -1020,14 +1115,14 @@ } return v; }, - addCell = function(rowId,cell,pos,irow, srvr) { + addCell = function(rowId,cell,pos,irow, srvr, rdata) { var v,prp; v = formatter(rowId,cell,pos,srvr,'add'); - prp = formatCol( pos,irow, v, srvr, rowId, true); + prp = formatCol( pos,irow, v, srvr, rowId, rdata); return "<td role=\"gridcell\" "+prp+">"+v+"</td>"; }, addMulti = function(rowid,pos,irow,checked){ - var v = "<input role=\"checkbox\" type=\"checkbox\""+" id=\"jqg_"+ts.p.id+"_"+rowid+"\" class=\"cbox\" name=\"jqg_"+ts.p.id+"_"+rowid+"\"" + ((checked) ? "checked=\"checked\"" : "")+"/>", + var v = "<input role=\"checkbox\" type=\"checkbox\""+" id=\"jqg_"+ts.p.id+"_"+rowid+"\" class=\"cbox\" name=\"jqg_"+ts.p.id+"_"+rowid+"\"" + (checked ? "checked=\"checked\"" : "")+"/>", prp = formatCol( pos,irow,'',null, rowid, true); return "<td role=\"gridcell\" "+prp+">"+v+"</td>"; }, @@ -1041,9 +1136,9 @@ for(i =0; i<ts.p.colModel.length; i++){ field = ts.p.colModel[i]; if (field.name !== 'cb' && field.name !=='subgrid' && field.name !=='rn') { - f[j]= datatype == "local" ? + f[j]= datatype === "local" ? field.name : - ( (datatype=="xml" || datatype === "xmlstring") ? field.xmlmap || field.name : field.jsonmap || field.name ); + ( (datatype==="xml" || datatype === "xmlstring") ? field.xmlmap || field.name : field.jsonmap || field.name ); j++; } } @@ -1091,13 +1186,17 @@ } for(i =0;i < datalen; i++) { val = $.jgrid.getAccessor(ts.p.data[i],idname); + if (val === undefined) { val=String(i+1); } ts.p._index[val] = i; } }, constructTr = function(id, hide, altClass, rd, cur, selected) { var tabindex = '-1', restAttr = '', attrName, style = hide ? 'display:none;' : '', - classes = 'ui-widget-content jqgrow ui-row-' + ts.p.direction + altClass + ((selected) ? ' ui-state-highlight' : ''), - rowAttrObj = $.isFunction(ts.p.rowattr) ? ts.p.rowattr.call(ts, rd, cur) : {}; + classes = 'ui-widget-content jqgrow ui-row-' + ts.p.direction + (altClass ? ' ' + altClass : '') + (selected ? ' ui-state-highlight' : ''), + rowAttrObj = $(ts).triggerHandler("jqGridRowAttr", [rd, cur, id]); + if( typeof rowAttrObj !== "object" ) { + rowAttrObj = $.isFunction(ts.p.rowattr) ? ts.p.rowattr.call(ts, rd, cur, id) :{}; + } if(!$.isEmptyObject( rowAttrObj )) { if (rowAttrObj.hasOwnProperty("id")) { id = rowAttrObj.id; @@ -1128,9 +1227,9 @@ }, addXmlData = function (xml,t, rcnt, more, adjust) { var startReq = new Date(), - locdata = (ts.p.datatype != "local" && ts.p.loadonce) || ts.p.datatype == "xmlstring", + locdata = (ts.p.datatype !== "local" && ts.p.loadonce) || ts.p.datatype === "xmlstring", xmlid = "_id_", xmlRd = ts.p.xmlReader, - frd = ts.p.datatype == "local" ? "local" : "xml"; + frd = ts.p.datatype === "local" ? "local" : "xml"; if(locdata) { ts.p.data = []; ts.p._index = {}; @@ -1143,7 +1242,11 @@ rcnt=1; } else { rcnt = rcnt > 1 ? rcnt :1; } } else { return; } - var i,fpos,ir=0,v,gi=ts.p.multiselect===true?1:0,si=ts.p.subGrid===true?1:0,ni=ts.p.rownumbers===true?1:0,idn, getId,f=[],F,rd ={}, xmlr,rid, rowData=[], cn=(ts.p.altRows === true) ? " "+ts.p.altclass:"",cn1; + var self= $(ts), i,fpos,ir=0,v,gi=ts.p.multiselect===true?1:0,si=0,addSubGridCell,ni=ts.p.rownumbers===true?1:0,idn, getId,f=[],F,rd ={}, xmlr,rid, rowData=[], cn=(ts.p.altRows === true) ? ts.p.altclass:"",cn1; + if(ts.p.subGrid===true) { + si = 1; + addSubGridCell = $.jgrid.getMethod("addSubGridCell"); + } if(!xmlRd.repeatitems) {f = reader(frd);} if( ts.p.keyIndex===false) { idn = $.isFunction( xmlRd.id ) ? xmlRd.id.call(ts, xml) : xmlRd.id; @@ -1156,7 +1259,7 @@ } idn=f[idn]; } - if( (idn+"").indexOf("[") === -1 ) { + if( String(idn).indexOf("[") === -1 ) { if (f.length) { getId = function( trow, k) {return $(idn,trow).text() || k;}; } else { @@ -1179,18 +1282,21 @@ var gxml = $.jgrid.getXmlData( xml, xmlRd.root, true); gxml = $.jgrid.getXmlData( gxml, xmlRd.row, true); if (!gxml) { gxml = []; } - var gl = gxml.length, j=0, grpdata=[], rn = parseInt(ts.p.rowNum,10); + var gl = gxml.length, j=0, grpdata=[], rn = parseInt(ts.p.rowNum,10), br=ts.p.scroll?$.jgrid.randId():1, altr; if (gl > 0 && ts.p.page <= 0) { ts.p.page = 1; } if(gxml && gl){ - var br=ts.p.scroll?$.jgrid.randId():1,altr; if (adjust) { rn *= adjust+1; } - var afterInsRow = $.isFunction(ts.p.afterInsertRow), hiderow=ts.p.grouping && ts.p.groupingView.groupCollapse === true; + var afterInsRow = $.isFunction(ts.p.afterInsertRow), hiderow=false, groupingPrepare; + if(ts.p.grouping) { + hiderow = ts.p.groupingView.groupCollapse === true; + groupingPrepare = $.jgrid.getMethod("groupingPrepare"); + } while (j<gl) { xmlr = gxml[j]; rid = getId(xmlr,br+j); rid = ts.p.idPrefix + rid; altr = rcnt === 0 ? 0 : rcnt+1; - cn1 = (altr+j)%2 == 1 ? cn : ''; + cn1 = (altr+j)%2 === 1 ? cn : ''; var iStartTrTag = rowData.length; rowData.push(""); if( ni ) { @@ -1200,7 +1306,7 @@ rowData.push( addMulti(rid,ni,j, false) ); } if( si ) { - rowData.push( $(ts).jqGrid("addSubGridCell",gi+ni,j+rcnt) ); + rowData.push( addSubGridCell.call(self,gi+ni,j+rcnt) ); } if(xmlRd.repeatitems){ if (!F) { F=orderedCols(gi+si+ni); } @@ -1210,42 +1316,42 @@ if (!cell) { return false; } v = cell.textContent || cell.text; rd[ts.p.colModel[k+gi+si+ni].name] = v; - rowData.push( addCell(rid,v,k+gi+si+ni,j+rcnt,xmlr) ); + rowData.push( addCell(rid,v,k+gi+si+ni,j+rcnt,xmlr, rd) ); }); } else { for(i = 0; i < f.length;i++) { v = $.jgrid.getXmlData( xmlr, f[i]); rd[ts.p.colModel[i+gi+si+ni].name] = v; - rowData.push( addCell(rid, v, i+gi+si+ni, j+rcnt, xmlr) ); + rowData.push( addCell(rid, v, i+gi+si+ni, j+rcnt, xmlr, rd) ); } } rowData[iStartTrTag] = constructTr(rid, hiderow, cn1, rd, xmlr, false); rowData.push("</tr>"); if(ts.p.grouping) { - grpdata = $(ts).jqGrid('groupingPrepare',rowData, grpdata, rd, j); + grpdata = groupingPrepare.call(self,rowData, grpdata, rd, j); rowData = []; } if(locdata || ts.p.treeGrid === true) { - rd[xmlid] = rid; + rd[xmlid] = $.jgrid.stripPref(ts.p.idPrefix, rid); ts.p.data.push(rd); - ts.p._index[rid] = ts.p.data.length-1; + ts.p._index[rd[xmlid]] = ts.p.data.length-1; } if(ts.p.gridview === false ) { $("tbody:first",t).append(rowData.join('')); - $(ts).triggerHandler("jqGridAfterInsertRow", [rid, rd, xmlr]); + self.triggerHandler("jqGridAfterInsertRow", [rid, rd, xmlr]); if(afterInsRow) {ts.p.afterInsertRow.call(ts,rid,rd,xmlr);} rowData=[]; } rd={}; ir++; j++; - if(ir==rn) {break;} + if(ir===rn) {break;} } } if(ts.p.gridview === true) { fpos = ts.p.treeANode > -1 ? ts.p.treeANode: 0; if(ts.p.grouping) { - $(ts).jqGrid('groupingRender',grpdata,ts.p.colModel.length); + self.jqGrid('groupingRender',grpdata,ts.p.colModel.length); grpdata = null; } else if(ts.p.treeGrid === true && fpos > 0) { $(ts.rows[fpos]).after(rowData.join('')); @@ -1254,18 +1360,18 @@ } } if(ts.p.subGrid === true ) { - try {$(ts).jqGrid("addSubGrid",gi+ni);} catch (_){} + try {self.jqGrid("addSubGrid",gi+ni);} catch (_){} } ts.p.totaltime = new Date() - startReq; if(ir>0) { if(ts.p.records===0) { ts.p.records=gl;} } rowData =null; if( ts.p.treeGrid === true) { - try {$(ts).jqGrid("setTreeNode", fpos+1, ir+fpos+1);} catch (e) {} + try {self.jqGrid("setTreeNode", fpos+1, ir+fpos+1);} catch (e) {} } if(!ts.p.treeGrid && !ts.p.scroll) {ts.grid.bDiv.scrollTop = 0;} ts.p.reccount=ir; ts.p.treeANode = -1; - if(ts.p.userDataOnFooter) { $(ts).jqGrid("footerData","set",ts.p.userData,true); } + if(ts.p.userDataOnFooter) { self.jqGrid("footerData","set",ts.p.userData,true); } if(locdata) { ts.p.records = gl; ts.p.lastpage = Math.ceil(gl/ rn); @@ -1291,9 +1397,9 @@ rd[ts.p.colModel[i+gi+si+ni].name] = v; } } - rd[xmlid] = rid; + rd[xmlid] = $.jgrid.stripPref(ts.p.idPrefix, rid); ts.p.data.push(rd); - ts.p._index[rid] = ts.p.data.length-1; + ts.p._index[rd[xmlid]] = ts.p.data.length-1; rd = {}; ir++; } @@ -1309,37 +1415,41 @@ } else { return; } var dReader, locid = "_id_", frd, - locdata = (ts.p.datatype != "local" && ts.p.loadonce) || ts.p.datatype == "jsonstring"; + locdata = (ts.p.datatype !== "local" && ts.p.loadonce) || ts.p.datatype === "jsonstring"; if(locdata) { ts.p.data = []; ts.p._index = {}; ts.p.localReader.id = locid;} ts.p.reccount = 0; - if(ts.p.datatype == "local") { + if(ts.p.datatype === "local") { dReader = ts.p.localReader; frd= 'local'; } else { dReader = ts.p.jsonReader; frd='json'; } - var ir=0,v,i,j,f=[],F,cur,gi=ts.p.multiselect?1:0,si=ts.p.subGrid?1:0,ni=ts.p.rownumbers===true?1:0,len,drows,idn,rd={}, fpos, idr,rowData=[],cn=(ts.p.altRows === true) ? " "+ts.p.altclass:"",cn1,lp; + var self = $(ts), ir=0,v,i,j,f=[],cur,gi=ts.p.multiselect?1:0,si=ts.p.subGrid===true?1:0,addSubGridCell,ni=ts.p.rownumbers===true?1:0,arrayReader=orderedCols(gi+si+ni),objectReader=reader(frd),rowReader,len,drows,idn,rd={}, fpos, idr,rowData=[],cn=(ts.p.altRows === true) ? ts.p.altclass:"",cn1,lp; ts.p.page = $.jgrid.getAccessor(data,dReader.page) || ts.p.page || 0; lp = $.jgrid.getAccessor(data,dReader.total); + if(si) { + addSubGridCell = $.jgrid.getMethod("addSubGridCell"); + } ts.p.lastpage = lp === undefined ? 1 : lp; ts.p.records = $.jgrid.getAccessor(data,dReader.records) || 0; ts.p.userData = $.jgrid.getAccessor(data,dReader.userdata) || {}; - if(!dReader.repeatitems) { - F = f = reader(frd); - } if( ts.p.keyIndex===false ) { idn = $.isFunction(dReader.id) ? dReader.id.call(ts, data) : dReader.id; } else { idn = ts.p.keyIndex; } - if(f.length>0 && !isNaN(idn)) { - if (ts.p.remapColumns && ts.p.remapColumns.length) { - idn = $.inArray(idn, ts.p.remapColumns); + if(!dReader.repeatitems) { + f = objectReader; + if(f.length>0 && !isNaN(idn)) { + if (ts.p.remapColumns && ts.p.remapColumns.length) { + idn = $.inArray(idn, ts.p.remapColumns); + } + idn=f[idn]; } - idn=f[idn]; } drows = $.jgrid.getAccessor(data,dReader.root); + if (drows == null && $.isArray(data)) { drows = data; } if (!drows) { drows = []; } len = drows.length; i=0; if (len > 0 && ts.p.page <= 0) { ts.p.page = 1; } @@ -1348,23 +1458,33 @@ if(ts.p.datatype === "local" && !ts.p.deselectAfterSort) { selected = true; } - var afterInsRow = $.isFunction(ts.p.afterInsertRow), grpdata=[], hiderow=ts.p.grouping && ts.p.groupingView.groupCollapse === true; + var afterInsRow = $.isFunction(ts.p.afterInsertRow), grpdata=[],hiderow=false, groupingPrepare; + if(ts.p.grouping) { + hiderow = ts.p.groupingView.groupCollapse === true; + groupingPrepare = $.jgrid.getMethod("groupingPrepare"); + } while (i<len) { cur = drows[i]; idr = $.jgrid.getAccessor(cur,idn); if(idr === undefined) { - idr = br+i; - if(f.length===0){ - if(dReader.cell){ - var ccur = $.jgrid.getAccessor(cur,dReader.cell); - idr = ccur !== undefined ? ccur[idn] || idr : idr; - ccur=null; + if (typeof idn === "number" && ts.p.colModel[idn+gi+si+ni] != null) { + // reread id by name + idr = $.jgrid.getAccessor(cur,ts.p.colModel[idn+gi+si+ni].name); + } + if(idr === undefined) { + idr = br+i; + if(f.length===0){ + if(dReader.cell){ + var ccur = $.jgrid.getAccessor(cur,dReader.cell) || cur; + idr = ccur != null && ccur[idn] !== undefined ? ccur[idn] : idr; + ccur=null; + } } } } idr = ts.p.idPrefix + idr; altr = rcnt === 1 ? 0 : rcnt; - cn1 = (altr+i)%2 == 1 ? cn : ''; + cn1 = (altr+i)%2 === 1 ? cn : ''; if( selected) { if( ts.p.multiselect) { selr = ($.inArray(idr, ts.p.selarrrow) !== -1); @@ -1381,43 +1501,44 @@ rowData.push( addMulti(idr,ni,i,selr) ); } if( si ) { - rowData.push( $(ts).jqGrid("addSubGridCell",gi+ni,i+rcnt) ); + rowData.push( addSubGridCell.call(self,gi+ni,i+rcnt) ); } + rowReader=objectReader; if (dReader.repeatitems) { - if(dReader.cell) {cur = $.jgrid.getAccessor(cur,dReader.cell);} - if (!F) { F=orderedCols(gi+si+ni); } + if(dReader.cell) {cur = $.jgrid.getAccessor(cur,dReader.cell) || cur;} + if ($.isArray(cur)) { rowReader=arrayReader; } } - for (j=0;j<F.length;j++) { - v = $.jgrid.getAccessor(cur,F[j]); - rowData.push( addCell(idr,v,j+gi+si+ni,i+rcnt,cur) ); + for (j=0;j<rowReader.length;j++) { + v = $.jgrid.getAccessor(cur,rowReader[j]); rd[ts.p.colModel[j+gi+si+ni].name] = v; + rowData.push( addCell(idr,v,j+gi+si+ni,i+rcnt,cur, rd) ); } rowData[iStartTrTag] = constructTr(idr, hiderow, cn1, rd, cur, selr); rowData.push( "</tr>" ); if(ts.p.grouping) { - grpdata = $(ts).jqGrid('groupingPrepare',rowData, grpdata, rd, i); + grpdata = groupingPrepare.call(self,rowData, grpdata, rd, i); rowData = []; } if(locdata || ts.p.treeGrid===true) { - rd[locid] = idr; + rd[locid] = $.jgrid.stripPref(ts.p.idPrefix, idr); ts.p.data.push(rd); - ts.p._index[idr] = ts.p.data.length-1; + ts.p._index[rd[locid]] = ts.p.data.length-1; } if(ts.p.gridview === false ) { $("#"+$.jgrid.jqID(ts.p.id)+" tbody:first").append(rowData.join('')); - $(ts).triggerHandler("jqGridAfterInsertRow", [idr, rd, cur]); + self.triggerHandler("jqGridAfterInsertRow", [idr, rd, cur]); if(afterInsRow) {ts.p.afterInsertRow.call(ts,idr,rd,cur);} rowData=[];//ari=0; } rd={}; ir++; i++; - if(ir==rn) { break; } + if(ir===rn) { break; } } if(ts.p.gridview === true ) { fpos = ts.p.treeANode > -1 ? ts.p.treeANode: 0; if(ts.p.grouping) { - $(ts).jqGrid('groupingRender',grpdata,ts.p.colModel.length); + self.jqGrid('groupingRender',grpdata,ts.p.colModel.length); grpdata = null; } else if(ts.p.treeGrid === true && fpos > 0) { $(ts.rows[fpos]).after(rowData.join('')); @@ -1426,7 +1547,7 @@ } } if(ts.p.subGrid === true ) { - try { $(ts).jqGrid("addSubGrid",gi+ni);} catch (_){} + try { self.jqGrid("addSubGrid",gi+ni);} catch (_){} } ts.p.totaltime = new Date() - startReq; if(ir>0) { @@ -1434,12 +1555,12 @@ } rowData = null; if( ts.p.treeGrid === true) { - try {$(ts).jqGrid("setTreeNode", fpos+1, ir+fpos+1);} catch (e) {} + try {self.jqGrid("setTreeNode", fpos+1, ir+fpos+1);} catch (e) {} } if(!ts.p.treeGrid && !ts.p.scroll) {ts.grid.bDiv.scrollTop = 0;} ts.p.reccount=ir; ts.p.treeANode = -1; - if(ts.p.userDataOnFooter) { $(ts).jqGrid("footerData","set",ts.p.userData,true); } + if(ts.p.userDataOnFooter) { self.jqGrid("footerData","set",ts.p.userData,true); } if(locdata) { ts.p.records = len; ts.p.lastpage = Math.ceil(len/ rn); @@ -1450,29 +1571,35 @@ cur = drows[ir]; idr = $.jgrid.getAccessor(cur,idn); if(idr === undefined) { - idr = br+ir; - if(f.length===0){ - if(dReader.cell){ - var ccur2 = $.jgrid.getAccessor(cur,dReader.cell); - idr = ccur2[idn] || idr; - ccur2=null; + if (typeof idn === "number" && ts.p.colModel[idn+gi+si+ni] != null) { + // reread id by name + idr = $.jgrid.getAccessor(cur,ts.p.colModel[idn+gi+si+ni].name); + } + if(idr === undefined) { + idr = br+ir; + if(f.length===0){ + if(dReader.cell){ + var ccur2 = $.jgrid.getAccessor(cur,dReader.cell) || cur; + idr = ccur2 != null && ccur2[idn] !== undefined ? ccur2[idn] : idr; + ccur2=null; + } } } } if(cur) { idr = ts.p.idPrefix + idr; + rowReader=objectReader; if (dReader.repeatitems) { - if(dReader.cell) {cur = $.jgrid.getAccessor(cur,dReader.cell);} - if (!F) { F=orderedCols(gi+si+ni); } + if(dReader.cell) {cur = $.jgrid.getAccessor(cur,dReader.cell) || cur;} + if ($.isArray(cur)) { rowReader=arrayReader; } } - for (j=0;j<F.length;j++) { - v = $.jgrid.getAccessor(cur,F[j]); - rd[ts.p.colModel[j+gi+si+ni].name] = v; + for (j=0;j<rowReader.length;j++) { + rd[ts.p.colModel[j+gi+si+ni].name] = $.jgrid.getAccessor(cur,rowReader[j]); } - rd[locid] = idr; + rd[locid] = $.jgrid.stripPref(ts.p.idPrefix, idr); ts.p.data.push(rd); - ts.p._index[idr] = ts.p.data.length-1; + ts.p._index[rd[locid]] = ts.p.data.length-1; rd = {}; } ir++; @@ -1480,15 +1607,15 @@ } }, addLocalData = function() { - var st, fndsort=false, cmtypes={}, grtypes=[], grindexes=[], srcformat, sorttype, newformat; + var st = ts.p.multiSort ? [] : "", sto=[], fndsort=false, cmtypes={}, grtypes=[], grindexes=[], srcformat, sorttype, newformat; if(!$.isArray(ts.p.data)) { return; } var grpview = ts.p.grouping ? ts.p.groupingView : false, lengrp, gin; $.each(ts.p.colModel,function(){ sorttype = this.sorttype || "text"; - if(sorttype == "date" || sorttype == "datetime") { - if(this.formatter && typeof(this.formatter) === 'string' && this.formatter == 'date') { + if(sorttype === "date" || sorttype === "datetime") { + if(this.formatter && typeof this.formatter === 'string' && this.formatter === 'date') { if(this.formatoptions && this.formatoptions.srcformat) { srcformat = this.formatoptions.srcformat; } else { @@ -1508,9 +1635,9 @@ } if(ts.p.grouping ) { for(gin =0, lengrp = grpview.groupField.length; gin< lengrp; gin++) { - if( this.name == grpview.groupField[gin]) { + if( this.name === grpview.groupField[gin]) { var grindex = this.name; - if (typeof this.index != 'undefined') { + if (this.index) { grindex = this.index; } grtypes[gin] = cmtypes[grindex]; @@ -1518,9 +1645,17 @@ } } } - if(!fndsort && (this.index == ts.p.sortname || this.name == ts.p.sortname)){ - st = this.name; // ??? - fndsort = true; + if(ts.p.multiSort) { + if(this.lso) { + st.push(this.name); + var tmplso= this.lso.split("-"); + sto.push( tmplso[tmplso.length-1] ); + } + } else { + if(!fndsort && (this.index === ts.p.sortname || this.name === ts.p.sortname)){ + st = this.name; // ??? + fndsort = true; + } } }); if(ts.p.treeGrid) { @@ -1550,7 +1685,7 @@ if (ts.p.ignoreCase) { query = query.ignoreCase(); } function tojLinq ( group ) { var s = 0, index, gor, ror, opr, rule; - if (group.groups !== undefined) { + if (group.groups != null) { gor = group.groups.length && group.groupOp.toString().toUpperCase() === "OR"; if (gor) { query.orBegin(); @@ -1568,12 +1703,12 @@ query.orEnd(); } } - if (group.rules !== undefined) { - if(s>0) { - var result = query.select(); - query = $.jgrid.from( result); - if (ts.p.ignoreCase) { query = query.ignoreCase(); } - } + if (group.rules != null) { + //if(s>0) { + // var result = query.select(); + // query = $.jgrid.from( result); + // if (ts.p.ignoreCase) { query = query.ignoreCase(); } + //} try{ ror = group.rules.length && group.groupOp.toString().toUpperCase() === "OR"; if (ror) { @@ -1600,7 +1735,7 @@ if (ts.p.search === true) { var srules = ts.p.postData.filters; if(srules) { - if(typeof srules == "string") { srules = $.jgrid.parse(srules);} + if(typeof srules === "string") { srules = $.jgrid.parse(srules);} tojLinq( srules ); } else { try { @@ -1613,11 +1748,17 @@ query.orderBy(grindexes[gin],grpview.groupOrder[gin],grtypes[gin].stype, grtypes[gin].srcfmt); } } - if (st && ts.p.sortorder && fndsort) { - if(ts.p.sortorder.toUpperCase() == "DESC") { - query.orderBy(ts.p.sortname, "d", cmtypes[st].stype, cmtypes[st].srcfmt); - } else { - query.orderBy(ts.p.sortname, "a", cmtypes[st].stype, cmtypes[st].srcfmt); + if(ts.p.multiSort) { + $.each(st,function(i){ + query.orderBy(this, sto[i], cmtypes[this].stype, cmtypes[this].srcfmt); + }); + } else { + if (st && ts.p.sortorder && fndsort) { + if(ts.p.sortorder.toUpperCase() === "DESC") { + query.orderBy(ts.p.sortname, "d", cmtypes[st].stype, cmtypes[st].srcfmt); + } else { + query.orderBy(ts.p.sortname, "a", cmtypes[st].stype, cmtypes[st].srcfmt); + } } } var queryResults = query.select(), @@ -1654,10 +1795,13 @@ var top = base * rh; var height = parseInt(ts.p.records,10) * rh; $(">div:first",ts.grid.bDiv).css({height : height}).children("div:first").css({height:top,display:top?"":"none"}); + if (ts.grid.bDiv.scrollTop == 0 && ts.p.page > 1) { + ts.grid.bDiv.scrollTop = ts.p.rowNum * (ts.p.page - 1) * rh; + } } ts.grid.bDiv.scrollLeft = ts.grid.hDiv.scrollLeft; } - pgboxes = ts.p.pager ? ts.p.pager : ""; + pgboxes = ts.p.pager || ""; pgboxes += ts.p.toppager ? (pgboxes ? "," + ts.p.toppager : ts.p.toppager) : ""; if(pgboxes) { fmt = $.jgrid.formatter.integer || {}; @@ -1686,14 +1830,14 @@ } if(ts.p.pgbuttons===true) { if(cp<=0) {cp = last = 0;} - if(cp==1 || cp === 0) { + if(cp===1 || cp === 0) { $("#first"+tspg+", #prev"+tspg).addClass('ui-state-disabled').removeClass('ui-state-hover'); if(ts.p.toppager) { $("#first_t"+tspg_t+", #prev_t"+tspg_t).addClass('ui-state-disabled').removeClass('ui-state-hover'); } } else { $("#first"+tspg+", #prev"+tspg).removeClass('ui-state-disabled'); if(ts.p.toppager) { $("#first_t"+tspg_t+", #prev_t"+tspg_t).removeClass('ui-state-disabled'); } } - if(cp==last || cp === 0) { + if(cp===last || cp === 0) { $("#next"+tspg+", #last"+tspg).addClass('ui-state-disabled').removeClass('ui-state-hover'); if(ts.p.toppager) { $("#next_t"+tspg_t+", #last_t"+tspg_t).addClass('ui-state-disabled').removeClass('ui-state-hover'); } } else { @@ -1703,7 +1847,7 @@ } } if(rn===true && ts.p.rownumbers === true) { - $("td.jqgrid-rownum",ts.rows).each(function(i){ + $(">td.jqgrid-rownum",ts.rows).each(function(i){ $(this).html(base+1+i); }); } @@ -1777,7 +1921,7 @@ for(gi=0;gi<grp.groupField.length;gi++) { var index = grp.groupField[gi]; $.each(ts.p.colModel, function(cmIndex, cmValue) { - if (cmValue.name == index && cmValue.index){ + if (cmValue.name === index && cmValue.index){ index = cmValue.index; } } ); @@ -1790,7 +1934,7 @@ var bfr = $(ts).triggerHandler("jqGridBeforeRequest"); if (bfr === false || bfr === 'stop') { return; } if ($.isFunction(ts.p.datatype)) { ts.p.datatype.call(ts,ts.p.postData,"load_"+ts.p.id); return;} - else if($.isFunction(ts.p.beforeRequest)) { + if ($.isFunction(ts.p.beforeRequest)) { bfr = ts.p.beforeRequest.call(ts); if(bfr === undefined) { bfr = true; } if ( bfr === false ) { return; } @@ -1837,15 +1981,14 @@ if(gotoreq === undefined) { gotoreq = true; } if(gotoreq === false) { return false; - } else { + } beginReq(); } - } },$.jgrid.ajaxOptions, ts.p.ajaxGridOptions)); break; case "xmlstring": beginReq(); - dstr = $.jgrid.stringToDoc(ts.p.datastr); + dstr = typeof ts.p.datastr !== 'string' ? ts.p.datastr : $.parseXML(ts.p.datastr); addXmlData(dstr,ts.grid.bDiv); $(ts).triggerHandler("jqGridLoadComplete", [dstr]); if(lcf) {ts.p.loadComplete.call(ts,dstr);} @@ -1856,7 +1999,7 @@ break; case "jsonstring": beginReq(); - if(typeof ts.p.datastr == 'string') { dstr = $.jgrid.parse(ts.p.datastr); } + if(typeof ts.p.datastr === 'string') { dstr = $.jgrid.parse(ts.p.datastr); } else { dstr = ts.p.datastr; } addJSONData(dstr,ts.grid.bDiv); $(ts).triggerHandler("jqGridLoadComplete", [dstr]); @@ -1900,7 +2043,7 @@ ts.p.selrow = null; if(ts.p.multiselect) {ts.p.selarrrow =[]; setHeadCheckBox( false );} ts.p.savedRow = []; - if(ret=='stop') {return false;} + if(ret==='stop') {return false;} return true; }; pgid = pgid.substr(1); @@ -1914,21 +2057,21 @@ str = "<td dir='"+dir+"'>"; str +="<select class='ui-pg-selbox' role='listbox'>"; for(i=0;i<ts.p.rowList.length;i++){ - str +="<option role=\"option\" value=\""+ts.p.rowList[i]+"\""+((ts.p.rowNum == ts.p.rowList[i])?" selected=\"selected\"":"")+">"+ts.p.rowList[i]+"</option>"; + str +="<option role=\"option\" value=\""+ts.p.rowList[i]+"\""+((ts.p.rowNum === ts.p.rowList[i])?" selected=\"selected\"":"")+">"+ts.p.rowList[i]+"</option>"; } str +="</select></td>"; } - if(dir=="rtl") { pgl += str; } + if(dir==="rtl") { pgl += str; } if(ts.p.pginput===true) { pginp= "<td dir='"+dir+"'>"+$.jgrid.format(ts.p.pgtext || "","<input class='ui-pg-input' type='text' size='2' maxlength='7' value='0' role='textbox'/>","<span id='sp_1_"+$.jgrid.jqID(pgid)+"'></span>")+"</td>";} if(ts.p.pgbuttons===true) { - var po=["first"+tp,"prev"+tp, "next"+tp,"last"+tp]; if(dir=="rtl") { po.reverse(); } + var po=["first"+tp,"prev"+tp, "next"+tp,"last"+tp]; if(dir==="rtl") { po.reverse(); } pgl += "<td id='"+po[0]+"' class='ui-pg-button ui-corner-all'><span class='ui-icon ui-icon-seek-first'></span></td>"; pgl += "<td id='"+po[1]+"' class='ui-pg-button ui-corner-all'><span class='ui-icon ui-icon-seek-prev'></span></td>"; pgl += pginp !== "" ? sep+pginp+sep:""; pgl += "<td id='"+po[2]+"' class='ui-pg-button ui-corner-all'><span class='ui-icon ui-icon-seek-next'></span></td>"; pgl += "<td id='"+po[3]+"' class='ui-pg-button ui-corner-all'><span class='ui-icon ui-icon-seek-end'></span></td>"; } else if (pginp !== "") { pgl += pginp; } - if(dir=="ltr") { pgl += str; } + if(dir==="ltr") { pgl += str; } pgl += "</tr></tbody></table>"; if(ts.p.viewrecords===true) {$("td#"+pgid+"_"+ts.p.recordpos,"#"+pgcnt).append("<div dir='"+dir+"' style='text-align:"+ts.p.recordpos+"' class='ui-paging-info'></div>");} $("td#"+pgid+"_"+ts.p.pagerpos,"#"+pgcnt).append(pgl); @@ -1945,11 +2088,11 @@ ts.p._nvtd[1] = 0; pgl=null; $('.ui-pg-selbox',"#"+pgcnt).bind('change',function() { + if(!clearVals('records')) { return false; } ts.p.page = Math.round(ts.p.rowNum*(ts.p.page-1)/this.value-0.5)+1; ts.p.rowNum = this.value; if(ts.p.pager) { $('.ui-pg-selbox',ts.p.pager).val(this.value); } if(ts.p.toppager) { $('.ui-pg-selbox',ts.p.toppager).val(this.value); } - if(!clearVals('records')) { return false; } populate(); return false; }); @@ -1977,12 +2120,12 @@ //else if( cp>1 && cp <last){ } else if( cp===last){ np=false;lp=false; } } else if( last>1 && cp===0 ) { np=false;lp=false; cp=last-1;} + if(!clearVals(this.id)) { return false; } if( this.id === 'first'+tp && fp ) { ts.p.page=1; selclick=true;} if( this.id === 'prev'+tp && pp) { ts.p.page=(cp-1); selclick=true;} if( this.id === 'next'+tp && np) { ts.p.page=(cp+1); selclick=true;} if( this.id === 'last'+tp && lp) { ts.p.page=last; selclick=true;} if(selclick) { - if(!clearVals(this.id)) { return false; } populate(); } return false; @@ -1990,10 +2133,11 @@ } if(ts.p.pginput===true) { $('input.ui-pg-input',"#"+pgcnt).keypress( function(e) { - var key = e.charCode ? e.charCode : e.keyCode ? e.keyCode : 0; - if(key == 13) { + var key = e.charCode || e.keyCode || 0; + if(key === 13) { + if(!clearVals('user')) { return false; } + $(this).val( intNum( $(this).val(), 1)); ts.p.page = ($(this).val()>0) ? $(this).val():ts.p.page; - if(!clearVals('user')) { return false; } populate(); return false; } @@ -2001,43 +2145,99 @@ }); } }, - sortData = function (index, idxcol,reload,sor){ + multiSort = function(iCol, obj ) { + var splas, sort="", cm = ts.p.colModel, fs=false, ls, + selTh = ts.p.frozenColumns ? obj : ts.grid.headers[iCol].el, so=""; + $("span.ui-grid-ico-sort",selTh).addClass('ui-state-disabled'); + $(selTh).attr("aria-selected","false"); + + if(cm[iCol].lso) { + if(cm[iCol].lso==="asc") { + cm[iCol].lso += "-desc"; + so = "desc"; + } else if(cm[iCol].lso==="desc") { + cm[iCol].lso += "-asc"; + so = "asc"; + } else if(cm[iCol].lso==="asc-desc" || cm[iCol].lso==="desc-asc") { + cm[iCol].lso=""; + } + } else { + cm[iCol].lso = so = cm.firstsortorder || 'asc'; + } + if( so ) { + $("span.s-ico",selTh).show(); + $("span.ui-icon-"+so,selTh).removeClass('ui-state-disabled'); + $(selTh).attr("aria-selected","true"); + } else { + if(!ts.p.viewsortcols[0]) { + $("span.s-ico",selTh).hide(); + } + } + ts.p.sortorder = ""; + $.each(cm, function(i){ + if(this.lso) { + if(i>0 && fs) { + sort += ", "; + } + splas = this.lso.split("-"); + sort += cm[i].index || cm[i].name; + sort += " "+splas[splas.length-1]; + fs = true; + ts.p.sortorder = splas[splas.length-1]; + } + }); + ls = sort.lastIndexOf(ts.p.sortorder); + sort = sort.substring(0, ls); + ts.p.sortname = sort; + }, + sortData = function (index, idxcol,reload,sor, obj){ if(!ts.p.colModel[idxcol].sortable) { return; } var so; if(ts.p.savedRow.length > 0) {return;} if(!reload) { - if( ts.p.lastsort == idxcol ) { - if( ts.p.sortorder == 'asc') { + if( ts.p.lastsort === idxcol ) { + if( ts.p.sortorder === 'asc') { ts.p.sortorder = 'desc'; - } else if(ts.p.sortorder == 'desc') { ts.p.sortorder = 'asc';} + } else if(ts.p.sortorder === 'desc') { ts.p.sortorder = 'asc';} } else { ts.p.sortorder = ts.p.colModel[idxcol].firstsortorder || 'asc'; } ts.p.page = 1; } - if(sor) { - if(ts.p.lastsort == idxcol && ts.p.sortorder == sor && !reload) { return; } - else { ts.p.sortorder = sor; } - } - var previousSelectedTh = ts.grid.headers[ts.p.lastsort].el, newSelectedTh = ts.grid.headers[idxcol].el; + if(ts.p.multiSort) { + multiSort( idxcol, obj); + } else { + if(sor) { + if(ts.p.lastsort === idxcol && ts.p.sortorder === sor && !reload) { return; } + ts.p.sortorder = sor; + } + var previousSelectedTh = ts.grid.headers[ts.p.lastsort].el, newSelectedTh = ts.p.frozenColumns ? obj : ts.grid.headers[idxcol].el; - $("span.ui-grid-ico-sort",previousSelectedTh).addClass('ui-state-disabled'); - $(previousSelectedTh).attr("aria-selected","false"); - $("span.ui-icon-"+ts.p.sortorder,newSelectedTh).removeClass('ui-state-disabled'); - $(newSelectedTh).attr("aria-selected","true"); - if(!ts.p.viewsortcols[0]) { - if(ts.p.lastsort != idxcol) { - $("span.s-ico",previousSelectedTh).hide(); - $("span.s-ico",newSelectedTh).show(); + $("span.ui-grid-ico-sort",previousSelectedTh).addClass('ui-state-disabled'); + $(previousSelectedTh).attr("aria-selected","false"); + if(ts.p.frozenColumns) { + ts.grid.fhDiv.find("span.ui-grid-ico-sort").addClass('ui-state-disabled'); + ts.grid.fhDiv.find("th").attr("aria-selected","false"); } + $("span.ui-icon-"+ts.p.sortorder,newSelectedTh).removeClass('ui-state-disabled'); + $(newSelectedTh).attr("aria-selected","true"); + if(!ts.p.viewsortcols[0]) { + if(ts.p.lastsort !== idxcol) { + if(ts.p.frozenColumns){ + ts.grid.fhDiv.find("span.s-ico").hide(); + } + $("span.s-ico",previousSelectedTh).hide(); + $("span.s-ico",newSelectedTh).show(); + } + } + index = index.substring(5 + ts.p.id.length + 1); // bad to be changed!?! + ts.p.sortname = ts.p.colModel[idxcol].index || index; + so = ts.p.sortorder; } - index = index.substring(5 + ts.p.id.length + 1); // bad to be changed!?! - ts.p.sortname = ts.p.colModel[idxcol].index || index; - so = ts.p.sortorder; if ($(ts).triggerHandler("jqGridSortCol", [index, idxcol, so]) === 'stop') { ts.p.lastsort = idxcol; return; } - if($.isFunction(ts.p.onSortCol)) {if (ts.p.onSortCol.call(ts,index,idxcol,so)=='stop') {ts.p.lastsort = idxcol; return;}} - if(ts.p.datatype == "local") { + if($.isFunction(ts.p.onSortCol)) {if (ts.p.onSortCol.call(ts,index,idxcol,so)==='stop') {ts.p.lastsort = idxcol; return;}} + if(ts.p.datatype === "local") { if(ts.p.deselectAfterSort) {$(ts).jqGrid("resetSelection");} } else { ts.p.selrow = null; @@ -2050,20 +2250,25 @@ emptyRows.call(ts, true, false); ts.grid.hDiv.scrollLeft = sscroll; } - if(ts.p.subGrid && ts.p.datatype=='local') { + if(ts.p.subGrid && ts.p.datatype === 'local') { $("td.sgexpanded","#"+$.jgrid.jqID(ts.p.id)).each(function(){ $(this).trigger("click"); }); } populate(); ts.p.lastsort = idxcol; - if(ts.p.sortname != index && idxcol) {ts.p.lastsort = idxcol;} + if(ts.p.sortname !== index && idxcol) {ts.p.lastsort = idxcol;} }, setColWidth = function () { - var initwidth = 0, brd=$.jgrid.cellWidth()? 0: intNum(ts.p.cellLayout,0), vc=0, lvc, scw=intNum(ts.p.scrollOffset,0),cw,hs=false,aw,gw=0, - cl = 0, cr; + var initwidth = 0, brd=$.jgrid.cell_width? 0: intNum(ts.p.cellLayout,0), vc=0, lvc, scw=intNum(ts.p.scrollOffset,0),cw,hs=false,aw,gw=0,cr; $.each(ts.p.colModel, function() { - if(typeof this.hidden === 'undefined') {this.hidden=false;} + if(this.hidden === undefined) {this.hidden=false;} + if(ts.p.grouping && ts.p.autowidth) { + var ind = $.inArray(this.name, ts.p.groupingView.groupField); + if(ind >= 0 && ts.p.groupingView.groupColumnShow.length > ind) { + this.hidden = !ts.p.groupingView.groupColumnShow[ind]; + } + } this.widthOrg = cw = intNum(this.width,0); if(this.hidden===false){ initwidth += cw+brd; @@ -2072,7 +2277,6 @@ } else { vc++; } - cl++; } }); if(isNaN(ts.p.width)) { @@ -2122,19 +2326,11 @@ return j-ret; }, getOffset = function (iCol) { - var i, ret = {}, brd1 = $.jgrid.cellWidth() ? 0 : ts.p.cellLayout; - ret[0] = ret[1] = ret[2] = 0; - for(i=0;i<=iCol;i++){ - if(ts.p.colModel[i].hidden === false ) { - ret[0] += ts.p.colModel[i].width+brd1; - } - } - if(ts.p.direction=="rtl") { ret[0] = ts.p.width - ret[0]; } - ret[0] = ret[0] - ts.grid.bDiv.scrollLeft; - if($(ts.grid.cDiv).is(":visible")) {ret[1] += $(ts.grid.cDiv).height() +parseInt($(ts.grid.cDiv).css("padding-top"),10)+parseInt($(ts.grid.cDiv).css("padding-bottom"),10);} - if(ts.p.toolbar[0]===true && (ts.p.toolbar[1]=='top' || ts.p.toolbar[1]=='both')) {ret[1] += $(ts.grid.uDiv).height()+parseInt($(ts.grid.uDiv).css("border-top-width"),10)+parseInt($(ts.grid.uDiv).css("border-bottom-width"),10);} - if(ts.p.toppager) {ret[1] += $(ts.grid.topDiv).height()+parseInt($(ts.grid.topDiv).css("border-bottom-width"),10);} - ret[2] += $(ts.grid.bDiv).height() + $(ts.grid.hDiv).height(); + var $th = $(ts.grid.headers[iCol].el), ret = [$th.position().left + $th.outerWidth()]; + if(ts.p.direction==="rtl") { ret[0] = ts.p.width - ret[0]; } + ret[0] -= ts.grid.bDiv.scrollLeft; + ret.push($(ts.grid.hDiv).position().top); + ret.push($(ts.grid.bDiv).offset().top - $(ts.grid.hDiv).offset().top + $(ts.grid.bDiv).height()); return ret; }, getColumnHeaderIndex = function (th) { @@ -2148,7 +2344,7 @@ return ci; }; this.p.id = this.id; - if ($.inArray(ts.p.multikey,sortkeys) == -1 ) {ts.p.multikey = false;} + if ($.inArray(ts.p.multikey,sortkeys) === -1 ) {ts.p.multikey = false;} ts.p.keyIndex=false; for (i=0; i<ts.p.colModel.length;i++) { ts.p.colModel[i] = $.extend(true, {}, ts.p.cmTemplate, ts.p.colModel[i].template || {}, ts.p.colModel[i]); @@ -2157,6 +2353,7 @@ } } ts.p.sortorder = ts.p.sortorder.toLowerCase(); + $.jgrid.cell_width = $.jgrid.cellWidth(); if(ts.p.grouping===true) { ts.p.scroll = false; ts.p.rownumbers = false; @@ -2166,14 +2363,14 @@ } if(this.p.treeGrid === true) { try { $(this).jqGrid("setTreeGrid");} catch (_) {} - if(ts.p.datatype != "local") { ts.p.localReader = {id: "_id_"}; } + if(ts.p.datatype !== "local") { ts.p.localReader = {id: "_id_"}; } } if(this.p.subGrid) { try { $(ts).jqGrid("setSubGrid");} catch (s){} } if(this.p.multiselect) { this.p.colNames.unshift("<input role='checkbox' id='cb_"+this.p.id+"' class='cbox' type='checkbox'/>"); - this.p.colModel.unshift({name:'cb',width:$.jgrid.cellWidth() ? ts.p.multiselectWidth+ts.p.cellLayout : ts.p.multiselectWidth,sortable:false,resizable:false,hidedlg:true,search:false,align:'center',fixed:true}); + this.p.colModel.unshift({name:'cb',width:$.jgrid.cell_width ? ts.p.multiselectWidth+ts.p.cellLayout : ts.p.multiselectWidth,sortable:false,resizable:false,hidedlg:true,search:false,align:'center',fixed:true}); } if(this.p.rownumbers) { this.p.colNames.unshift(""); @@ -2219,7 +2416,7 @@ if(ts.p.data.length) { refreshIndex(); } var thead = "<thead><tr class='ui-jqgrid-labels' role='rowheader'>", tdc, idn, w, res, sort, - td, ptr, tbody, imgs,iac="",idc=""; + td, ptr, tbody, imgs,iac="",idc="",sortarr=[], sortord=[], sotmp=[]; if(ts.p.shrinkToFit===true && ts.p.forceFit===true) { for (i=ts.p.colModel.length-1;i>=0;i--){ if(!ts.p.colModel[i].hidden) { @@ -2228,10 +2425,18 @@ } } } - if(ts.p.viewsortcols[1] == 'horizontal') {iac=" ui-i-asc";idc=" ui-i-desc";} + if(ts.p.viewsortcols[1] === 'horizontal') {iac=" ui-i-asc";idc=" ui-i-desc";} tdc = isMSIE ? "class='ui-th-div-ie'" :""; imgs = "<span class='s-ico' style='display:none'><span sort='asc' class='ui-grid-ico-sort ui-icon-asc"+iac+" ui-state-disabled ui-icon ui-icon-triangle-1-n ui-sort-"+dir+"'></span>"; imgs += "<span sort='desc' class='ui-grid-ico-sort ui-icon-desc"+idc+" ui-state-disabled ui-icon ui-icon-triangle-1-s ui-sort-"+dir+"'></span></span>"; + if(ts.p.multiSort) { + sortarr = ts.p.sortname.split(","); + for (i=0; i<sortarr.length; i++) { + sotmp = $.trim(sortarr[i]).split(" "); + sortarr[i] = $.trim(sotmp[0]); + sortord[i] = sotmp[1] ? $.trim(sotmp[1]) : ts.p.sortorder || "asc"; + } + } for(i=0;i<this.p.colNames.length;i++){ var tooltip = ts.p.headertitles ? (" title=\""+$.jgrid.stripHtml(ts.p.colNames[i])+"\"") :""; thead += "<th id='"+ts.p.id+"_"+ts.p.colModel[i].name+"' role='columnheader' class='ui-state-default ui-th-column ui-th-"+dir+"'"+ tooltip+">"; @@ -2239,10 +2444,17 @@ thead += "<div id='jqgh_"+ts.p.id+"_"+ts.p.colModel[i].name+"' "+tdc+">"+ts.p.colNames[i]; if(!ts.p.colModel[i].width) { ts.p.colModel[i].width = 150; } else { ts.p.colModel[i].width = parseInt(ts.p.colModel[i].width,10); } - if(typeof(ts.p.colModel[i].title) !== "boolean") { ts.p.colModel[i].title = true; } - if (idn == ts.p.sortname) { + if(typeof ts.p.colModel[i].title !== "boolean") { ts.p.colModel[i].title = true; } + ts.p.colModel[i].lso = ""; + if (idn === ts.p.sortname) { ts.p.lastsort = i; } + if(ts.p.multiSort) { + sotmp = $.inArray(idn,sortarr); + if( sotmp !== -1 ) { + ts.p.colModel[i].lso = sortord[sotmp]; + } + } thead += imgs+"</div></th>"; } thead += "</tr></thead>"; @@ -2309,11 +2521,11 @@ ts.p.disableClick=false; $("th",thr).each(function ( j ) { w = ts.p.colModel[j].width; - if(typeof ts.p.colModel[j].resizable === 'undefined') {ts.p.colModel[j].resizable = true;} + if(ts.p.colModel[j].resizable === undefined) {ts.p.colModel[j].resizable = true;} if(ts.p.colModel[j].resizable){ res = document.createElement("span"); - $(res).html(" ").addClass('ui-jqgrid-resize ui-jqgrid-resize-'+dir); - if(!$.browser.opera) { $(res).css("cursor","col-resize"); } + $(res).html(" ").addClass('ui-jqgrid-resize ui-jqgrid-resize-'+dir) + .css("cursor","col-resize"); $(this).addClass(ts.p.resizeclass); } else { res = ""; @@ -2329,18 +2541,30 @@ sort = ts.p.colModel[j].sortable; if( typeof sort !== 'boolean') {ts.p.colModel[j].sortable = true; sort=true;} var nm = ts.p.colModel[j].name; - if( !(nm == 'cb' || nm=='subgrid' || nm=='rn') ) { + if( !(nm === 'cb' || nm==='subgrid' || nm==='rn') ) { if(ts.p.viewsortcols[2]){ $(">div",this).addClass('ui-jqgrid-sortable'); } } if(sort) { - if(ts.p.viewsortcols[0]) {$("div span.s-ico",this).show(); if(j==ts.p.lastsort){ $("div span.ui-icon-"+ts.p.sortorder,this).removeClass("ui-state-disabled");}} - else if( j == ts.p.lastsort) {$("div span.s-ico",this).show();$("div span.ui-icon-"+ts.p.sortorder,this).removeClass("ui-state-disabled");} + if(ts.p.multiSort) { + if(ts.p.viewsortcols[0]) { + $("div span.s-ico",this).show(); + if(ts.p.colModel[j].lso){ + $("div span.ui-icon-"+ts.p.colModel[j].lso,this).removeClass("ui-state-disabled"); + } + } else if( ts.p.colModel[j].lso) { + $("div span.s-ico",this).show(); + $("div span.ui-icon-"+ts.p.colModel[j].lso,this).removeClass("ui-state-disabled"); + } + } else { + if(ts.p.viewsortcols[0]) {$("div span.s-ico",this).show(); if(j===ts.p.lastsort){ $("div span.ui-icon-"+ts.p.sortorder,this).removeClass("ui-state-disabled");}} + else if( j === ts.p.lastsort) {$("div span.s-ico",this).show();$("div span.ui-icon-"+ts.p.sortorder,this).removeClass("ui-state-disabled");} + } } if(ts.p.footerrow) { tfoot += "<td role='gridcell' "+formatCol(j,0,'', null, '', false)+"> </td>"; } }).mousedown(function(e) { - if ($(e.target).closest("th>span.ui-jqgrid-resize").length != 1) { return; } + if ($(e.target).closest("th>span.ui-jqgrid-resize").length !== 1) { return; } var ci = getColumnHeaderIndex(this); if(ts.p.forceFit===true) {ts.p.nv= nextVisible(ci);} grid.dragStart(ci, e, getOffset(ci)); @@ -2353,10 +2577,22 @@ var s = "th>div.ui-jqgrid-sortable",r,d; if (!ts.p.viewsortcols[2]) { s = "th>div>span>span.ui-grid-ico-sort"; } var t = $(e.target).closest(s); - if (t.length != 1) { return; } - var ci = getColumnHeaderIndex(this); + if (t.length !== 1) { return; } + var ci; + if(ts.p.frozenColumns) { + var tid = $(this)[0].id.substring(5); + $(ts.p.colModel).each(function(i){ + if (this.name === tid) { + ci = i;return false; + } + }); + } else { + ci = getColumnHeaderIndex(this); + } if (!ts.p.viewsortcols[2]) { r=true;d=t.attr("sort"); } - sortData( $('div',this)[0].id, ci, r, d); + if(ci != null){ + sortData( $('div',this)[0].id, ci, r, d, this); + } return false; }); if (ts.p.sortable && $.fn.sortable) { @@ -2372,7 +2608,7 @@ firstr = null; var hTable = $("<table class='ui-jqgrid-htable' style='width:"+ts.p.tblwidth+"px' role='grid' aria-labelledby='gbox_"+this.id+"' cellspacing='0' cellpadding='0' border='0'></table>").append(thead), hg = (ts.p.caption && ts.p.hiddengrid===true) ? true : false, - hb = $("<div class='ui-jqgrid-hbox" + (dir=="rtl" ? "-rtl" : "" )+"'></div>"); + hb = $("<div class='ui-jqgrid-hbox" + (dir==="rtl" ? "-rtl" : "" )+"'></div>"); thead = null; grid.hDiv = document.createElement("div"); $(grid.hDiv) @@ -2384,9 +2620,9 @@ if(hg) { $(grid.hDiv).hide(); } if(ts.p.pager){ // TBD -- escape ts.p.pager here? - if(typeof ts.p.pager == "string") {if(ts.p.pager.substr(0,1) !="#") { ts.p.pager = "#"+ts.p.pager;} } + if(typeof ts.p.pager === "string") {if(ts.p.pager.substr(0,1) !== "#") { ts.p.pager = "#"+ts.p.pager;} } else { ts.p.pager = "#"+ $(ts.p.pager).attr("id");} - $(ts.p.pager).css({width: grid.width+"px"}).appendTo(eg).addClass('ui-state-default ui-jqgrid-pager ui-corner-bottom'); + $(ts.p.pager).css({width: grid.width+"px"}).addClass('ui-state-default ui-jqgrid-pager ui-corner-bottom').appendTo(eg); if(hg) {$(ts.p.pager).hide();} setPager(ts.p.pager,''); } @@ -2412,7 +2648,7 @@ cSel = $(ts).triggerHandler("jqGridBeforeSelectRow", [ptr[0].id, e]); cSel = (cSel === false || cSel === 'stop') ? false : true; if(cSel && $.isFunction(ts.p.beforeSelectRow)) { cSel = ts.p.beforeSelectRow.call(ts,ptr[0].id, e); } - if (td.tagName == 'A' || ((td.tagName == 'INPUT' || td.tagName == 'TEXTAREA' || td.tagName == 'OPTION' || td.tagName == 'SELECT' ) && !scb) ) { return; } + if (td.tagName === 'A' || ((td.tagName === 'INPUT' || td.tagName === 'TEXTAREA' || td.tagName === 'OPTION' || td.tagName === 'SELECT' ) && !scb) ) { return; } if(cSel === true) { ri = ptr[0].id; ci = $.jgrid.getCellIndex(td); @@ -2462,7 +2698,7 @@ if (opts && opts.current) { ts.grid.selectionPreserver(ts); } - if(ts.p.datatype=="local"){ $(ts).jqGrid("resetSelection"); if(ts.p.data.length) { refreshIndex();} } + if(ts.p.datatype==="local"){ $(ts).jqGrid("resetSelection"); if(ts.p.data.length) { refreshIndex();} } else if(!ts.p.treeGrid) { ts.p.selrow=null; if(ts.p.multiselect) {ts.p.selarrrow =[];setHeadCheckBox(false);} @@ -2496,7 +2732,7 @@ ri = ptr[0].rowIndex; ci = $.jgrid.getCellIndex(td); $(ts).triggerHandler("jqGridDblClickRow", [$(ptr).attr("id"),ri,ci,e]); - if ($.isFunction(this.p.ondblClickRow)) { ts.p.ondblClickRow.call(ts,$(ptr).attr("id"),ri,ci, e); } + if ($.isFunction(ts.p.ondblClickRow)) { ts.p.ondblClickRow.call(ts,$(ptr).attr("id"),ri,ci, e); } }) .bind('contextmenu', function(e) { td = e.target; @@ -2506,39 +2742,43 @@ ri = ptr[0].rowIndex; ci = $.jgrid.getCellIndex(td); $(ts).triggerHandler("jqGridRightClickRow", [$(ptr).attr("id"),ri,ci,e]); - if ($.isFunction(this.p.onRightClickRow)) { ts.p.onRightClickRow.call(ts,$(ptr).attr("id"),ri,ci, e); } + if ($.isFunction(ts.p.onRightClickRow)) { ts.p.onRightClickRow.call(ts,$(ptr).attr("id"),ri,ci, e); } }); grid.bDiv = document.createElement("div"); if(isMSIE) { if(String(ts.p.height).toLowerCase() === "auto") { ts.p.height = "100%"; } } $(grid.bDiv) - .append($('<div style="position:relative;'+(isMSIE && $.browser.version < 8 ? "height:0.01%;" : "")+'"></div>').append('<div></div>').append(this)) + .append($('<div style="position:relative;'+(isMSIE && $.jgrid.msiever() < 8 ? "height:0.01%;" : "")+'"></div>').append('<div></div>').append(this)) .addClass("ui-jqgrid-bdiv") .css({ height: ts.p.height+(isNaN(ts.p.height)?"":"px"), width: (grid.width)+"px"}) .scroll(grid.scrollGrid); $("table:first",grid.bDiv).css({width:ts.p.tblwidth+"px"}); - if( isMSIE ) { - if( $("tbody",this).length == 2 ) { $("tbody:gt(0)",this).remove();} - if( ts.p.multikey) {$(grid.bDiv).bind("selectstart",function(){return false;});} - } else { - if( ts.p.multikey) {$(grid.bDiv).bind("mousedown",function(){return false;});} + if( !$.support.tbody ) { //IE + if( $("tbody",this).length === 2 ) { $("tbody:gt(0)",this).remove();} } + if(ts.p.multikey){ + if( $.jgrid.msie) { + $(grid.bDiv).bind("selectstart",function(){return false;}); + } else { + $(grid.bDiv).bind("mousedown",function(){return false;}); + } + } if(hg) {$(grid.bDiv).hide();} grid.cDiv = document.createElement("div"); var arf = ts.p.hidegrid===true ? $("<a role='link' href='javascript:void(0)'/>").addClass('ui-jqgrid-titlebar-close HeaderButton').hover( function(){ arf.addClass('ui-state-hover');}, function() {arf.removeClass('ui-state-hover');}) - .append("<span class='ui-icon ui-icon-circle-triangle-n'></span>").css((dir=="rtl"?"left":"right"),"0px") : ""; - $(grid.cDiv).append(arf).append("<span class='ui-jqgrid-title"+(dir=="rtl" ? "-rtl" :"" )+"'>"+ts.p.caption+"</span>") + .append("<span class='ui-icon ui-icon-circle-triangle-n'></span>").css((dir==="rtl"?"left":"right"),"0px") : ""; + $(grid.cDiv).append(arf).append("<span class='ui-jqgrid-title"+(dir==="rtl" ? "-rtl" :"" )+"'>"+ts.p.caption+"</span>") .addClass("ui-jqgrid-titlebar ui-widget-header ui-corner-top ui-helper-clearfix"); $(grid.cDiv).insertBefore(grid.hDiv); if( ts.p.toolbar[0] ) { grid.uDiv = document.createElement("div"); - if(ts.p.toolbar[1] == "top") {$(grid.uDiv).insertBefore(grid.hDiv);} - else if (ts.p.toolbar[1]=="bottom" ) {$(grid.uDiv).insertAfter(grid.hDiv);} - if(ts.p.toolbar[1]=="both") { + if(ts.p.toolbar[1] === "top") {$(grid.uDiv).insertBefore(grid.hDiv);} + else if (ts.p.toolbar[1]==="bottom" ) {$(grid.uDiv).insertAfter(grid.hDiv);} + if(ts.p.toolbar[1]==="both") { grid.ubDiv = document.createElement("div"); - $(grid.uDiv).insertBefore(grid.hDiv).addClass("ui-userdata ui-state-default").attr("id","t_"+this.id); - $(grid.ubDiv).insertAfter(grid.hDiv).addClass("ui-userdata ui-state-default").attr("id","tb_"+this.id); + $(grid.uDiv).addClass("ui-userdata ui-state-default").attr("id","t_"+this.id).insertBefore(grid.hDiv); + $(grid.ubDiv).addClass("ui-userdata ui-state-default").attr("id","tb_"+this.id).insertAfter(grid.hDiv); if(hg) {$(grid.ubDiv).hide();} } else { $(grid.uDiv).width(grid.width).addClass("ui-userdata ui-state-default").attr("id","t_"+this.id); @@ -2549,13 +2789,13 @@ ts.p.toppager = $.jgrid.jqID(ts.p.id)+"_toppager"; grid.topDiv = $("<div id='"+ts.p.toppager+"'></div>")[0]; ts.p.toppager = "#"+ts.p.toppager; - $(grid.topDiv).insertBefore(grid.hDiv).addClass('ui-state-default ui-jqgrid-toppager').width(grid.width); + $(grid.topDiv).addClass('ui-state-default ui-jqgrid-toppager').width(grid.width).insertBefore(grid.hDiv); setPager(ts.p.toppager,'_t'); } if(ts.p.footerrow) { grid.sDiv = $("<div class='ui-jqgrid-sdiv'></div>")[0]; - hb = $("<div class='ui-jqgrid-hbox"+(dir=="rtl"?"-rtl":"")+"'></div>"); - $(grid.sDiv).append(hb).insertAfter(grid.hDiv).width(grid.width); + hb = $("<div class='ui-jqgrid-hbox"+(dir==="rtl"?"-rtl":"")+"'></div>"); + $(grid.sDiv).append(hb).width(grid.width).insertAfter(grid.hDiv); $(hb).append(tfoot); grid.footers = $(".ui-jqgrid-ftable",grid.sDiv)[0].rows[0].cells; if(ts.p.rownumbers) { grid.footers[0].className = 'ui-state-default jqgrid-rownum'; } @@ -2570,14 +2810,14 @@ elems = ".ui-jqgrid-bdiv, .ui-jqgrid-hdiv, .ui-jqgrid-pager, .ui-jqgrid-sdiv", counter, self = this; if(ts.p.toolbar[0]===true) { - if( ts.p.toolbar[1]=='both') { + if( ts.p.toolbar[1]==='both') { elems += ', #' + $(grid.ubDiv).attr('id'); } elems += ', #' + $(grid.uDiv).attr('id'); } counter = $(elems,"#gview_"+$.jgrid.jqID(ts.p.id)).length; - if(ts.p.gridstate == 'visible') { + if(ts.p.gridstate === 'visible') { $(elems,"#gbox_"+$.jgrid.jqID(ts.p.id)).slideUp("fast", function() { counter--; if (counter === 0) { @@ -2588,7 +2828,7 @@ if(onHdCl) {if(!hg) {ts.p.onHeaderClick.call(ts,ts.p.gridstate,e);}} } }); - } else if(ts.p.gridstate == 'hidden'){ + } else if(ts.p.gridstate === 'hidden'){ $(elems,"#gbox_"+$.jgrid.jqID(ts.p.id)).slideDown("fast", function() { counter--; if (counter === 0) { @@ -2627,6 +2867,8 @@ ts.addXmlData = function(d) {addXmlData(d,ts.grid.bDiv);}; ts.addJSONData = function(d) {addJSONData(d,ts.grid.bDiv);}; this.grid.cols = this.rows[0].cells; + $(ts).triggerHandler("jqGridInitGrid"); + if ($.isFunction( ts.p.onInitGrid )) { ts.p.onInitGrid.call(ts); } populate();ts.p.hiddengrid=false; }); @@ -2636,11 +2878,11 @@ var $t = this[0]; if (!$t || !$t.grid) {return;} if (!pName) { return $t.p; } - else {return typeof($t.p[pName]) != "undefined" ? $t.p[pName] : null;} + return $t.p[pName] !== undefined ? $t.p[pName] : null; }, setGridParam : function (newParams){ return this.each(function(){ - if (this.grid && typeof(newParams) === 'object') {$.extend(true,this.p,newParams);} + if (this.grid && typeof newParams === 'object') {$.extend(true,this.p,newParams);} }); }, getDataIDs : function () { @@ -2664,7 +2906,7 @@ var $t = this, stat,pt, ner, ia, tpsr, fid; if(selection === undefined) { return; } onsr = onsr === false ? false : true; - pt=$t.rows.namedItem(selection+""); + pt=$t.rows.namedItem(String(selection)); if(!pt || !pt.className || pt.className.indexOf( 'ui-state-disabled' ) > -1 ) { return; } function scrGrid(iR){ var ch = $($t.grid.bDiv)[0].clientHeight, @@ -2689,7 +2931,7 @@ } if(!$t.p.multiselect) { if(pt.className !== "ui-subgrid") { - if( $t.p.selrow != pt.id) { + if( $t.p.selrow !== pt.id) { $($t.rows.namedItem($t.p.selrow)).removeClass("ui-state-highlight").attr({"aria-selected":"false", "tabindex" : "-1"}); $(pt).addClass("ui-state-highlight").attr({"aria-selected":"true", "tabindex" : "0"});//.focus(); if(fid) { @@ -2701,8 +2943,10 @@ stat = false; } $t.p.selrow = pt.id; - $($t).triggerHandler("jqGridSelectRow", [pt.id, stat, e]); - if( $t.p.onSelectRow && onsr) { $t.p.onSelectRow.call($t, pt.id, stat, e); } + if( onsr ) { + $($t).triggerHandler("jqGridSelectRow", [pt.id, stat, e]); + if( $t.p.onSelectRow) { $t.p.onSelectRow.call($t, pt.id, stat, e); } + } } } else { //unselect selectall checkbox when deselecting a specific row @@ -2729,8 +2973,10 @@ } $("#jqg_"+$.jgrid.jqID($t.p.id)+"_"+$.jgrid.jqID(selection), "#"+$.jgrid.jqID(fid))[$t.p.useProp ? 'prop': 'attr']("checked",stat); } - $($t).triggerHandler("jqGridSelectRow", [pt.id, stat, e]); - if( $t.p.onSelectRow && onsr) { $t.p.onSelectRow.call($t, pt.id , stat, e); } + if( onsr ) { + $($t).triggerHandler("jqGridSelectRow", [pt.id, stat, e]); + if( $t.p.onSelectRow) { $t.p.onSelectRow.call($t, pt.id , stat, e); } + } } }); }, @@ -2740,7 +2986,7 @@ if( t.p.frozenColumns === true ) { fid = t.p.id+"_frozen"; } - if(typeof(rowid) !== "undefined" ) { + if(rowid !== undefined ) { sr = rowid === t.p.selrow ? t.p.selrow : rowid; $("#"+$.jgrid.jqID(t.p.id)+" tbody:first tr#"+$.jgrid.jqID(sr)).removeClass("ui-state-highlight").attr("aria-selected","false"); if (fid) { $("#"+$.jgrid.jqID(sr), "#"+$.jgrid.jqID(fid)).removeClass("ui-state-highlight"); } @@ -2782,7 +3028,7 @@ var res = {}, resall, getall=false, len, j=0; this.each(function(){ var $t = this,nm,ind; - if(typeof(rowid) == 'undefined') { + if(rowid === undefined) { getall = true; resall = []; len = $t.rows.length; @@ -2797,7 +3043,7 @@ $('td[role="gridcell"]',ind).each( function(i) { nm = $t.p.colModel[i].name; if ( nm !== 'cb' && nm !== 'subgrid' && nm !== 'rn') { - if($t.p.treeGrid===true && nm == $t.p.ExpandColumn) { + if($t.p.treeGrid===true && nm === $t.p.ExpandColumn) { res[nm] = $.jgrid.htmlDecode($("span:first",this).html()); } else { try { @@ -2813,16 +3059,14 @@ j++; } }); - return resall ? resall: res; + return resall || res; }, delRowData : function(rowid) { - var success = false, rowInd, ia, ri; + var success = false, rowInd, ia; this.each(function() { var $t = this; rowInd = $t.rows.namedItem(rowid); if(!rowInd) {return false;} - else { - ri = rowInd.rowIndex; $(rowInd).remove(); $t.p.records--; $t.p.reccount--; @@ -2830,14 +3074,17 @@ success=true; if($t.p.multiselect) { ia = $.inArray(rowid,$t.p.selarrrow); - if(ia != -1) { $t.p.selarrrow.splice(ia,1);} + if(ia !== -1) { $t.p.selarrrow.splice(ia,1);} } - if(rowid == $t.p.selrow) {$t.p.selrow=null;} - } - if($t.p.datatype == 'local') { + if ($t.p.multiselect && $t.p.selarrrow.length > 0) { + $t.p.selrow = $t.p.selarrrow[$t.p.selarrrow.length-1]; + } else { + $t.p.selrow = null; + } + if($t.p.datatype === 'local') { var id = $.jgrid.stripPref($t.p.idPrefix, rowid), pos = $t.p._index[id]; - if(typeof(pos) != 'undefined') { + if(pos !== undefined) { $t.p.data.splice(pos,1); $t.refreshIndex(); } @@ -2845,7 +3092,7 @@ if( $t.p.altRows === true && success ) { var cn = $t.p.altclass; $($t.rows).each(function(i){ - if(i % 2 ==1) { $(this).addClass(cn); } + if(i % 2 === 1) { $(this).addClass(cn); } else { $(this).removeClass(cn); } }); } @@ -2863,28 +3110,29 @@ try { $(this.p.colModel).each(function(i){ nm = this.name; - if( data[nm] !== undefined) { - lcdata[nm] = this.formatter && typeof(this.formatter) === 'string' && this.formatter == 'date' ? $.unformat.date.call(t,data[nm],this) : data[nm]; - vl = t.formatter( rowid, data[nm], i, data, 'edit'); + var dval =$.jgrid.getAccessor(data,nm); + if( dval !== undefined) { + lcdata[nm] = this.formatter && typeof this.formatter === 'string' && this.formatter === 'date' ? $.unformat.date.call(t,dval,this) : dval; + vl = t.formatter( rowid, dval, i, data, 'edit'); title = this.title ? {"title":$.jgrid.stripHtml(vl)} : {}; - if(t.p.treeGrid===true && nm == t.p.ExpandColumn) { - $("td:eq("+i+") > span:first",ind).html(vl).attr(title); + if(t.p.treeGrid===true && nm === t.p.ExpandColumn) { + $("td[role='gridcell']:eq("+i+") > span:first",ind).html(vl).attr(title); } else { - $("td:eq("+i+")",ind).html(vl).attr(title); + $("td[role='gridcell']:eq("+i+")",ind).html(vl).attr(title); } } }); - if(t.p.datatype == 'local') { + if(t.p.datatype === 'local') { var id = $.jgrid.stripPref(t.p.idPrefix, rowid), - pos = t.p._index[id]; + pos = t.p._index[id], key; if(t.p.treeGrid) { - for(var key in t.p.treeReader ){ - if(lcdata.hasOwnProperty(t.p.treeReader[key])) { + for(key in t.p.treeReader){ + if(t.p.treeReader.hasOwnProperty(key)) { delete lcdata[t.p.treeReader[key]]; } } } - if(typeof(pos) != 'undefined') { + if(pos !== undefined) { t.p.data[pos] = $.extend(true, t.p.data[pos], lcdata); } lcdata = null; @@ -2918,12 +3166,12 @@ gi = t.p.multiselect ===true ? 1 :0; si = t.p.subGrid===true ? 1 :0; if(!aradd) { - if(typeof(rowid) != 'undefined') { rowid = rowid+"";} + if(rowid !== undefined) { rowid = String(rowid);} else { rowid = $.jgrid.randId(); if(t.p.keyIndex !== false) { cnm = t.p.colModel[t.p.keyIndex+gi+si+ni].name; - if(typeof rdata[0][cnm] != "undefined") { rowid = rdata[0][cnm]; } + if(rdata[0][cnm] !== undefined) { rowid = rdata[0][cnm]; } } } } @@ -2934,7 +3182,12 @@ data = rdata[k]; row=[]; if(aradd) { - try {rowid = data[cnm];} + try { + rowid = data[cnm]; + if(rowid===undefined) { + rowid = $.jgrid.randId(); + } + } catch (e) {rowid = $.jgrid.randId();} cna = t.p.altRows === true ? (t.rows.length-1)%2 === 0 ? cn : "" : ""; } @@ -2957,7 +3210,7 @@ nm = cm.name; lcdata[nm] = data[nm]; v = t.formatter( rowid, $.jgrid.getAccessor(data,nm), i, data ); - prp = t.formatCol(i,1,v, data, rowid, true); + prp = t.formatCol(i,1,v, data, rowid, lcdata); row[row.length] = "<td role=\"gridcell\" "+prp+">"+v+"</td>"; } row.unshift( t.constructTr(rowid, false, cna, lcdata, data, false ) ); @@ -2997,7 +3250,7 @@ $(t).triggerHandler("jqGridAfterInsertRow", [rowid,data,data]); if(air) { t.p.afterInsertRow.call(t,rowid,data,data); } k++; - if(t.p.datatype == 'local') { + if(t.p.datatype === 'local') { lcdata[t.p.localReader.id] = id; t.p._index[id] = t.p.data.length; t.p.data.push(lcdata); @@ -3005,11 +3258,11 @@ } } if( t.p.altRows === true && !aradd) { - if (pos == "last") { - if ((t.rows.length-1)%2 == 1) {$(t.rows[t.rows.length-1]).addClass(cn);} + if (pos === "last") { + if ((t.rows.length-1)%2 === 1) {$(t.rows[t.rows.length-1]).addClass(cn);} } else { $(t.rows).each(function(i){ - if(i % 2 ==1) { $(this).addClass(cn); } + if(i % 2 ===1) { $(this).addClass(cn); } else { $(this).removeClass(cn); } }); } @@ -3023,41 +3276,42 @@ footerData : function(action,data, format) { var nm, success=false, res={}, title; function isEmpty(obj) { - for(var i in obj) { + var i; + for(i in obj) { if (obj.hasOwnProperty(i)) { return false; } } return true; } - if(typeof(action) == "undefined") { action = "get"; } - if(typeof(format) != "boolean") { format = true; } + if(action === undefined) { action = "get"; } + if(typeof format !== "boolean") { format = true; } action = action.toLowerCase(); this.each(function(){ var t = this, vl; if(!t.grid || !t.p.footerrow) {return false;} - if(action == "set") { if(isEmpty(data)) { return false; } } + if(action === "set") { if(isEmpty(data)) { return false; } } success=true; $(this.p.colModel).each(function(i){ nm = this.name; - if(action == "set") { + if(action === "set") { if( data[nm] !== undefined) { vl = format ? t.formatter( "", data[nm], i, data, 'edit') : data[nm]; title = this.title ? {"title":$.jgrid.stripHtml(vl)} : {}; $("tr.footrow td:eq("+i+")",t.grid.sDiv).html(vl).attr(title); success = true; } - } else if(action == "get") { + } else if(action === "get") { res[nm] = $("tr.footrow td:eq("+i+")",t.grid.sDiv).html(); } }); }); - return action == "get" ? res : success; + return action === "get" ? res : success; }, showHideCol : function(colname,show) { return this.each(function() { - var $t = this, fndh=false, brd=$.jgrid.cellWidth()? 0: $t.p.cellLayout, cw; + var $t = this, fndh=false, brd=$.jgrid.cell_width ? 0: $t.p.cellLayout, cw; if (!$t.grid ) {return;} if( typeof colname === 'string') {colname=[colname];} - show = show != "none" ? "" : "none"; + show = show !== "none" ? "" : "none"; var sw = show === "" ? true :false, gh = $t.p.groupHeader && (typeof $t.p.groupHeader === 'object' || $.isFunction($t.p.groupHeader) ); if(gh) { $($t).jqGrid('destroyGroupHeader', false); } @@ -3152,9 +3406,8 @@ return this.each(function(){ if (!this.grid ) {return;} var $t = this, cw, - initwidth = 0, brd=$.jgrid.cellWidth() ? 0: $t.p.cellLayout, lvc, vc=0, hs=false, scw=$t.p.scrollOffset, aw, gw=0, - cl = 0,cr; - if(typeof shrink != 'boolean') { + initwidth = 0, brd=$.jgrid.cell_width ? 0: $t.p.cellLayout, lvc, vc=0, hs=false, scw=$t.p.scrollOffset, aw, gw=0, cr; + if(typeof shrink !== 'boolean') { shrink=$t.p.shrinkToFit; } if(isNaN(nwidth)) {return;} @@ -3168,7 +3421,7 @@ if($t.p.toppager ) {$($t.p.toppager).css("width",nwidth+"px");} if($t.p.toolbar[0] === true){ $($t.grid.uDiv).css("width",nwidth+"px"); - if($t.p.toolbar[1]=="both") {$($t.grid.ubDiv).css("width",nwidth+"px");} + if($t.p.toolbar[1]==="both") {$($t.grid.ubDiv).css("width",nwidth+"px");} } if($t.p.footerrow) { $($t.grid.sDiv).css("width",nwidth+"px"); } if(shrink ===false && $t.p.forceFit === true) {$t.p.forceFit=false;} @@ -3182,7 +3435,6 @@ } else { vc++; } - cl++; } }); if(vc === 0) { return; } @@ -3272,9 +3524,9 @@ return this.each(function(){ var $t = this, pos=-1; if(!$t.grid) {return;} - if(typeof(colname) != "undefined") { + if(colname !== undefined) { $($t.p.colModel).each(function(i){ - if (this.name == colname) { + if (this.name === colname) { pos = i;return false; } }); @@ -3299,7 +3551,7 @@ if(!$t.grid) {return;} if(isNaN(colname)) { $($t.p.colModel).each(function(i){ - if (this.name == colname) { + if (this.name === colname) { pos = i;return false; } }); @@ -3316,11 +3568,11 @@ } else { $(tcell).html(v).attr(title); } - if($t.p.datatype == "local") { + if($t.p.datatype === "local") { var cm = $t.p.colModel[pos], index; - nData = cm.formatter && typeof(cm.formatter) === 'string' && cm.formatter == 'date' ? $.unformat.date.call($t,nData,cm) : nData; - index = $t.p._index[rowid]; - if(typeof index != "undefined") { + nData = cm.formatter && typeof cm.formatter === 'string' && cm.formatter === 'date' ? $.unformat.date.call($t,nData,cm) : nData; + index = $t.p._index[$.jgrid.stripPref($t.p.idPrefix, rowid)]; + if(index !== undefined) { $t.p.data[index][cm.name] = nData; } } @@ -3362,8 +3614,8 @@ }, getCol : function (col, obj, mathopr) { var ret = [], val, sum=0, min, max, v; - obj = typeof (obj) != 'boolean' ? false : obj; - if(typeof mathopr == 'undefined') { mathopr = false; } + obj = typeof obj !== 'boolean' ? false : obj; + if(mathopr === undefined) { mathopr = false; } this.each(function(){ var $t=this, pos=-1; if(!$t.grid) {return;} @@ -3387,7 +3639,7 @@ if(mathopr) { v = parseFloat(val); sum += v; - if (max === undefined) {max = min = v} + if (max === undefined) {max = min = v;} min = Math.min(min, v); max = Math.max(max, v); } @@ -3414,7 +3666,7 @@ return this.each(function(){ var $t = this; if(!$t.grid) {return;} - if(typeof clearfooter != 'boolean') { clearfooter = false; } + if(typeof clearfooter !== 'boolean') { clearfooter = false; } if($t.p.deepempty) {$("#"+$.jgrid.jqID($t.p.id)+" tbody:first tr:gt(0)").remove();} else { var trf = $("#"+$.jgrid.jqID($t.p.id)+" tbody:first tr:first")[0]; @@ -3454,7 +3706,7 @@ expanded = $t.p.treeReader.expanded_field; //check for arrow keys if(target) { - mind = $t.p._index[target.id]; + mind = $t.p._index[$.jgrid.stripPref($t.p.idPrefix, target.id)]; if(event.keyCode === 37 || event.keyCode === 38 || event.keyCode === 39 || event.keyCode === 40){ // up key if(event.keyCode === 38 ){ @@ -3535,8 +3787,8 @@ getLocalRow : function (rowid) { var ret = false, ind; this.each(function(){ - if(typeof(rowid) !== "undefined") { - ind = this.p._index[rowid]; + if(rowid !== undefined) { + ind = this.p._index[$.jgrid.stripPref(this.p.idPrefix, rowid)]; if(ind >= 0 ) { ret = this.p.data[ind]; } @@ -3546,6 +3798,8 @@ } }); })(jQuery); +/*jshint eqeqeq:false */ +/*global jQuery */ (function($){ /** * jqGrid extension for custom methods @@ -3558,15 +3812,14 @@ * http://www.opensource.org/licenses/mit-license.php * http://www.gnu.org/licenses/gpl-2.0.html **/ -/*global jQuery, $ */ "use strict"; $.jgrid.extend({ getColProp : function(colname){ var ret ={}, $t = this[0]; if ( !$t.grid ) { return false; } - var cM = $t.p.colModel; - for ( var i =0;i<cM.length;i++ ) { - if ( cM[i].name == colname ) { + var cM = $t.p.colModel, i; + for ( i=0;i<cM.length;i++ ) { + if ( cM[i].name === colname ) { ret = cM[i]; break; } @@ -3578,10 +3831,10 @@ return this.each(function(){ if ( this.grid ) { if ( obj ) { - var cM = this.p.colModel; - for ( var i =0;i<cM.length;i++ ) { - if ( cM[i].name == colname ) { - $.extend(this.p.colModel[i],obj); + var cM = this.p.colModel, i; + for ( i=0;i<cM.length;i++ ) { + if ( cM[i].name === colname ) { + $.extend(true, this.p.colModel[i],obj); break; } } @@ -3591,16 +3844,16 @@ }, sortGrid : function(colname,reload, sor){ return this.each(function(){ - var $t=this,idx=-1; + var $t=this,idx=-1,i; if ( !$t.grid ) { return;} if ( !colname ) { colname = $t.p.sortname; } - for ( var i=0;i<$t.p.colModel.length;i++ ) { - if ( $t.p.colModel[i].index == colname || $t.p.colModel[i].name==colname ) { + for ( i=0;i<$t.p.colModel.length;i++ ) { + if ( $t.p.colModel[i].index === colname || $t.p.colModel[i].name === colname ) { idx = i; break; } } - if ( idx!=-1 ){ + if ( idx !== -1 ){ var sort = $t.p.colModel[idx].sortable; if ( typeof sort !== 'boolean' ) { sort = true; } if ( typeof reload !=='boolean' ) { reload = false; } @@ -3681,16 +3934,16 @@ $("#gbox_"+gid).remove(); }); }, - setGridState : function(state) { + setGridState : function(state) { return this.each(function(){ if ( !this.grid ) {return;} var $t = this; - if(state == 'hidden'){ + if(state === 'hidden'){ $(".ui-jqgrid-bdiv, .ui-jqgrid-hdiv","#gview_"+$.jgrid.jqID($t.p.id)).slideUp("fast"); if($t.p.pager) {$($t.p.pager).slideUp("fast");} if($t.p.toppager) {$($t.p.toppager).slideUp("fast");} if($t.p.toolbar[0]===true) { - if( $t.p.toolbar[1]=='both') { + if( $t.p.toolbar[1] === 'both') { $($t.grid.ubDiv).slideUp("fast"); } $($t.grid.uDiv).slideUp("fast"); @@ -3698,12 +3951,12 @@ if($t.p.footerrow) { $(".ui-jqgrid-sdiv","#gbox_"+$.jgrid.jqID($t.p.id)).slideUp("fast"); } $(".ui-jqgrid-titlebar-close span",$t.grid.cDiv).removeClass("ui-icon-circle-triangle-n").addClass("ui-icon-circle-triangle-s"); $t.p.gridstate = 'hidden'; - } else if(state=='visible') { + } else if(state === 'visible') { $(".ui-jqgrid-hdiv, .ui-jqgrid-bdiv","#gview_"+$.jgrid.jqID($t.p.id)).slideDown("fast"); if($t.p.pager) {$($t.p.pager).slideDown("fast");} if($t.p.toppager) {$($t.p.toppager).slideDown("fast");} if($t.p.toolbar[0]===true) { - if( $t.p.toolbar[1]=='both') { + if( $t.p.toolbar[1] === 'both') { $($t.grid.ubDiv).slideDown("fast"); } $($t.grid.uDiv).slideDown("fast"); @@ -3726,18 +3979,28 @@ searchurl : '', stringResult: false, groupOp: 'AND', - defaultSearch : "bw" - },p || {}); + defaultSearch : "bw", + searchOperators : false, + operandTitle : "Click to select search operation.", + operands : { "eq" :"==", "ne":"!","lt":"<","le":"<=","gt":">","ge":">=","bw":"^","bn":"!^","in":"=","ni":"!=","ew":"|","en":"!@","cn":"~","nc":"!~","nu":"#","nn":"!#"} + }, $.jgrid.search , p || {}); return this.each(function(){ var $t = this; if(this.ftoolbar) { return; } var triggerToolbar = function() { var sdata={}, j=0, v, nm, sopt={},so; $.each($t.p.colModel,function(){ + var $elem = $("#gs_"+$.jgrid.jqID(this.name), (this.frozen===true && $t.p.frozenColumns === true) ? $t.grid.fhDiv : $t.grid.hDiv); nm = this.index || this.name; - so = (this.searchoptions && this.searchoptions.sopt) ? this.searchoptions.sopt[0] : this.stype=='select'? 'eq' : p.defaultSearch; - v = $("#gs_"+$.jgrid.jqID(this.name), (this.frozen===true && $t.p.frozenColumns === true) ? $t.grid.fhDiv : $t.grid.hDiv).val(); - if(v) { + if(p.searchOperators ) { + so = $elem.parent().prev().children("a").attr("soper") || p.defaultSearch; + } else { + so = (this.searchoptions && this.searchoptions.sopt) ? this.searchoptions.sopt[0] : this.stype==='select'? 'eq' : p.defaultSearch; + } + v = this.stype === "custom" && $.isFunction(this.searchoptions.custom_value) && $elem.length > 0 && $elem[0].nodeName.toUpperCase() === "SPAN" ? + this.searchoptions.custom_value.call($t, $elem.children(".customelement:first"), "get") : + $elem.val(); + if(v || so==="nu" || so==="nn") { sdata[nm] = v; sopt[nm] = so; j++; @@ -3748,7 +4011,7 @@ } }); var sd = j>0 ? true : false; - if(p.stringResult === true || $t.p.datatype == "local") { + if(p.stringResult === true || $t.p.datatype === "local") { var ruleGroup = "{\"groupOp\":\"" + p.groupOp + "\",\"rules\":["; var gi=0; $.each(sdata,function(i,n){ @@ -3778,19 +4041,19 @@ if(saveurl) {$($t).jqGrid("setGridParam",{url:saveurl});} $($t).triggerHandler("jqGridToolbarAfterSearch"); if($.isFunction(p.afterSearch)){p.afterSearch.call($t);} - }; - var clearToolbar = function(trigger){ + }, + clearToolbar = function(trigger){ var sdata={}, j=0, nm; - trigger = (typeof trigger != 'boolean') ? true : trigger; + trigger = (typeof trigger !== 'boolean') ? true : trigger; $.each($t.p.colModel,function(){ - var v; + var v, $elem = $("#gs_"+$.jgrid.jqID(this.name),(this.frozen===true && $t.p.frozenColumns === true) ? $t.grid.fhDiv : $t.grid.hDiv); if(this.searchoptions && this.searchoptions.defaultValue !== undefined) { v = this.searchoptions.defaultValue; } nm = this.index || this.name; switch (this.stype) { case 'select' : - $("#gs_"+$.jgrid.jqID(this.name)+" option",(this.frozen===true && $t.p.frozenColumns === true) ? $t.grid.fhDiv : $t.grid.hDiv).each(function (i){ + $elem.find("option").each(function (i){ if(i===0) { this.selected = true; } - if ($(this).val() == v) { + if ($(this).val() === v) { this.selected = true; return false; } @@ -3806,7 +4069,7 @@ } break; case 'text': - $("#gs_"+$.jgrid.jqID(this.name),(this.frozen===true && $t.p.frozenColumns === true) ? $t.grid.fhDiv : $t.grid.hDiv).val(v); + $elem.val(v); if(v !== undefined) { sdata[nm] = v; j++; @@ -3816,10 +4079,15 @@ } catch (y){} } break; + case 'custom': + if ($.isFunction(this.searchoptions.custom_value) && $elem.length > 0 && $elem[0].nodeName.toUpperCase() === "SPAN") { + this.searchoptions.custom_value.call($t, $elem.children(".customelement:first"), "set", v); + } + break; } }); var sd = j>0 ? true : false; - if(p.stringResult === true || $t.p.datatype == "local") { + if(p.stringResult === true || $t.p.datatype === "local") { var ruleGroup = "{\"groupOp\":\"" + p.groupOp + "\",\"rules\":["; var gi=0; $.each(sdata,function(i,n){ @@ -3853,11 +4121,11 @@ if(saveurl) {$($t).jqGrid("setGridParam",{url:saveurl});} $($t).triggerHandler("jqGridToolbarAfterClear"); if($.isFunction(p.afterClear)){p.afterClear();} - }; - var toggleToolbar = function(){ + }, + toggleToolbar = function(){ var trow = $("tr.ui-search-toolbar",$t.grid.hDiv), trow2 = $t.p.frozenColumns === true ? $("tr.ui-search-toolbar",$t.grid.fhDiv) : false; - if(trow.css("display")=='none') { + if(trow.css("display") === 'none') { trow.show(); if(trow2) { trow2.show(); @@ -3868,31 +4136,82 @@ trow2.hide(); } } + }, + buildRuleMenu = function( elem, left, top ){ + $("#sopt_menu").remove(); + + left=parseInt(left,10); + top=parseInt(top,10) + 18; + + var fs = $('.ui-jqgrid-view').css('font-size') || '11px'; + var str = '<ul id="sopt_menu" class="ui-search-menu" role="menu" tabindex="0" style="font-size:'+fs+';left:'+left+'px;top:'+top+'px;">', + selected = $(elem).attr("soper"), selclass, + aoprs = [], ina; + var i=0, nm =$(elem).attr("colname"),len = $t.p.colModel.length; + while(i<len) { + if($t.p.colModel[i].name === nm) { + break; + } + i++; + } + var cm = $t.p.colModel[i], options = $.extend({}, cm.searchoptions); + if(!options.sopt) { + options.sopt = []; + options.sopt[0]= cm.stype==='select' ? 'eq' : p.defaultSearch; + } + $.each(p.odata, function() { aoprs.push(this.oper); }); + for ( i = 0 ; i < options.sopt.length; i++) { + ina = $.inArray(options.sopt[i],aoprs); + if(ina !== -1) { + selclass = selected === p.odata[ina].oper ? "ui-state-highlight" : ""; + str += '<li class="ui-menu-item '+selclass+'" role="presentation"><a class="ui-corner-all g-menu-item" tabindex="0" role="menuitem" value="'+p.odata[ina].oper+'" oper="'+p.operands[p.odata[ina].oper]+'"><table cellspacing="0" cellpadding="0" border="0"><tr><td width="25px">'+p.operands[p.odata[ina].oper]+'</td><td>'+ p.odata[ina].text+'</td></tr></table></a></li>'; + } + } + str += "</ul>"; + $('body').append(str); + $("#sopt_menu").addClass("ui-menu ui-widget ui-widget-content ui-corner-all"); + $("#sopt_menu > li > a").hover( + function(){ $(this).addClass("ui-state-hover"); }, + function(){ $(this).removeClass("ui-state-hover"); } + ).click(function( e ){ + var v = $(this).attr("value"), + oper = $(this).attr("oper"); + $($t).triggerHandler("jqGridToolbarSelectOper", [v, oper, elem]); + $("#sopt_menu").hide(); + $(elem).text(oper).attr("soper",v); + if(p.autosearch===true){ + var inpelm = $(elem).parent().next().children()[0]; + if( $(inpelm).val() || v==="nu" || v ==="nn") { + triggerToolbar(); + } + } + }); }; // create the row - function bindEvents(selector, events) { - var jElem = $(selector); - if (jElem[0]) { - jQuery.each(events, function() { - if (this.data !== undefined) { - jElem.bind(this.type, this.data, this.fn); - } else { - jElem.bind(this.type, this.fn); - } - }); - } - } var tr = $("<tr class='ui-search-toolbar' role='rowheader'></tr>"); var timeoutHnd; $.each($t.p.colModel,function(){ - var cm=this, thd , th, soptions,surl,self; - th = $("<th role='columnheader' class='ui-state-default ui-th-column ui-th-"+$t.p.direction+"'></th>"); - thd = $("<div style='width:100%;position:relative;height:100%;padding-right:0.3em;'></div>"); + var cm=this, soptions, surl, self, select = "", sot="=", so, i, + th = $("<th role='columnheader' class='ui-state-default ui-th-column ui-th-"+$t.p.direction+"'></th>"), + thd = $("<div style='position:relative;height:100%;padding-right:0.3em;padding-left:0.3em;'></div>"), + stbl = $("<table class='ui-search-table' cellspacing='0'><tr><td class='ui-search-oper'></td><td class='ui-search-input'></td></tr></table>"); if(this.hidden===true) { $(th).css("display","none");} this.search = this.search === false ? false : true; - if(typeof this.stype == 'undefined' ) {this.stype='text';} + if(this.stype === undefined) {this.stype='text';} soptions = $.extend({},this.searchoptions || {}); if(this.search){ + if(p.searchOperators) { + so = (soptions.sopt) ? soptions.sopt[0] : cm.stype==='select' ? 'eq' : p.defaultSearch; + for(i = 0;i<p.odata.length;i++) { + if(p.odata[i].oper === so) { + sot = p.operands[so] || ""; + break; + } + } + var st = soptions.searchtitle != null ? soptions.searchtitle : p.operandTitle; + select = "<a title='"+st+"' style='padding-right: 0.5em;' soper='"+so+"' class='soptclass' colname='"+this.name+"'>"+sot+"</a>"; + } + $("td:eq(0)",stbl).append(select); switch (this.stype) { case "select": @@ -3907,17 +4226,20 @@ success: function(res) { if(soptions.buildSelect !== undefined) { var d = soptions.buildSelect(res); - if (d) { $(self).append(d); } + if (d) { + $("td:eq(1)",stbl).append(d); + $(self).append(stbl); + } } else { - $(self).append(res); + $("td:eq(1)",stbl).append(res); + $(self).append(stbl); } if(soptions.defaultValue !== undefined) { $("select",self).val(soptions.defaultValue); } $("select",self).attr({name:cm.index || cm.name, id: "gs_"+cm.name}); if(soptions.attr) {$("select",self).attr(soptions.attr);} $("select",self).css({width: "100%"}); // preserve autoserch - if(soptions.dataInit !== undefined) { soptions.dataInit($("select",self)[0]); } - if(soptions.dataEvents !== undefined) { bindEvents($("select",self)[0],soptions.dataEvents); } + $.jgrid.bindEv.call($t, $("select",self)[0], soptions); if(p.autosearch===true){ $("select",self).change(function(){ triggerToolbar(); @@ -3942,17 +4264,17 @@ var elem = document.createElement("select"); elem.style.width = "100%"; $(elem).attr({name:cm.index || cm.name, id: "gs_"+cm.name}); - var so, sv, ov; + var sv, ov, key, k; if(typeof oSv === "string") { so = oSv.split(delim); - for(var k=0; k<so.length;k++){ + for(k=0; k<so.length;k++){ sv = so[k].split(sep); ov = document.createElement("option"); ov.value = sv[0]; ov.innerHTML = sv[1]; elem.appendChild(ov); } } else if(typeof oSv === "object" ) { - for ( var key in oSv) { + for (key in oSv) { if(oSv.hasOwnProperty(key)) { ov = document.createElement("option"); ov.value = key; ov.innerHTML = oSv[key]; @@ -3962,9 +4284,9 @@ } if(soptions.defaultValue !== undefined) { $(elem).val(soptions.defaultValue); } if(soptions.attr) {$(elem).attr(soptions.attr);} - if(soptions.dataInit !== undefined) { soptions.dataInit(elem); } - if(soptions.dataEvents !== undefined) { bindEvents(elem, soptions.dataEvents); } - $(thd).append(elem); + $.jgrid.bindEv.call($t, elem , soptions); + $("td:eq(1)",stbl).append( elem ); + $(thd).append(stbl); if(p.autosearch===true){ $(elem).change(function(){ triggerToolbar(); @@ -3974,17 +4296,19 @@ } } break; - case 'text': + case "text": var df = soptions.defaultValue !== undefined ? soptions.defaultValue: ""; - $(thd).append("<input type='text' style='width:95%;padding:0px;' name='"+(cm.index || cm.name)+"' id='gs_"+cm.name+"' value='"+df+"'/>"); + + $("td:eq(1)",stbl).append("<input type='text' style='width:100%;padding:0px;' name='"+(cm.index || cm.name)+"' id='gs_"+cm.name+"' value='"+df+"'/>"); + $(thd).append(stbl); + if(soptions.attr) {$("input",thd).attr(soptions.attr);} - if(soptions.dataInit !== undefined) { soptions.dataInit($("input",thd)[0]); } - if(soptions.dataEvents !== undefined) { bindEvents($("input",thd)[0], soptions.dataEvents); } + $.jgrid.bindEv.call($t, $("input",thd)[0], soptions); if(p.autosearch===true){ if(p.searchOnEnter) { $("input",thd).keypress(function(e){ - var key = e.charCode ? e.charCode : e.keyCode ? e.keyCode : 0; - if(key == 13){ + var key = e.charCode || e.keyCode || 0; + if(key === 13){ triggerToolbar(); return false; } @@ -4012,22 +4336,71 @@ } } break; + case "custom": + $("td:eq(1)",stbl).append("<span style='width:95%;padding:0px;' name='"+(cm.index || cm.name)+"' id='gs_"+cm.name+"'/>"); + $(thd).append(stbl); + try { + if($.isFunction(soptions.custom_element)) { + var celm = soptions.custom_element.call($t,soptions.defaultValue !== undefined ? soptions.defaultValue: "",soptions); + if(celm) { + celm = $(celm).addClass("customelement"); + $(thd).find(">span").append(celm); + } else { + throw "e2"; + } + } else { + throw "e1"; + } + } catch (e) { + if (e === "e1") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_element' "+$.jgrid.edit.msg.nodefined,$.jgrid.edit.bClose);} + if (e === "e2") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_element' "+$.jgrid.edit.msg.novalue,$.jgrid.edit.bClose);} + else { $.jgrid.info_dialog($.jgrid.errors.errcap,typeof e==="string"?e:e.message,$.jgrid.edit.bClose); } + } + break; } } $(th).append(thd); $(tr).append(th); + if(!p.searchOperators) { + $("td:eq(0)",stbl).hide(); + } }); $("table thead",$t.grid.hDiv).append(tr); + if(p.searchOperators) { + $(".soptclass").click(function(e){ + var offset = $(this).offset(), + left = ( offset.left ), + top = ( offset.top); + buildRuleMenu(this, left, top ); + e.stopPropagation(); + }); + $("body").on('click', function(e){ + if(e.target.className !== "soptclass") { + $("#sopt_menu").hide(); + } + }); + } this.ftoolbar = true; this.triggerToolbar = triggerToolbar; this.clearToolbar = clearToolbar; this.toggleToolbar = toggleToolbar; }); }, - + destroyFilterToolbar: function () { + return this.each(function () { + if (!this.ftoolbar) { + return; + } + this.triggerToolbar = null; + this.clearToolbar = null; + this.toggleToolbar = null; + this.ftoolbar = false; + $(this.grid.hDiv).find("table thead tr.ui-search-toolbar").remove(); + }); + }, destroyGroupHeader : function(nullHeader) { - if(typeof(nullHeader) == 'undefined') { + if(nullHeader === undefined) { nullHeader = true; } return this.each(function() @@ -4065,7 +4438,6 @@ } }); }, - setGroupHeaders : function ( o ) { o = $.extend({ useColSpanStyle : false, @@ -4096,8 +4468,8 @@ } var $firstRow, inColumnHeader = function (text, columnHeaders) { - var i = 0, length = columnHeaders.length; - for (; i < length; i++) { + var length = columnHeaders.length, i; + for (i = 0; i < length; i++) { if (columnHeaders[i].startColumnName === text) { return i; } @@ -4236,7 +4608,7 @@ top = top + $($t.grid.topDiv).outerHeight(); } if($t.p.toolbar[0] === true) { - if($t.p.toolbar[1] != "bottom") { + if($t.p.toolbar[1] !== "bottom") { top = top + $($t.grid.uDiv).outerHeight(); } } @@ -4249,9 +4621,14 @@ $("tr.jqg-first-row-header, tr.jqg-third-row-header", htbl).each(function(){ $("th:gt("+maxfrozen+")",this).remove(); }); - var swapfroz = -1, fdel = -1; + var swapfroz = -1, fdel = -1, cs, rs; $("tr.jqg-second-row-header th", htbl).each(function(){ - var cs= parseInt($(this).attr("colspan"),10); + cs= parseInt($(this).attr("colspan"),10); + rs= parseInt($(this).attr("rowspan"),10); + if(rs) { + swapfroz++; + fdel++; + } if(cs) { swapfroz = swapfroz+cs; fdel++; @@ -4284,7 +4661,7 @@ $("tr:first td:eq("+index+")",btd).width( w ); }); // sorting stuff - $($t).bind('jqGridOnSortCol.setFrozenColumns', function (index, idxcol) { + $($t).bind('jqGridOnSortCol.setFrozenColumns', function (e, index, idxcol) { var previousSelectedTh = $("tr.ui-jqgrid-labels:last th:eq("+$t.p.lastsort+")",$t.grid.fhDiv), newSelectedTh = $("tr.ui-jqgrid-labels:last th:eq("+idxcol+")",$t.grid.fhDiv); @@ -4293,7 +4670,7 @@ $("span.ui-icon-"+$t.p.sortorder,newSelectedTh).removeClass('ui-state-disabled'); $(newSelectedTh).attr("aria-selected","true"); if(!$t.p.viewsortcols[0]) { - if($t.p.lastsort != idxcol) { + if($t.p.lastsort !== idxcol) { $("span.s-ico",previousSelectedTh).hide(); $("span.s-ico",newSelectedTh).show(); } @@ -4303,15 +4680,15 @@ // data stuff //TODO support for setRowData $("#gview_"+$.jgrid.jqID($t.p.id)).append($t.grid.fbDiv); - jQuery($t.grid.bDiv).scroll(function () { - jQuery($t.grid.fbDiv).scrollTop(jQuery(this).scrollTop()); + $($t.grid.bDiv).scroll(function () { + $($t.grid.fbDiv).scrollTop($(this).scrollTop()); }); if($t.p.hoverrows === true) { $("#"+$.jgrid.jqID($t.p.id)).unbind('mouseover').unbind('mouseout'); } $($t).bind('jqGridAfterGridComplete.setFrozenColumns', function () { $("#"+$.jgrid.jqID($t.p.id)+"_frozen").remove(); - jQuery($t.grid.fbDiv).height( jQuery($t.grid.bDiv).height()-16); + $($t.grid.fbDiv).height($($t.grid.bDiv).height()-16); var btbl = $("#"+$.jgrid.jqID($t.p.id)).clone(true); $("tr",btbl).each(function(){ $("td:gt("+maxfrozen+")",this).remove(); @@ -4361,7 +4738,8 @@ }); } }); -})(jQuery);/* +})(jQuery); +/* * jqModal - Minimalist Modaling with jQuery * (http://dev.iceburg.net/jquery/jqmodal/) * @@ -4407,7 +4785,6 @@ else o=F; h.o=(o)?o.addClass(c.overlayClass).prependTo('body'):F; - if(ie6){$('html,body').css({height:'100%',width:'100%'});if(o){o=o.css({position:'absolute'})[0];for(var y in {Top:1,Left:1})o.style.setExpression(y.toLowerCase(),"(_=(document.documentElement.scroll"+y+" || document.body.scroll"+y+"))+'px'");}} if(c.ajax) {var r=c.target||h.w,u=c.ajax;r=(typeof r == 'string')?$(r,h.w):$(r);u=(u.substr(0,1) == '@')?$(t).attr(u.substring(1)):u; r.html(c.ajaxText).load(u,function(){if(c.onLoad)c.onLoad.call(this,h);if(cc)h.w.jqmAddClose($(cc,h.w));e(h);});} @@ -4422,11 +4799,11 @@ if(h.c.onHide)h.c.onHide(h);else{h.w.hide();if(h.o)h.o.remove();} return F; }, params:{}}; -var s=0,H=$.jqm.hash,A=[],ie6=$.browser.msie&&($.browser.version == "6.0"),F=false, -e=function(h){var i=$('<iframe src="javascript:false;document.write(\'\');" class="jqm"></iframe>').css({opacity:0});if(ie6)if(h.o)h.o.html('<p style="width:100%;height:100%"/>').prepend(i);else if(!$('iframe.jqm',h.w)[0])h.w.prepend(i); f(h);}, +var s=0,H=$.jqm.hash,A=[],F=false, +e=function(h){f(h);}, f=function(h){try{$(':input:visible',h.w)[0].focus();}catch(_){}}, L=function(t){$(document)[t]("keypress",m)[t]("keydown",m)[t]("mousedown",m);}, -m=function(e){var h=H[A[A.length-1]],r=(!$(e.target).parents('.jqmID'+h.s)[0]);if(r)f(h);return !r;}, +m=function(e){var h=H[A[A.length-1]],r=(!$(e.target).parents('.jqmID'+h.s)[0]);if(r){$('.jqmID'+h.s).each(function(){var $self=$(this),offset=$self.offset();if(offset.top<=e.pageY && e.pageY<=offset.top+$self.height() && offset.left<=e.pageX && e.pageX<=offset.left+$self.width()){r=false;return false;}});f(h);}return !r;}, hs=function(w,t,c){return w.each(function(){var s=this._jqm;$(t).each(function() { if(!this[c]){this[c]=[];$(this).click(function(){for(var i in {jqmShow:1,jqmHide:1})for(var s in this[i])if(H[this[i][s]])H[this[i][s]].w[i](this);return F;});}this[c].push(s);});});}; })(jQuery);/* @@ -4851,8 +5228,10 @@ * http://www.gnu.org/licenses/gpl-2.0.html * **/ +/*jshint eqeqeq:false */ +/*global jQuery */ -;(function($) { +(function($) { "use strict"; $.fmatter = {}; //opts can be id:row id for the row, rowdata:the data for the row, colmodel:the column model for this column @@ -4870,19 +5249,14 @@ isNumber : function(o) { return typeof o === 'number' && isFinite(o); }, - isNull : function(o) { - return o === null; - }, - isUndefined : function(o) { - return typeof o === 'undefined'; - }, isValue : function (o) { return (this.isObject(o) || this.isString(o) || this.isNumber(o) || this.isBoolean(o)); }, isEmpty : function(o) { if(!this.isString(o) && this.isValue(o)) { return false; - }else if (!this.isValue(o)){ + } + if (!this.isValue(o)){ return true; } o = $.trim(o).replace(/\&nbsp\;/ig,'').replace(/\&#160\;/ig,''); @@ -4907,14 +5281,14 @@ } if($.fmatter.isNumber(nData)) { var bNegative = (nData < 0); - var sOutput = nData + ""; - var sDecimalSeparator = (opts.decimalSeparator) ? opts.decimalSeparator : "."; + var sOutput = String(nData); + var sDecimalSeparator = opts.decimalSeparator || "."; var nDotIndex; if($.fmatter.isNumber(opts.decimalPlaces)) { // Round to the correct decimal place var nDecimalPlaces = opts.decimalPlaces; var nDecimal = Math.pow(10, nDecimalPlaces); - sOutput = Math.round(nData*nDecimal)/nDecimal + ""; + sOutput = String(Math.round(nData*nDecimal)/nDecimal); nDotIndex = sOutput.lastIndexOf("."); if(nDecimalPlaces > 0) { // Add the decimal separator @@ -4937,8 +5311,8 @@ nDotIndex = sOutput.lastIndexOf(sDecimalSeparator); nDotIndex = (nDotIndex > -1) ? nDotIndex : sOutput.length; var sNewOutput = sOutput.substring(nDotIndex); - var nCount = -1; - for (var i=nDotIndex; i>0; i--) { + var nCount = -1, i; + for (i=nDotIndex; i>0; i--) { nCount++; if ((nCount%3 === 0) && (i !== nDotIndex) && (!bNegative || (i > 1))) { sNewOutput = sThousandsSeparator + sNewOutput; @@ -4953,196 +5327,59 @@ sOutput = (opts.suffix) ? sOutput + opts.suffix : sOutput; return sOutput; - } else { - return nData; } - }, - // Tony Tomov - // PHP implementation. Sorry not all options are supported. - // Feel free to add them if you want - DateFormat : function (format, date, newformat, opts) { - var token = /\\.|[dDjlNSwzWFmMntLoYyaABgGhHisueIOPTZcrU]/g, - timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g, - timezoneClip = /[^-+\dA-Z]/g, - msDateRegExp = new RegExp("^\/Date\$(([-+])?[0-9]+)(([-+])([0-9]{2})([0-9]{2}))?\$\/$"), - msMatch = ((typeof date === 'string') ? date.match(msDateRegExp): null), - pad = function (value, length) { - value = String(value); - length = parseInt(length,10) || 2; - while (value.length < length) { value = '0' + value; } - return value; - }, - ts = {m : 1, d : 1, y : 1970, h : 0, i : 0, s : 0, u:0}, - timestamp=0, dM, k,hl, - dateFormat=["i18n"]; - // Internationalization strings - dateFormat.i18n = { - dayNames: opts.dayNames, - monthNames: opts.monthNames - }; - if( format in opts.masks ) { format = opts.masks[format]; } - if( !isNaN( date - 0 ) && String(format).toLowerCase() == "u") { - //Unix timestamp - timestamp = new Date( parseFloat(date)*1000 ); - } else if(date.constructor === Date) { - timestamp = date; - // Microsoft date format support - } else if( msMatch !== null ) { - timestamp = new Date(parseInt(msMatch[1], 10)); - if (msMatch[3]) { - var offset = Number(msMatch[5]) * 60 + Number(msMatch[6]); - offset *= ((msMatch[4] == '-') ? 1 : -1); - offset -= timestamp.getTimezoneOffset(); - timestamp.setTime(Number(Number(timestamp) + (offset * 60 * 1000))); - } - } else { - date = String(date).split(/[\\\/:_;.,\t\T\s-]/); - format = format.split(/[\\\/:_;.,\t\T\s-]/); - // parsing for month names - for(k=0,hl=format.length;k<hl;k++){ - if(format[k] == 'M') { - dM = $.inArray(date[k],dateFormat.i18n.monthNames); - if(dM !== -1 && dM < 12){date[k] = dM+1;} - } - if(format[k] == 'F') { - dM = $.inArray(date[k],dateFormat.i18n.monthNames); - if(dM !== -1 && dM > 11){date[k] = dM+1-12;} - } - if(date[k]) { - ts[format[k].toLowerCase()] = parseInt(date[k],10); - } - } - if(ts.f) {ts.m = ts.f;} - if( ts.m === 0 && ts.y === 0 && ts.d === 0) { - return " " ; - } - ts.m = parseInt(ts.m,10)-1; - var ty = ts.y; - if (ty >= 70 && ty <= 99) {ts.y = 1900+ts.y;} - else if (ty >=0 && ty <=69) {ts.y= 2000+ts.y;} - timestamp = new Date(ts.y, ts.m, ts.d, ts.h, ts.i, ts.s, ts.u); - } - - if( newformat in opts.masks ) { - newformat = opts.masks[newformat]; - } else if ( !newformat ) { - newformat = 'Y-m-d'; - } - var - G = timestamp.getHours(), - i = timestamp.getMinutes(), - j = timestamp.getDate(), - n = timestamp.getMonth() + 1, - o = timestamp.getTimezoneOffset(), - s = timestamp.getSeconds(), - u = timestamp.getMilliseconds(), - w = timestamp.getDay(), - Y = timestamp.getFullYear(), - N = (w + 6) % 7 + 1, - z = (new Date(Y, n - 1, j) - new Date(Y, 0, 1)) / 86400000, - flags = { - // Day - d: pad(j), - D: dateFormat.i18n.dayNames[w], - j: j, - l: dateFormat.i18n.dayNames[w + 7], - N: N, - S: opts.S(j), - //j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th', - w: w, - z: z, - // Week - W: N < 5 ? Math.floor((z + N - 1) / 7) + 1 : Math.floor((z + N - 1) / 7) || ((new Date(Y - 1, 0, 1).getDay() + 6) % 7 < 4 ? 53 : 52), - // Month - F: dateFormat.i18n.monthNames[n - 1 + 12], - m: pad(n), - M: dateFormat.i18n.monthNames[n - 1], - n: n, - t: '?', - // Year - L: '?', - o: '?', - Y: Y, - y: String(Y).substring(2), - // Time - a: G < 12 ? opts.AmPm[0] : opts.AmPm[1], - A: G < 12 ? opts.AmPm[2] : opts.AmPm[3], - B: '?', - g: G % 12 || 12, - G: G, - h: pad(G % 12 || 12), - H: pad(G), - i: pad(i), - s: pad(s), - u: u, - // Timezone - e: '?', - I: '?', - O: (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4), - P: '?', - T: (String(timestamp).match(timezone) || [""]).pop().replace(timezoneClip, ""), - Z: '?', - // Full Date/Time - c: '?', - r: '?', - U: Math.floor(timestamp / 1000) - }; - return newformat.replace(token, function ($0) { - return $0 in flags ? flags[$0] : $0.substring(1); - }); + return nData; } }; $.fn.fmatter.defaultFormat = function(cellval, opts) { - return ($.fmatter.isValue(cellval) && cellval!=="" ) ? cellval : opts.defaultValue ? opts.defaultValue : " "; + return ($.fmatter.isValue(cellval) && cellval!=="" ) ? cellval : opts.defaultValue || " "; }; $.fn.fmatter.email = function(cellval, opts) { if(!$.fmatter.isEmpty(cellval)) { return "<a href=\"mailto:" + cellval + "\">" + cellval + "</a>"; - }else { - return $.fn.fmatter.defaultFormat(cellval,opts ); } + return $.fn.fmatter.defaultFormat(cellval,opts ); }; $.fn.fmatter.checkbox =function(cval, opts) { var op = $.extend({},opts.checkbox), ds; - if(opts.colModel !== undefined && !$.fmatter.isUndefined(opts.colModel.formatoptions)) { + if(opts.colModel !== undefined && opts.colModel.formatoptions !== undefined) { op = $.extend({},op,opts.colModel.formatoptions); } if(op.disabled===true) {ds = "disabled=\"disabled\"";} else {ds="";} - if($.fmatter.isEmpty(cval) || $.fmatter.isUndefined(cval) ) {cval = $.fn.fmatter.defaultFormat(cval,op);} - cval=cval+"";cval=cval.toLowerCase(); - var bchk = cval.search(/(false|0|no|off)/i)<0 ? " checked='checked' " : ""; + if($.fmatter.isEmpty(cval) || cval === undefined ) {cval = $.fn.fmatter.defaultFormat(cval,op);} + cval=String(cval); + cval=cval.toLowerCase(); + var bchk = cval.search(/(false|f|0|no|n|off|undefined)/i)<0 ? " checked='checked' " : ""; return "<input type=\"checkbox\" " + bchk + " value=\""+ cval+"\" offval=\"no\" "+ds+ "/>"; }; $.fn.fmatter.link = function(cellval, opts) { var op = {target:opts.target}; var target = ""; - if(opts.colModel !== undefined && !$.fmatter.isUndefined(opts.colModel.formatoptions)) { + if(opts.colModel !== undefined && opts.colModel.formatoptions !== undefined) { op = $.extend({},op,opts.colModel.formatoptions); } if(op.target) {target = 'target=' + op.target;} if(!$.fmatter.isEmpty(cellval)) { return "<a "+target+" href=\"" + cellval + "\">" + cellval + "</a>"; - }else { - return $.fn.fmatter.defaultFormat(cellval,opts); } + return $.fn.fmatter.defaultFormat(cellval,opts); }; $.fn.fmatter.showlink = function(cellval, opts) { var op = {baseLinkUrl: opts.baseLinkUrl,showAction:opts.showAction, addParam: opts.addParam || "", target: opts.target, idName: opts.idName}, target = "", idUrl; - if(opts.colModel !== undefined && !$.fmatter.isUndefined(opts.colModel.formatoptions)) { + if(opts.colModel !== undefined && opts.colModel.formatoptions !== undefined) { op = $.extend({},op,opts.colModel.formatoptions); } if(op.target) {target = 'target=' + op.target;} idUrl = op.baseLinkUrl+op.showAction + '?'+ op.idName+'='+opts.rowId+op.addParam; if($.fmatter.isString(cellval) || $.fmatter.isNumber(cellval)) { //add this one even if its blank string return "<a "+target+" href=\"" + idUrl + "\">" + cellval + "</a>"; - }else { - return $.fn.fmatter.defaultFormat(cellval,opts); } + return $.fn.fmatter.defaultFormat(cellval,opts); }; $.fn.fmatter.integer = function(cellval, opts) { var op = $.extend({},opts.integer); - if(opts.colModel !== undefined && !$.fmatter.isUndefined(opts.colModel.formatoptions)) { + if(opts.colModel !== undefined && opts.colModel.formatoptions !== undefined) { op = $.extend({},op,opts.colModel.formatoptions); } if($.fmatter.isEmpty(cellval)) { @@ -5152,7 +5389,7 @@ }; $.fn.fmatter.number = function (cellval, opts) { var op = $.extend({},opts.number); - if(opts.colModel !== undefined && !$.fmatter.isUndefined(opts.colModel.formatoptions)) { + if(opts.colModel !== undefined && opts.colModel.formatoptions !== undefined) { op = $.extend({},op,opts.colModel.formatoptions); } if($.fmatter.isEmpty(cellval)) { @@ -5162,7 +5399,7 @@ }; $.fn.fmatter.currency = function (cellval, opts) { var op = $.extend({},opts.currency); - if(opts.colModel !== undefined && !$.fmatter.isUndefined(opts.colModel.formatoptions)) { + if(opts.colModel !== undefined && opts.colModel.formatoptions !== undefined) { op = $.extend({},op,opts.colModel.formatoptions); } if($.fmatter.isEmpty(cellval)) { @@ -5172,26 +5409,26 @@ }; $.fn.fmatter.date = function (cellval, opts, rwd, act) { var op = $.extend({},opts.date); - if(opts.colModel !== undefined && !$.fmatter.isUndefined(opts.colModel.formatoptions)) { + if(opts.colModel !== undefined && opts.colModel.formatoptions !== undefined) { op = $.extend({},op,opts.colModel.formatoptions); } - if(!op.reformatAfterEdit && act=='edit'){ + if(!op.reformatAfterEdit && act === 'edit'){ return $.fn.fmatter.defaultFormat(cellval, opts); - } else if(!$.fmatter.isEmpty(cellval)) { - return $.fmatter.util.DateFormat(op.srcformat,cellval,op.newformat,op); - } else { - return $.fn.fmatter.defaultFormat(cellval, opts); } + if(!$.fmatter.isEmpty(cellval)) { + return $.jgrid.parseDate(op.srcformat,cellval,op.newformat,op); + } + return $.fn.fmatter.defaultFormat(cellval, opts); }; $.fn.fmatter.select = function (cellval,opts) { // jqGrid specific - cellval = cellval + ""; + cellval = String(cellval); var oSelect = false, ret=[], sep, delim; - if(!$.fmatter.isUndefined(opts.colModel.formatoptions)){ + if(opts.colModel.formatoptions !== undefined){ oSelect= opts.colModel.formatoptions.value; sep = opts.colModel.formatoptions.separator === undefined ? ":" : opts.colModel.formatoptions.separator; delim = opts.colModel.formatoptions.delimiter === undefined ? ";" : opts.colModel.formatoptions.delimiter; - } else if(!$.fmatter.isUndefined(opts.colModel.editoptions)){ + } else if(opts.colModel.editoptions !== undefined){ oSelect= opts.colModel.editoptions.value; sep = opts.colModel.editoptions.separator === undefined ? ":" : opts.colModel.editoptions.separator; delim = opts.colModel.editoptions.delimiter === undefined ? ";" : opts.colModel.editoptions.delimiter; @@ -5202,8 +5439,8 @@ if(msl) {scell = cellval.split(",");scell = $.map(scell,function(n){return $.trim(n);});} if ($.fmatter.isString(oSelect)) { // mybe here we can use some caching with care ???? - var so = oSelect.split(delim), j=0; - for(var i=0; i<so.length;i++){ + var so = oSelect.split(delim), j=0, i; + for(i=0; i<so.length;i++){ sv = so[i].split(sep); if(sv.length > 2 ) { sv[1] = $.map(sv,function(n,i){if(i>0) {return n;}}).join(sep); @@ -5213,7 +5450,7 @@ ret[j] = sv[1]; j++; } - } else if($.trim(sv[0])==$.trim(cellval)) { + } else if($.trim(sv[0]) === $.trim(cellval)) { ret[0] = sv[1]; break; } @@ -5232,51 +5469,54 @@ cellval = ret.join(", "); return cellval === "" ? $.fn.fmatter.defaultFormat(cellval,opts) : cellval; }; - $.fn.fmatter.rowactions = function(rid,gid,act,pos) { - var op ={ - keys:false, - onEdit : null, - onSuccess: null, - afterSave:null, - onError: null, - afterRestore: null, - extraparam: {}, - url: null, - restoreAfterError: true, - mtype: "POST", - delOptions: {}, - editOptions : {} - }; - rid = $.jgrid.jqID( rid ); - gid = $.jgrid.jqID( gid ); - var cm = $('#'+gid)[0].p.colModel[pos]; - if(!$.fmatter.isUndefined(cm.formatoptions)) { + $.fn.fmatter.rowactions = function(act) { + var $tr = $(this).closest("tr.jqgrow"), + rid = $tr.attr("id"), + $id = $(this).closest("table.ui-jqgrid-btable").attr('id').replace(/_frozen([^_]*)$/,'$1'), + $grid = $("#"+$id), + $t = $grid[0], + p = $t.p, + cm = p.colModel[$.jgrid.getCellIndex(this)], + $actionsDiv = cm.frozen ? $("tr#"+rid+" td:eq("+$.jgrid.getCellIndex(this)+") > div",$grid) :$(this).parent(), + op = { + keys: false, + onEdit: null, + onSuccess: null, + afterSave: null, + onError: null, + afterRestore: null, + extraparam: {}, + url: null, + restoreAfterError: true, + mtype: "POST", + delOptions: {}, + editOptions: {} + }, + saverow = function(rowid, res) { + if($.isFunction(op.afterSave)) { op.afterSave.call($t, rowid, res); } + $actionsDiv.find("div.ui-inline-edit,div.ui-inline-del").show(); + $actionsDiv.find("div.ui-inline-save,div.ui-inline-cancel").hide(); + }, + restorerow = function(rowid) { + if($.isFunction(op.afterRestore)) { op.afterRestore.call($t, rowid); } + $actionsDiv.find("div.ui-inline-edit,div.ui-inline-del").show(); + $actionsDiv.find("div.ui-inline-save,div.ui-inline-cancel").hide(); + }; + + if (cm.formatoptions !== undefined) { op = $.extend(op,cm.formatoptions); } - if( !$.fmatter.isUndefined($('#'+gid)[0].p.editOptions) ) { - op.editOptions = $('#'+gid)[0].p.editOptions; + if (p.editOptions !== undefined) { + op.editOptions = p.editOptions; } - if( !$.fmatter.isUndefined($('#'+gid)[0].p.delOptions) ) { - op.delOptions = $('#'+gid)[0].p.delOptions; + if (p.delOptions !== undefined) { + op.delOptions = p.delOptions; } - var $t = $("#"+gid)[0]; - var saverow = function( rowid, res) { - if($.isFunction(op.afterSave)) { op.afterSave.call($t, rowid, res); } - $("tr#"+rid+" div.ui-inline-edit, "+"tr#"+rid+" div.ui-inline-del","#"+gid + ".ui-jqgrid-btable:first").show(); - $("tr#"+rid+" div.ui-inline-save, "+"tr#"+rid+" div.ui-inline-cancel","#"+gid+ ".ui-jqgrid-btable:first").hide(); - }, - restorerow = function( rowid) { - if($.isFunction(op.afterRestore) ) { op.afterRestore.call($t, rowid); } - $("tr#"+rid+" div.ui-inline-edit, "+"tr#"+rid+" div.ui-inline-del","#"+gid+ ".ui-jqgrid-btable:first").show(); - $("tr#"+rid+" div.ui-inline-save, "+"tr#"+rid+" div.ui-inline-cancel","#"+gid+ ".ui-jqgrid-btable:first").hide(); - }; - if( $("#"+rid,"#"+gid).hasClass("jqgrid-new-row") ){ - var opers = $t.p.prmNames, - oper = opers.oper; - op.extraparam[oper] = opers.addoper; + if ($tr.hasClass("jqgrid-new-row")){ + op.extraparam[p.prmNames.oper] = p.prmNames.addoper; } var actop = { - keys : op.keys, + keys: op.keys, oneditfunc: op.onEdit, successfunc: op.onSuccess, url: op.url, @@ -5290,55 +5530,55 @@ switch(act) { case 'edit': - $('#'+gid).jqGrid('editRow', rid, actop); - $("tr#"+rid+" div.ui-inline-edit, "+"tr#"+rid+" div.ui-inline-del","#"+gid+ ".ui-jqgrid-btable:first").hide(); - $("tr#"+rid+" div.ui-inline-save, "+"tr#"+rid+" div.ui-inline-cancel","#"+gid+ ".ui-jqgrid-btable:first").show(); - $($t).triggerHandler("jqGridAfterGridComplete"); + $grid.jqGrid('editRow', rid, actop); + $actionsDiv.find("div.ui-inline-edit,div.ui-inline-del").hide(); + $actionsDiv.find("div.ui-inline-save,div.ui-inline-cancel").show(); + $grid.triggerHandler("jqGridAfterGridComplete"); break; case 'save': - if ( $('#'+gid).jqGrid('saveRow', rid, actop) ) { - $("tr#"+rid+" div.ui-inline-edit, "+"tr#"+rid+" div.ui-inline-del","#"+gid+ ".ui-jqgrid-btable:first").show(); - $("tr#"+rid+" div.ui-inline-save, "+"tr#"+rid+" div.ui-inline-cancel","#"+gid+ ".ui-jqgrid-btable:first").hide(); - $($t).triggerHandler("jqGridAfterGridComplete"); + if ($grid.jqGrid('saveRow', rid, actop)) { + $actionsDiv.find("div.ui-inline-edit,div.ui-inline-del").show(); + $actionsDiv.find("div.ui-inline-save,div.ui-inline-cancel").hide(); + $grid.triggerHandler("jqGridAfterGridComplete"); } break; case 'cancel' : - $('#'+gid).jqGrid('restoreRow',rid, restorerow); - $("tr#"+rid+" div.ui-inline-edit, "+"tr#"+rid+" div.ui-inline-del","#"+gid+ ".ui-jqgrid-btable:first").show(); - $("tr#"+rid+" div.ui-inline-save, "+"tr#"+rid+" div.ui-inline-cancel","#"+gid+ ".ui-jqgrid-btable:first").hide(); - $($t).triggerHandler("jqGridAfterGridComplete"); + $grid.jqGrid('restoreRow', rid, restorerow); + $actionsDiv.find("div.ui-inline-edit,div.ui-inline-del").show(); + $actionsDiv.find("div.ui-inline-save,div.ui-inline-cancel").hide(); + $grid.triggerHandler("jqGridAfterGridComplete"); break; case 'del': - $('#'+gid).jqGrid('delGridRow',rid, op.delOptions); + $grid.jqGrid('delGridRow', rid, op.delOptions); break; case 'formedit': - $('#'+gid).jqGrid('setSelection',rid); - $('#'+gid).jqGrid('editGridRow',rid, op.editOptions); + $grid.jqGrid('setSelection', rid); + $grid.jqGrid('editGridRow', rid, op.editOptions); break; } }; $.fn.fmatter.actions = function(cellval,opts) { - var op ={keys:false, editbutton:true, delbutton:true, editformbutton: false}; - if(!$.fmatter.isUndefined(opts.colModel.formatoptions)) { + var op={keys:false, editbutton:true, delbutton:true, editformbutton: false}, + rowid=opts.rowId, str="",ocl; + if(opts.colModel.formatoptions !== undefined) { op = $.extend(op,opts.colModel.formatoptions); } - var rowid = opts.rowId, str="",ocl; - if(typeof(rowid) =='undefined' || $.fmatter.isEmpty(rowid)) {return "";} + if(rowid === undefined || $.fmatter.isEmpty(rowid)) {return "";} if(op.editformbutton){ - ocl = "onclick=jQuery.fn.fmatter.rowactions('"+rowid+"','"+opts.gid+"','formedit',"+opts.pos+"); onmouseover=jQuery(this).addClass('ui-state-hover'); onmouseout=jQuery(this).removeClass('ui-state-hover'); "; - str =str+ "<div title='"+$.jgrid.nav.edittitle+"' style='float:left;cursor:pointer;' class='ui-pg-div ui-inline-edit' "+ocl+"><span class='ui-icon ui-icon-pencil'></span></div>"; + ocl = "id='jEditButton_"+rowid+"' onclick=jQuery.fn.fmatter.rowactions.call(this,'formedit'); onmouseover=jQuery(this).addClass('ui-state-hover'); onmouseout=jQuery(this).removeClass('ui-state-hover'); "; + str += "<div title='"+$.jgrid.nav.edittitle+"' style='float:left;cursor:pointer;' class='ui-pg-div ui-inline-edit' "+ocl+"><span class='ui-icon ui-icon-pencil'></span></div>"; } else if(op.editbutton){ - ocl = "onclick=jQuery.fn.fmatter.rowactions('"+rowid+"','"+opts.gid+"','edit',"+opts.pos+"); onmouseover=jQuery(this).addClass('ui-state-hover'); onmouseout=jQuery(this).removeClass('ui-state-hover') "; - str =str+ "<div title='"+$.jgrid.nav.edittitle+"' style='float:left;cursor:pointer;' class='ui-pg-div ui-inline-edit' "+ocl+"><span class='ui-icon ui-icon-pencil'></span></div>"; + ocl = "id='jEditButton_"+rowid+"' onclick=jQuery.fn.fmatter.rowactions.call(this,'edit'); onmouseover=jQuery(this).addClass('ui-state-hover'); onmouseout=jQuery(this).removeClass('ui-state-hover') "; + str += "<div title='"+$.jgrid.nav.edittitle+"' style='float:left;cursor:pointer;' class='ui-pg-div ui-inline-edit' "+ocl+"><span class='ui-icon ui-icon-pencil'></span></div>"; } if(op.delbutton) { - ocl = "onclick=jQuery.fn.fmatter.rowactions('"+rowid+"','"+opts.gid+"','del',"+opts.pos+"); onmouseover=jQuery(this).addClass('ui-state-hover'); onmouseout=jQuery(this).removeClass('ui-state-hover'); "; - str = str+"<div title='"+$.jgrid.nav.deltitle+"' style='float:left;margin-left:5px;' class='ui-pg-div ui-inline-del' "+ocl+"><span class='ui-icon ui-icon-trash'></span></div>"; + ocl = "id='jDeleteButton_"+rowid+"' onclick=jQuery.fn.fmatter.rowactions.call(this,'del'); onmouseover=jQuery(this).addClass('ui-state-hover'); onmouseout=jQuery(this).removeClass('ui-state-hover'); "; + str += "<div title='"+$.jgrid.nav.deltitle+"' style='float:left;margin-left:5px;' class='ui-pg-div ui-inline-del' "+ocl+"><span class='ui-icon ui-icon-trash'></span></div>"; } - ocl = "onclick=jQuery.fn.fmatter.rowactions('"+rowid+"','"+opts.gid+"','save',"+opts.pos+"); onmouseover=jQuery(this).addClass('ui-state-hover'); onmouseout=jQuery(this).removeClass('ui-state-hover'); "; - str = str+"<div title='"+$.jgrid.edit.bSubmit+"' style='float:left;display:none' class='ui-pg-div ui-inline-save' "+ocl+"><span class='ui-icon ui-icon-disk'></span></div>"; - ocl = "onclick=jQuery.fn.fmatter.rowactions('"+rowid+"','"+opts.gid+"','cancel',"+opts.pos+"); onmouseover=jQuery(this).addClass('ui-state-hover'); onmouseout=jQuery(this).removeClass('ui-state-hover'); "; - str = str+"<div title='"+$.jgrid.edit.bCancel+"' style='float:left;display:none;margin-left:5px;' class='ui-pg-div ui-inline-cancel' "+ocl+"><span class='ui-icon ui-icon-cancel'></span></div>"; + ocl = "id='jSaveButton_"+rowid+"' onclick=jQuery.fn.fmatter.rowactions.call(this,'save'); onmouseover=jQuery(this).addClass('ui-state-hover'); onmouseout=jQuery(this).removeClass('ui-state-hover'); "; + str += "<div title='"+$.jgrid.edit.bSubmit+"' style='float:left;display:none' class='ui-pg-div ui-inline-save' "+ocl+"><span class='ui-icon ui-icon-disk'></span></div>"; + ocl = "id='jCancelButton_"+rowid+"' onclick=jQuery.fn.fmatter.rowactions.call(this,'cancel'); onmouseover=jQuery(this).addClass('ui-state-hover'); onmouseout=jQuery(this).removeClass('ui-state-hover'); "; + str += "<div title='"+$.jgrid.edit.bCancel+"' style='float:left;display:none;margin-left:5px;' class='ui-pg-div ui-inline-cancel' "+ocl+"><span class='ui-icon ui-icon-cancel'></span></div>"; return "<div style='margin-left:8px;'>" + str + "</div>"; }; $.unformat = function (cellval,options,pos,cnt) { @@ -5347,9 +5587,9 @@ op =options.colModel.formatoptions || {}, sep, re = /([\.\*\_\'\{\}\+\?\\])/g, unformatFunc = options.colModel.unformat||($.fn.fmatter[formatType] && $.fn.fmatter[formatType].unformat); - if(typeof unformatFunc !== 'undefined' && $.isFunction(unformatFunc) ) { + if(unformatFunc !== undefined && $.isFunction(unformatFunc) ) { ret = unformatFunc.call(this, $(cellval).text(), options, cellval); - } else if(!$.fmatter.isUndefined(formatType) && $.fmatter.isString(formatType) ) { + } else if(formatType !== undefined && $.fmatter.isString(formatType) ) { var opts = $.jgrid.formatter || {}, stripTag; switch(formatType) { case 'integer' : @@ -5398,7 +5638,7 @@ var ret = []; var cell = $(cellval).text(); if(cnt===true) {return cell;} - var op = $.extend({}, !$.fmatter.isUndefined(options.colModel.formatoptions) ? options.colModel.formatoptions: options.colModel.editoptions), + var op = $.extend({}, options.colModel.formatoptions !== undefined ? options.colModel.formatoptions: options.colModel.editoptions), sep = op.separator === undefined ? ":" : op.separator, delim = op.delimiter === undefined ? ";" : op.delimiter; @@ -5408,8 +5648,8 @@ scell = [], sv; if(msl) {scell = cell.split(",");scell = $.map(scell,function(n){return $.trim(n);});} if ($.fmatter.isString(oSelect)) { - var so = oSelect.split(delim), j=0; - for(var i=0; i<so.length;i++){ + var so = oSelect.split(delim), j=0, i; + for(i=0; i<so.length;i++){ sv = so[i].split(sep); if(sv.length > 2 ) { sv[1] = $.map(sv,function(n,i){if(i>0) {return n;}}).join(sep); @@ -5419,7 +5659,7 @@ ret[j] = sv[0]; j++; } - } else if($.trim(sv[1])==$.trim(cell)) { + } else if($.trim(sv[1]) === $.trim(cell)) { ret[0] = sv[0]; break; } @@ -5429,32 +5669,32 @@ ret = $.map(scell, function(n){ var rv; $.each(oSelect, function(i,val){ - if (val == n) { + if (val === n) { rv = i; return false; } }); - if( typeof(rv) != 'undefined' ) {return rv;} + if( rv !== undefined ) {return rv;} }); } return ret.join(", "); - } else { - return cell || ""; } + return cell || ""; }; $.unformat.date = function (cellval, opts) { var op = $.jgrid.formatter.date || {}; - if(!$.fmatter.isUndefined(opts.formatoptions)) { + if(opts.formatoptions !== undefined) { op = $.extend({},op,opts.formatoptions); } if(!$.fmatter.isEmpty(cellval)) { - return $.fmatter.util.DateFormat(op.newformat,cellval,op.srcformat,op); - } else { - return $.fn.fmatter.defaultFormat(cellval, opts); + return $.jgrid.parseDate(op.newformat,cellval,op.srcformat,op); } + return $.fn.fmatter.defaultFormat(cellval, opts); }; })(jQuery); -;(function($){ +/*jshint eqeqeq:false */ +/*global jQuery */ +(function($){ /* * jqGrid common function * Tony Tomov tony(a)trirand.com @@ -5463,8 +5703,7 @@ * http://www.opensource.org/licenses/mit-license.php * http://www.gnu.org/licenses/gpl-2.0.html */ -/*global jQuery, $ */ - +"use strict"; $.extend($.jgrid,{ // Modal functions showModal : function(h) { @@ -5477,8 +5716,8 @@ hideModal : function (selector,o) { o = $.extend({jqm : true, gb :''}, o || {}); if(o.onClose) { - var oncret = o.onClose(selector); - if (typeof oncret == 'boolean' && !oncret ) { return; } + var oncret = o.gb && typeof o.gb === "string" && o.gb.substr(0,6) === "#gbox_" ? o.onClose.call($("#" + o.gb.substr(6))[0], selector) : o.onClose(selector); + if (typeof oncret === 'boolean' && !oncret ) { return; } } if ($.fn.jqm && o.jqm === true) { $(selector).attr("aria-hidden","true").jqmHide(); @@ -5502,10 +5741,10 @@ return [curleft,curtop]; }, createModal : function(aIDs, content, p, insertSelector, posSelector, appendsel, css) { - p = $.extend(true, $.jgrid.jqModal || {}, p); + p = $.extend(true, {}, $.jgrid.jqModal || {}, p); var mw = document.createElement('div'), rtlsup, self = this; css = $.extend({}, css || {}); - rtlsup = $(p.gbox).attr("dir") == "rtl" ? true : false; + rtlsup = $(p.gbox).attr("dir") === "rtl" ? true : false; mw.className= "ui-widget ui-widget-content ui-corner-all ui-jqdialog"; mw.id = aIDs.themodal; var mh = document.createElement('div'); @@ -5514,7 +5753,7 @@ $(mh).append("<span class='ui-jqdialog-title'>"+p.caption+"</span>"); var ahr= $("<a href='javascript:void(0)' class='ui-jqdialog-titlebar-close ui-corner-all'></a>") .hover(function(){ahr.addClass('ui-state-hover');}, - function(){ahr.removeClass('ui-state-hover');}) + function(){ahr.removeClass('ui-state-hover');}) .append("<span class='ui-icon ui-icon-closethick'></span>"); $(mh).append(ahr); if(rtlsup) { @@ -5532,11 +5771,11 @@ mw.appendChild(mc); $(mw).prepend(mh); if(appendsel===true) { $('body').append(mw); } //append as first child in body -for alert dialog - else if (typeof appendsel == "string") + else if (typeof appendsel === "string") { $(appendsel).append(mw); - else {$(mw).insertBefore(insertSelector);} + } else {$(mw).insertBefore(insertSelector);} $(mw).css(css); - if(typeof p.jqModal === 'undefined') {p.jqModal = true;} // internal use + if(p.jqModal === undefined) {p.jqModal = true;} // internal use var coord = {}; if ( $.fn.jqm && p.jqModal === true) { if(p.left ===0 && p.top===0 && p.overlay) { @@ -5581,8 +5820,8 @@ overflow: 'hidden' },coord)) .attr({tabIndex: "-1","role":"dialog","aria-labelledby":aIDs.modalhead,"aria-hidden":"true"}); - if(typeof p.drag == 'undefined') { p.drag=true;} - if(typeof p.resize == 'undefined') {p.resize=true;} + if(p.drag === undefined) { p.drag=true;} + if(p.resize === undefined) {p.resize=true;} if (p.drag) { $(mh).css('cursor','move'); if($.fn.jqDrag) { @@ -5595,7 +5834,7 @@ } if(p.resize) { if($.fn.jqResize) { - $(mw).append("<div class='jqResize ui-resizable-handle ui-resizable-se ui-icon ui-icon-gripsmall-diagonal-se ui-icon-grip-diagonal-se'></div>"); + $(mw).append("<div class='jqResize ui-resizable-handle ui-resizable-se ui-icon ui-icon-gripsmall-diagonal-se'></div>"); $("#"+$.jgrid.jqID(aIDs.themodal)).jqResize(".jqResize",aIDs.scrollelm ? "#"+$.jgrid.jqID(aIDs.scrollelm) : false); } else { try { @@ -5607,7 +5846,7 @@ $(mw).keydown( function( e ) { if( e.which == 27 ) { var cone = $("#"+$.jgrid.jqID(aIDs.themodal)).data("onClose") || p.onClose; - self.hideModal(this,{gb:p.gbox,jqm:p.jqModal,onClose: cone}); + self.hideModal("#"+$.jgrid.jqID(aIDs.themodal),{gb:p.gbox,jqm:p.jqModal,onClose: cone}); } }); } @@ -5636,7 +5875,6 @@ try{$(':input:visible',selector)[0].focus();}catch(_){} } }, - info_dialog : function(caption, content,c_b, modalopt) { var mopt = { width:290, @@ -5644,7 +5882,6 @@ dataheight: 'auto', drag: true, resize: false, - caption:"<b>"+caption+"</b>", left:250, top:170, zIndex : 1000, @@ -5657,14 +5894,14 @@ // {text:'textbutt', id:"buttid", onClick : function(){...}} // if the id is not provided we set it like info_button_+ the index in the array - i.e info_button_0,info_button_1... }; - $.extend(mopt,modalopt || {}); + $.extend(true, mopt, $.jgrid.jqModal || {}, {caption:"<b>"+caption+"</b>"}, modalopt || {}); var jm = mopt.jqModal, self = this; if($.fn.jqm && !jm) { jm = false; } // in case there is no jqModal - var buttstr =""; + var buttstr ="", i; if(mopt.buttons.length > 0) { - for(var i=0;i<mopt.buttons.length;i++) { - if(typeof mopt.buttons[i].id == "undefined") { mopt.buttons[i].id = "info_button_"+i; } + for(i=0;i<mopt.buttons.length;i++) { + if(mopt.buttons[i].id === undefined) { mopt.buttons[i].id = "info_button_"+i; } buttstr += "<a href='javascript:void(0)' id='"+mopt.buttons[i].id+"' class='fm-button ui-state-default ui-corner-all'>"+mopt.buttons[i].text+"</a>"; } } @@ -5677,7 +5914,7 @@ cnt += "</div>"; try { - if($("#info_dialog").attr("aria-hidden") == "false") { + if($("#info_dialog").attr("aria-hidden") === "false") { $.jgrid.hideModal("#info_dialog",{jqm:jm}); } $("#info_dialog").remove(); @@ -5698,7 +5935,11 @@ }); } $("#closedialog", "#info_id").click(function(){ - self.hideModal("#info_dialog",{jqm:jm}); + self.hideModal("#info_dialog",{ + jqm:jm, + onClose: $("#info_dialog").data("onClose") || mopt.onClose, + gb: $("#info_dialog").data("gbox") || mopt.gbox + }); return false; }); $(".fm-button","#info_dialog").hover( @@ -5717,27 +5958,27 @@ if($.isFunction(mopt.afterOpen) ) { mopt.afterOpen(); } try{ $("#info_dialog").focus();} catch (m){} }, + bindEv: function (el, opt) { + var $t = this; + if($.isFunction(opt.dataInit)) { + opt.dataInit.call($t,el); + } + if(opt.dataEvents) { + $.each(opt.dataEvents, function() { + if (this.data !== undefined) { + $(el).bind(this.type, this.data, this.fn); + } else { + $(el).bind(this.type, this.fn); + } + }); + } + }, // Form Functions createEl : function(eltype,options,vl,autowidth, ajaxso) { var elem = "", $t = this; - function bindEv (el, opt) { - if($.isFunction(opt.dataInit)) { - opt.dataInit.call($t,el); - } - if(opt.dataEvents) { - $.each(opt.dataEvents, function() { - if (this.data !== undefined) { - $(el).bind(this.type, this.data, this.fn); - } else { - $(el).bind(this.type, this.fn); - } - }); - } - return opt; - } function setAttributes(elm, atr, exl ) { - var exclude = ['dataInit','dataEvents','dataUrl', 'buildSelect','sopt', 'searchhidden', 'defaultValue', 'attr']; - if(typeof(exl) != "undefined" && $.isArray(exl)) { + var exclude = ['dataInit','dataEvents','dataUrl', 'buildSelect','sopt', 'searchhidden', 'defaultValue', 'attr', 'custom_element', 'custom_value']; + if(exl !== undefined && $.isArray(exl)) { $.merge(exclude, exl); } $.each(atr, function(key, value){ @@ -5757,10 +5998,9 @@ if(!options.cols) { $(elem).css({width:"98%"});} } else if (!options.cols) { options.cols = 20; } if(!options.rows) { options.rows = 2; } - if(vl==' ' || vl==' ' || (vl.length==1 && vl.charCodeAt(0)==160)) {vl="";} + if(vl===' ' || vl===' ' || (vl.length===1 && vl.charCodeAt(0)===160)) {vl="";} elem.value = vl; setAttributes(elem, options); - options = bindEv(elem,options); $(elem).attr({"role":"textbox","multiline":"true"}); break; case "checkbox" : //what code for simple checkbox @@ -5768,7 +6008,7 @@ elem.type = "checkbox"; if( !options.value ) { var vl1 = vl.toLowerCase(); - if(vl1.search(/(false|0|no|off|undefined)/i)<0 && vl1!=="") { + if(vl1.search(/(false|f|0|no|n|off|undefined)/i)<0 && vl1!=="") { elem.checked=true; elem.defaultChecked=true; elem.value = vl; @@ -5786,7 +6026,6 @@ $(elem).attr("offval",cbval[1]); } setAttributes(elem, options, ['value']); - options = bindEv(elem,options); $(elem).attr("role","checkbox"); break; case "select" : @@ -5798,27 +6037,33 @@ elem.multiple="multiple"; $(elem).attr("aria-multiselectable","true"); } else { msl = false; } - if(typeof(options.dataUrl) != "undefined") { + if(options.dataUrl !== undefined) { + var rowid = options.name ? String(options.id).substring(0, String(options.id).length - String(options.name).length - 1) : String(options.id), + postData = options.postData || ajaxso.postData; + + if ($t.p && $t.p.idPrefix) { + rowid = $.jgrid.stripPref($t.p.idPrefix, rowid); + } else { + postData = undefined; // don't use postData for searching from jqFilter. One can implement the feature in the future if required. + } $.ajax($.extend({ url: options.dataUrl, type : "GET", dataType: "html", + data: $.isFunction(postData) ? postData.call($t, rowid, vl, String(options.name)) : postData, context: {elem:elem, options:options, vl:vl}, success: function(data){ - var a, ovm = [], elem = this.elem, vl = this.vl, + var ovm = [], elem = this.elem, vl = this.vl, options = $.extend({},this.options), - msl = options.multiple===true; - if($.isFunction(options.buildSelect)) { - var b = options.buildSelect.call($t,data); - a = $(b).html(); - } else { - a = $(data).html(); + msl = options.multiple===true, + a = $.isFunction(options.buildSelect) ? options.buildSelect.call($t,data) : data; + if(typeof a === 'string') { + a = $( $.trim( a ) ).html(); } if(a) { $(elem).append(a); setAttributes(elem, options); - options = bindEv(elem,options); - if(typeof options.size === 'undefined') { options.size = msl ? 3 : 1;} + if(options.size === undefined) { options.size = msl ? 3 : 1;} if(msl) { ovm = vl.split(","); ovm = $.map(ovm,function(n){return $.trim(n);}); @@ -5842,7 +6087,7 @@ },ajaxso || {})); } else if(options.value) { var i; - if(typeof options.size === 'undefined') { + if(options.size === undefined) { options.size = msl ? 3 : 1; } if(msl) { @@ -5864,38 +6109,36 @@ ov.setAttribute("role","option"); ov.value = sv[0]; ov.innerHTML = sv[1]; elem.appendChild(ov); - if (!msl && ($.trim(sv[0]) == $.trim(vl) || $.trim(sv[1]) == $.trim(vl))) { ov.selected ="selected"; } + if (!msl && ($.trim(sv[0]) === $.trim(vl) || $.trim(sv[1]) === $.trim(vl))) { ov.selected ="selected"; } if (msl && ($.inArray($.trim(sv[1]), ovm)>-1 || $.inArray($.trim(sv[0]), ovm)>-1)) {ov.selected ="selected";} } } else if (typeof options.value === 'object') { - var oSv = options.value; - for ( var key in oSv) { + var oSv = options.value, key; + for (key in oSv) { if (oSv.hasOwnProperty(key ) ){ ov = document.createElement("option"); ov.setAttribute("role","option"); ov.value = key; ov.innerHTML = oSv[key]; elem.appendChild(ov); - if (!msl && ( $.trim(key) == $.trim(vl) || $.trim(oSv[key]) == $.trim(vl)) ) { ov.selected ="selected"; } + if (!msl && ( $.trim(key) === $.trim(vl) || $.trim(oSv[key]) === $.trim(vl)) ) { ov.selected ="selected"; } if (msl && ($.inArray($.trim(oSv[key]),ovm)>-1 || $.inArray($.trim(key),ovm)>-1)) { ov.selected ="selected"; } } } } setAttributes(elem, options, ['value']); - options = bindEv(elem,options); } break; case "text" : case "password" : case "button" : var role; - if(eltype=="button") { role = "button"; } + if(eltype==="button") { role = "button"; } else { role = "textbox"; } elem = document.createElement("input"); elem.type = eltype; elem.value = vl; setAttributes(elem, options); - options = bindEv(elem,options); - if(eltype != "button"){ + if(eltype !== "button"){ if(autowidth) { if(!options.size) { $(elem).css({width:"98%"}); } } else if (!options.size) { options.size = 20; } @@ -5907,7 +6150,6 @@ elem = document.createElement("input"); elem.type = eltype; setAttributes(elem, options); - options = bindEv(elem,options); break; case "custom" : elem = document.createElement("span"); @@ -5924,9 +6166,9 @@ throw "e1"; } } catch (e) { - if (e=="e1") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_element' "+$.jgrid.edit.msg.nodefined, $.jgrid.edit.bClose);} - if (e=="e2") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_element' "+$.jgrid.edit.msg.novalue,$.jgrid.edit.bClose);} - else { $.jgrid.info_dialog($.jgrid.errors.errcap,typeof(e)==="string"?e:e.message,$.jgrid.edit.bClose); } + if (e==="e1") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_element' "+$.jgrid.edit.msg.nodefined, $.jgrid.edit.bClose);} + if (e==="e2") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_element' "+$.jgrid.edit.msg.novalue,$.jgrid.edit.bClose);} + else { $.jgrid.info_dialog($.jgrid.errors.errcap,typeof e==="string"?e:e.message,$.jgrid.edit.bClose); } } break; } @@ -5939,86 +6181,73 @@ // EXCEPT for centurial years which are not also divisible by 400. return (((year % 4 === 0) && ( year % 100 !== 0 || (year % 400 === 0))) ? 29 : 28 ); }, - DaysArray = function(n) { - for (var i = 1; i <= n; i++) { - this[i] = 31; - if (i==4 || i==6 || i==9 || i==11) {this[i] = 30;} - if (i==2) {this[i] = 29;} - } - return this; - }; - - var tsp = {}, sep; + tsp = {}, sep; format = format.toLowerCase(); //we search for /,-,. for the date separator - if(format.indexOf("/") != -1) { + if(format.indexOf("/") !== -1) { sep = "/"; - } else if(format.indexOf("-") != -1) { + } else if(format.indexOf("-") !== -1) { sep = "-"; - } else if(format.indexOf(".") != -1) { + } else if(format.indexOf(".") !== -1) { sep = "."; } else { sep = "/"; } format = format.split(sep); date = date.split(sep); - if (date.length != 3) { return false; } - var j=-1,yln, dln=-1, mln=-1; - for(var i=0;i<format.length;i++){ + if (date.length !== 3) { return false; } + var j=-1,yln, dln=-1, mln=-1, i; + for(i=0;i<format.length;i++){ var dv = isNaN(date[i]) ? 0 : parseInt(date[i],10); tsp[format[i]] = dv; yln = format[i]; - if(yln.indexOf("y") != -1) { j=i; } - if(yln.indexOf("m") != -1) { mln=i; } - if(yln.indexOf("d") != -1) { dln=i; } + if(yln.indexOf("y") !== -1) { j=i; } + if(yln.indexOf("m") !== -1) { mln=i; } + if(yln.indexOf("d") !== -1) { dln=i; } } - if (format[j] == "y" || format[j] == "yyyy") { + if (format[j] === "y" || format[j] === "yyyy") { yln=4; - } else if(format[j] =="yy"){ + } else if(format[j] ==="yy"){ yln = 2; } else { yln = -1; } - var daysInMonth = DaysArray(12), + var daysInMonth = [0,31,29,31,30,31,30,31,31,30,31,30,31], strDate; if (j === -1) { return false; - } else { + } strDate = tsp[format[j]].toString(); - if(yln == 2 && strDate.length == 1) {yln = 1;} - if (strDate.length != yln || (tsp[format[j]]===0 && date[j]!="00")){ + if(yln === 2 && strDate.length === 1) {yln = 1;} + if (strDate.length !== yln || (tsp[format[j]]===0 && date[j]!=="00")){ return false; } - } if(mln === -1) { return false; - } else { + } strDate = tsp[format[mln]].toString(); if (strDate.length<1 || tsp[format[mln]]<1 || tsp[format[mln]]>12){ return false; } - } if(dln === -1) { return false; - } else { + } strDate = tsp[format[dln]].toString(); - if (strDate.length<1 || tsp[format[dln]]<1 || tsp[format[dln]]>31 || (tsp[format[mln]]==2 && tsp[format[dln]]>daysInFebruary(tsp[format[j]])) || tsp[format[dln]] > daysInMonth[tsp[format[mln]]]){ + if (strDate.length<1 || tsp[format[dln]]<1 || tsp[format[dln]]>31 || (tsp[format[mln]]===2 && tsp[format[dln]]>daysInFebruary(tsp[format[j]])) || tsp[format[dln]] > daysInMonth[tsp[format[mln]]]){ return false; } - } return true; }, isEmpty : function(val) { if (val.match(/^\s+$/) || val === "") { return true; - } else { + } return false; - } }, checkTime : function(time){ // checks only hh:ss (and optional am/pm) - var re = /^(\d{1,2}):(\d{2})([ap]m)?$/,regs; + var re = /^(\d{1,2}):(\d{2})([apAP][Mm])?$/,regs; if(!$.jgrid.isEmpty(time)) { regs = time.match(re); @@ -6037,27 +6266,27 @@ } return true; }, - checkValues : function(val, valref,g, customobject, nam) { - var edtrul,i, nm, dft, len; - if(typeof(customobject) === "undefined") { - if(typeof(valref)=='string'){ - for( i =0, len=g.p.colModel.length;i<len; i++){ - if(g.p.colModel[i].name==valref) { - edtrul = g.p.colModel[i].editrules; + checkValues : function(val, valref, customobject, nam) { + var edtrul,i, nm, dft, len, g = this, cm = g.p.colModel; + if(customobject === undefined) { + if(typeof valref==='string'){ + for( i =0, len=cm.length;i<len; i++){ + if(cm[i].name===valref) { + edtrul = cm[i].editrules; valref = i; - try { nm = g.p.colModel[i].formoptions.label; } catch (e) {} + if(cm[i].formoptions != null) { nm = cm[i].formoptions.label; } break; } } } else if(valref >=0) { - edtrul = g.p.colModel[valref].editrules; + edtrul = cm[valref].editrules; } } else { edtrul = customobject; nm = nam===undefined ? "_" : nam; } if(edtrul) { - if(!nm) { nm = g.p.colNames[valref]; } + if(!nm) { nm = g.p.colNames != null ? g.p.colNames[valref] : cm[valref].label; } if(edtrul.required === true) { if( $.jgrid.isEmpty(val) ) { return [false,nm+": "+$.jgrid.edit.msg.required,""]; } } @@ -6068,10 +6297,10 @@ if(isNaN(val)) { return [false,nm+": "+$.jgrid.edit.msg.number,""]; } } } - if(typeof edtrul.minValue != 'undefined' && !isNaN(edtrul.minValue)) { + if(edtrul.minValue !== undefined && !isNaN(edtrul.minValue)) { if (parseFloat(val) < parseFloat(edtrul.minValue) ) { return [false,nm+": "+$.jgrid.edit.msg.minValue+" "+edtrul.minValue,""];} } - if(typeof edtrul.maxValue != 'undefined' && !isNaN(edtrul.maxValue)) { + if(edtrul.maxValue !== undefined && !isNaN(edtrul.maxValue)) { if (parseFloat(val) > parseFloat(edtrul.maxValue) ) { return [false,nm+": "+$.jgrid.edit.msg.maxValue+" "+edtrul.maxValue,""];} } var filter; @@ -6085,15 +6314,18 @@ if(edtrul.integer === true) { if( !(rqfield === false && $.jgrid.isEmpty(val)) ) { if(isNaN(val)) { return [false,nm+": "+$.jgrid.edit.msg.integer,""]; } - if ((val % 1 !== 0) || (val.indexOf('.') != -1)) { return [false,nm+": "+$.jgrid.edit.msg.integer,""];} + if ((val % 1 !== 0) || (val.indexOf('.') !== -1)) { return [false,nm+": "+$.jgrid.edit.msg.integer,""];} } } if(edtrul.date === true) { if( !(rqfield === false && $.jgrid.isEmpty(val)) ) { - if(g.p.colModel[valref].formatoptions && g.p.colModel[valref].formatoptions.newformat) { - dft = g.p.colModel[valref].formatoptions.newformat; + if(cm[valref].formatoptions && cm[valref].formatoptions.newformat) { + dft = cm[valref].formatoptions.newformat; + if( $.jgrid.formatter.date.masks.hasOwnProperty(dft) ) { + dft = $.jgrid.formatter.date.masks[dft]; + } } else { - dft = g.p.colModel[valref].datefmt || "Y-m-d"; + dft = cm[valref].datefmt || "Y-m-d"; } if(!$.jgrid.checkDate (dft, val)) { return [false,nm+": "+$.jgrid.edit.msg.date+" - "+dft,""]; } } @@ -6112,22 +6344,18 @@ if(edtrul.custom === true) { if( !(rqfield === false && $.jgrid.isEmpty(val)) ) { if($.isFunction(edtrul.custom_func)) { - var ret = edtrul.custom_func.call(g,val,nm); - if($.isArray(ret)) { - return ret; - } else { - return [false,$.jgrid.edit.msg.customarray,""]; - } - } else { - return [false,$.jgrid.edit.msg.customfcheck,""]; + var ret = edtrul.custom_func.call(g,val,nm,valref); + return $.isArray(ret) ? ret : [false,$.jgrid.edit.msg.customarray,""]; } + return [false,$.jgrid.edit.msg.customfcheck,""]; } } } return [true,"",""]; } }); -})(jQuery);/* +})(jQuery); +/* * jqFilter jQuery jqGrid filter addon. * Copyright (c) 2011, Tony Tomov, tony(a)trirand.com * Dual licensed under the MIT and GPL licenses @@ -6154,9 +6382,11 @@ ] } */ -/*global jQuery, $, window, navigator */ +/*jshint eqeqeq:false, eqnull:true, devel:true */ +/*global jQuery */ (function ($) { +"use strict"; $.fn.jqFilter = function( arg ) { if (typeof arg === 'string') { @@ -6180,27 +6410,11 @@ errorcheck : true, showQuery : true, sopt : null, - ops : [ - {"name": "eq", "description": "equal", "operator":"="}, - {"name": "ne", "description": "not equal", "operator":"<>"}, - {"name": "lt", "description": "less", "operator":"<"}, - {"name": "le", "description": "less or equal","operator":"<="}, - {"name": "gt", "description": "greater", "operator":">"}, - {"name": "ge", "description": "greater or equal", "operator":">="}, - {"name": "bw", "description": "begins with", "operator":"LIKE"}, - {"name": "bn", "description": "does not begin with", "operator":"NOT LIKE"}, - {"name": "in", "description": "in", "operator":"IN"}, - {"name": "ni", "description": "not in", "operator":"NOT IN"}, - {"name": "ew", "description": "ends with", "operator":"LIKE"}, - {"name": "en", "description": "does not end with", "operator":"NOT LIKE"}, - {"name": "cn", "description": "contains", "operator":"LIKE"}, - {"name": "nc", "description": "does not contain", "operator":"NOT LIKE"}, - {"name": "nu", "description": "is null", "operator":"IS NULL"}, - {"name": "nn", "description": "is not null", "operator":"IS NOT NULL"} - ], + ops : [], + operands : null, numopts : ['eq','ne', 'lt', 'le', 'gt', 'ge', 'nu', 'nn', 'in', 'ni'], stropts : ['eq', 'ne', 'bw', 'bn', 'ew', 'en', 'cn', 'nc', 'nu', 'nn', 'in', 'ni'], - _gridsopt : [], // grid translated strings, do not tuch + strarr : ['text', 'string', 'blob'], groupOps : [{ op: "AND", text: "AND" }, { op: "OR", text: "OR" }], groupButton : true, ruleButtons : true, @@ -6221,12 +6435,6 @@ isIE = /msie/i.test(navigator.userAgent) && !window.opera; // translating the options - if(this.p._gridsopt.length) { - // ['eq','ne','lt','le','gt','ge','bw','bn','in','ni','ew','en','cn','nc'] - for(i=0;i<this.p._gridsopt.length;i++) { - this.p.ops[i].description = this.p._gridsopt[i]; - } - } this.p.initFilter = $.extend(true,{},this.p.filter); // set default values for the columns if they are not set @@ -6266,17 +6474,20 @@ if(this.p.showQuery) { $(this).append("<table class='queryresult ui-widget ui-widget-content' style='display:block;max-width:440px;border:0px none;' dir='"+this.p.direction+"'><tbody><tr><td class='query'></td></tr></tbody></table>"); } + var getGrid = function () { + return $("#" + $.jgrid.jqID(p.id))[0] || null; + }; /* *Perform checking. * */ var checkData = function(val, colModelItem) { - var ret = [true,""]; + var ret = [true,""], $t = getGrid(); if($.isFunction(colModelItem.searchrules)) { - ret = colModelItem.searchrules(val, colModelItem); + ret = colModelItem.searchrules.call($t, val, colModelItem); } else if($.jgrid && $.jgrid.checkValues) { try { - ret = $.jgrid.checkValues(val, -1, null, colModelItem.searchrules, colModelItem.label); + ret = $.jgrid.checkValues.call($t, val, -1, colModelItem.searchrules, colModelItem.label); } catch (e) {} } if(ret && ret.length && ret[0] === false) { @@ -6319,7 +6530,7 @@ var table = $("<table class='group ui-widget ui-widget-content' style='border:0px none;'><tbody></tbody></table>"), // create error message row align = "left"; - if(this.p.direction == "rtl") { + if(this.p.direction === "rtl") { align = "right"; table.attr("dir","rtl"); } @@ -6384,7 +6595,7 @@ } for (i = 0; i < that.p.columns.length; i++) { // but show only serchable and serchhidden = true fields - var searchable = (typeof that.p.columns[i].search === 'undefined') ? true: that.p.columns[i].search , + var searchable = (that.p.columns[i].search === undefined) ? true: that.p.columns[i].search, hidden = (that.p.columns[i].hidden === true), ignoreHiding = (that.p.columns[i].searchoptions.searchhidden === true); if ((ignoreHiding && searchable) || (searchable && !hidden)) { @@ -6396,7 +6607,7 @@ var opr; if( cm.searchoptions.sopt ) {opr = cm.searchoptions.sopt;} else if(that.p.sopt) { opr= that.p.sopt; } - else if (cm.searchtype === 'string') {opr = that.p.stropts;} + else if ( $.inArray(cm.searchtype, that.p.strarr) !== -1 ) {opr = that.p.stropts;} else {opr = that.p.numopts;} group.rules.push({ @@ -6469,7 +6680,7 @@ // save current entity in a variable so that it could // be referenced in anonimous method calls - var that=this, tr = $("<tr></tr>"), + var that=this, $t = getGrid(), tr = $("<tr></tr>"), //document.createElement("tr"), // first column used for padding @@ -6504,43 +6715,44 @@ cm.searchoptions.size = 10; } } - var elm = $.jgrid.createEl(cm.inputtype,cm.searchoptions, "", true, that.p.ajaxSelectOptions, true); + var elm = $.jgrid.createEl.call($t, cm.inputtype,cm.searchoptions, "", true, that.p.ajaxSelectOptions, true); $(elm).addClass("input-elm"); //that.createElement(rule, ""); if( cm.searchoptions.sopt ) {op = cm.searchoptions.sopt;} else if(that.p.sopt) { op= that.p.sopt; } - else if (cm.searchtype === 'string') {op = that.p.stropts;} + else if ($.inArray(cm.searchtype, that.p.strarr) !== -1) {op = that.p.stropts;} else {op = that.p.numopts;} // operators var s ="", so = 0; aoprs = []; - $.each(that.p.ops, function() { aoprs.push(this.name) }); + $.each(that.p.ops, function() { aoprs.push(this.oper); }); for ( i = 0 ; i < op.length; i++) { ina = $.inArray(op[i],aoprs); if(ina !== -1) { if(so===0) { - rule.op = that.p.ops[ina].name; + rule.op = that.p.ops[ina].oper; } - s += "<option value='"+that.p.ops[ina].name+"'>"+that.p.ops[ina].description+"</option>"; + s += "<option value='"+that.p.ops[ina].oper+"'>"+that.p.ops[ina].text+"</option>"; so++; } } $(".selectopts",trpar).empty().append( s ); $(".selectopts",trpar)[0].selectedIndex = 0; - if( $.browser.msie && $.browser.version < 9) { - var sw = parseInt($("select.selectopts",trpar)[0].offsetWidth) + 1; + if( $.jgrid.msie && $.jgrid.msiever() < 9) { + var sw = parseInt($("select.selectopts",trpar)[0].offsetWidth, 10) + 1; $(".selectopts",trpar).width( sw ); $(".selectopts",trpar).css("width","auto"); } // data $(".data",trpar).empty().append( elm ); + $.jgrid.bindEv.call($t, elm, cm.searchoptions); $(".input-elm",trpar).bind('change',function( e ) { var tmo = $(this).hasClass("ui-autocomplete-input") ? 200 :0; setTimeout(function(){ var elem = e.target; rule.data = elem.nodeName.toUpperCase() === "SPAN" && cm.searchoptions && $.isFunction(cm.searchoptions.custom_value) ? - cm.searchoptions.custom_value($(elem).children(".customelement:first"), 'get') : elem.value; + cm.searchoptions.custom_value.call($t, $(elem).children(".customelement:first"), 'get') : elem.value; that.onchange(); // signals that the filter has changed }, tmo); }); @@ -6554,8 +6766,8 @@ var j=0; for (i = 0; i < that.p.columns.length; i++) { // but show only serchable and serchhidden = true fields - var searchable = (typeof that.p.columns[i].search === 'undefined') ? true: that.p.columns[i].search , - hidden = (that.p.columns[i].hidden === true), + var searchable = (that.p.columns[i].search === undefined) ? true: that.p.columns[i].search, + hidden = (that.p.columns[i].hidden === true), ignoreHiding = (that.p.columns[i].searchoptions.searchhidden === true); if ((ignoreHiding && searchable) || (searchable && !hidden)) { selected = ""; @@ -6581,8 +6793,11 @@ cm.searchoptions.size = 10; } } - var ruleDataInput = $.jgrid.createEl(cm.inputtype,cm.searchoptions, rule.data, true, that.p.ajaxSelectOptions, true); - + var ruleDataInput = $.jgrid.createEl.call($t, cm.inputtype,cm.searchoptions, rule.data, true, that.p.ajaxSelectOptions, true); + if(rule.op === 'nu' || rule.op === 'nn') { + $(ruleDataInput).attr('readonly','true'); + $(ruleDataInput).attr('disabled','true'); + } //retain the state of disabled text fields in case of null ops // dropdown for: choosing operator var ruleOperatorSelect = $("<select class='selectopts'></select>"); ruleOperatorTd.append(ruleOperatorSelect); @@ -6606,15 +6821,15 @@ // populate drop down with all available operators if( cm.searchoptions.sopt ) {op = cm.searchoptions.sopt;} else if(that.p.sopt) { op= that.p.sopt; } - else if (cm.searchtype === 'string') {op = p.stropts;} + else if ($.inArray(cm.searchtype, that.p.strarr) !== -1) {op = that.p.stropts;} else {op = that.p.numopts;} str=""; - $.each(that.p.ops, function() { aoprs.push(this.name) }); + $.each(that.p.ops, function() { aoprs.push(this.oper); }); for ( i = 0; i < op.length; i++) { ina = $.inArray(op[i],aoprs); if(ina !== -1) { - selected = rule.op === that.p.ops[ina].name ? " selected='selected'" : ""; - str += "<option value='"+that.p.ops[ina].name+"'"+selected+">"+that.p.ops[ina].description+"</option>"; + selected = rule.op === that.p.ops[ina].oper ? " selected='selected'" : ""; + str += "<option value='"+that.p.ops[ina].oper+"'"+selected+">"+that.p.ops[ina].text+"</option>"; } } ruleOperatorSelect.append( str ); @@ -6626,11 +6841,11 @@ // is created previously //ruleDataInput.setAttribute("type", "text"); ruleDataTd.append(ruleDataInput); - + $.jgrid.bindEv.call($t, ruleDataInput, cm.searchoptions); $(ruleDataInput) .addClass("input-elm") .bind('change', function() { - rule.data = cm.inputtype === 'custom' ? cm.searchoptions.custom_value($(this).children(".customelement:first"),'get') : $(this).val(); + rule.data = cm.inputtype === 'custom' ? cm.searchoptions.custom_value.call($t, $(this).children(".customelement:first"),'get') : $(this).val(); that.onchange(); // signals that the filter has changed }); @@ -6689,17 +6904,16 @@ if (s === "()") { return ""; // ignore groups that don't have rules - } else { - return s; } + return s; }; this.getStringForRule = function(rule) { var opUF = "",opC="", i, cm, ret, val, numtypes = ['int', 'integer', 'float', 'number', 'currency']; // jqGrid for (i = 0; i < this.p.ops.length; i++) { - if (this.p.ops[i].name === rule.op) { - opUF = this.p.ops[i].operator; - opC = this.p.ops[i].name; + if (this.p.ops[i].oper === rule.op) { + opUF = this.p.operands.hasOwnProperty(rule.op) ? this.p.operands[rule.op] : ""; + opC = this.p.ops[i].oper; break; } } @@ -6709,6 +6923,7 @@ break; } } + if (cm === undefined) { return ""; } val = rule.data; if(opC === 'bw' || opC === 'bn') { val = val+"%"; } if(opC === 'ew' || opC === 'en') { val = "%"+val; } @@ -6787,9 +7002,8 @@ if (s === "()") { return ""; // ignore groups that don't have rules - } else { - return s; } + return s; } return getStringForGroup(this.p.filter); @@ -6844,7 +7058,7 @@ }, addFilter: function (pfilter) { if (typeof pfilter === "string") { - pfilter = jQuery.jgrid.parse( pfilter ); + pfilter = $.jgrid.parse( pfilter ); } this.each(function(){ this.p.filter = pfilter; @@ -6855,7 +7069,8 @@ }); })(jQuery); - +/*jshint eqeqeq:false, eqnull:true, devel:true */ +/*global xmlJsonClass, jQuery */ (function($){ /** * jqGrid extension for form editing Grid Data @@ -6866,11 +7081,10 @@ * http://www.gnu.org/licenses/gpl-2.0.html **/ "use strict"; -/*global xmlJsonClass, jQuery, $ */ var rp_ge = {}; $.jgrid.extend({ searchGrid : function (p) { - p = $.extend({ + p = $.extend(true, { recreateFilter: false, drag: true, sField:'searchField', @@ -6900,9 +7114,6 @@ dataheight: 'auto', showQuery: false, errorcheck : true, - // translation - // if you want to change or remove the order change it in sopt - // ['eq','ne','lt','le','gt','ge','bw','bn','in','ni','ew','en','cn','nc'], sopt: null, stringResult: undefined, onClose : null, @@ -6913,10 +7124,10 @@ columns : [], tmplNames : null, tmplFilters : null, - // translations - later in lang file tmplLabel : ' Template: ', showOnLoad: false, - layer: null + layer: null, + operands : { "eq" :"=", "ne":"<>","lt":"<","le":"<=","gt":">","ge":">=","bw":"LIKE","bn":"NOT LIKE","in":"IN","ni":"NOT IN","ew":"LIKE","en":"NOT LIKE","cn":"LIKE","nc":"NOT LIKE","nu":"IS NULL","nn":"ISNOT NULL"} }, $.jgrid.search, p || {}); return this.each(function() { var $t = this; @@ -6925,7 +7136,7 @@ showFrm = true, IDs = {themodal:'searchmod'+fid,modalhead:'searchhd'+fid,modalcontent:'searchcnt'+fid, scrollelm : fid}, defaultFilters = $t.p.postData[p.sFilter]; - if(typeof(defaultFilters) === "string") { + if(typeof defaultFilters === "string") { defaultFilters = $.jgrid.parse( defaultFilters ); } if(p.recreateFilter === true) { @@ -6933,7 +7144,7 @@ } function showFilter(_filter) { showFrm = $($t).triggerHandler("jqGridFilterBeforeShow", [_filter]); - if(typeof(showFrm) === "undefined") { + if(showFrm === undefined) { showFrm = true; } if(showFrm && $.isFunction(p.beforeShowSearch)) { @@ -6952,7 +7163,7 @@ } else { var fil = $("<div><div id='"+fid+"' class='searchFilter' style='overflow:auto'></div></div>").insertBefore("#gview_"+$.jgrid.jqID($t.p.id)), align = "left", butleft =""; - if($t.p.direction == "rtl") { + if($t.p.direction === "rtl") { align = "right"; butleft = " style='text-align:left'"; fil.attr("dir","rtl"); @@ -6971,7 +7182,7 @@ } // find first searchable column and set it if no default filter if(!found) { - var searchable = (typeof n.search === 'undefined') ? true: n.search , + var searchable = (n.search === undefined) ? true: n.search , hidden = (n.hidden === true), ignoreHiding = (n.searchoptions && n.searchoptions.searchhidden === true); if ((ignoreHiding && searchable) || (searchable && !hidden)) { @@ -6983,6 +7194,8 @@ }); } else { columns = p.columns; + cmi = 0; + colnm = columns[0].index || columns[0].name; } // old behaviour if( (!defaultFilters && colnm) || p.multipleSearch === false ) { @@ -6992,7 +7205,7 @@ } else if(p.sopt && p.sopt.length) { cmop = p.sopt[0]; } - defaultFilters = {"groupOp": "AND",rules:[{"field":colnm,"op":cmop,"data":""}]}; + defaultFilters = {groupOp: "AND", rules: [{field: colnm, op: cmop, data: ""}]}; } found = false; if(p.tmplNames && p.tmplNames.length) { @@ -7017,7 +7230,8 @@ groupButton : p.multipleGroup, ruleButtons : p.multipleSearch, afterRedraw : p.afterRedraw, - _gridsopt : $.jgrid.search.odata, + ops : p.odata, + operands : p.operands, ajaxSelectOptions: $t.p.ajaxSelectOptions, groupOps: p.groupOps, onChange : function() { @@ -7028,13 +7242,14 @@ p.afterChange.call($t, $("#"+fid), p); } }, - direction : $t.p.direction + direction : $t.p.direction, + id: $t.p.id }); fil.append( bt ); if(found && p.tmplFilters && p.tmplFilters.length) { $(".ui-template", fil).bind('change', function(){ var curtempl = $(this).val(); - if(curtempl=="default") { + if(curtempl==="default") { $("#"+fid).jqFilter('addFilter', defaultFilters); } else { $("#"+fid).jqFilter('addFilter', p.tmplFilters[parseInt(curtempl,10)]); @@ -7081,7 +7296,7 @@ } $("#"+fid+"_search").bind('click', function(){ var fl = $("#"+fid), - sdata={}, res , + sdata={}, res, filters = fl.jqFilter('filterData'); if(p.errorcheck) { fl[0].hideError(); @@ -7101,7 +7316,7 @@ res = JSON.stringify(filters); } catch (e2) { } } - if(typeof(res)==="string") { + if(typeof res==="string") { sdata[p.sFilter] = res; $.each([p.sField,p.sValue, p.sOper], function() {sdata[this] = "";}); } @@ -7158,10 +7373,11 @@ }); }, editGridRow : function(rowid, p){ - p = $.extend({ + p = $.extend(true, { top : 0, left: 0, width: 300, + datawidth: 'auto', height: 'auto', dataheight: 'auto', modal: false, @@ -7201,7 +7417,8 @@ onClose : null, ajaxEditOptions : {}, serializeEditData : null, - viewPagerButtons : true + viewPagerButtons : true, + overlayClass : 'ui-widget-overlay' }, $.jgrid.edit, p || {}); rp_ge[$(this)[0].p.id] = p; return this.each(function(){ @@ -7215,7 +7432,7 @@ onBeforeInit = $.isFunction(rp_ge[$t.p.id].beforeInitData) ? rp_ge[$t.p.id].beforeInitData : false, onInitializeForm = $.isFunction(rp_ge[$t.p.id].onInitializeForm) ? rp_ge[$t.p.id].onInitializeForm : false, showFrm = true, - maxCols = 1, maxRows=0, postdata, extpost, newData, diff, frmoper; + maxCols = 1, maxRows=0, postdata, diff, frmoper; frmgr = $.jgrid.jqID(frmgr); if (rowid === "new") { rowid = "_empty"; @@ -7243,8 +7460,8 @@ postdata[nm] = this.editoptions.custom_value.call($t, $("#"+$.jgrid.jqID(nm),frmtb),'get'); if (postdata[nm] === undefined) {throw "e1";} } catch (e) { - if (e==="e1") {$.jgrid.info_dialog(jQuery.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.novalue,jQuery.jgrid.edit.bClose);} - else {$.jgrid.info_dialog(jQuery.jgrid.errors.errcap,e.message,jQuery.jgrid.edit.bClose);} + if (e==="e1") {$.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.novalue,$.jgrid.edit.bClose);} + else {$.jgrid.info_dialog($.jgrid.errors.errcap,e.message,$.jgrid.edit.bClose);} } return true; } @@ -7261,7 +7478,6 @@ break; case "select-one": postdata[this.name]= $("option:selected",this).val(); - extpost[this.name]= $("option:selected",this).text(); break; case "select-multiple": postdata[this.name]= $(this).val(); @@ -7273,7 +7489,6 @@ selectedText[i] = $(selected).text(); } ); - extpost[this.name]= selectedText.join(","); break; case "password": case "text": @@ -7294,7 +7509,7 @@ for (i =1; i<=maxcols;i++) { tmpl += tdtmpl; } - if(rowid != '_empty') { + if(rowid !== '_empty') { ind = $(obj).jqGrid("getInd",rowid); } $(obj.p.colModel).each( function(i) { @@ -7310,32 +7525,32 @@ if(ind === false) { tmp = ""; } else { - if(nm == obj.p.ExpandColumn && obj.p.treeGrid === true) { - tmp = $("td:eq("+i+")",obj.rows[ind]).text(); + if(nm === obj.p.ExpandColumn && obj.p.treeGrid === true) { + tmp = $("td[role='gridcell']:eq("+i+")",obj.rows[ind]).text(); } else { try { - tmp = $.unformat.call(obj, $("td:eq("+i+")",obj.rows[ind]),{rowId:rowid, colModel:this},i); + tmp = $.unformat.call(obj, $("td[role='gridcell']:eq("+i+")",obj.rows[ind]),{rowId:rowid, colModel:this},i); } catch (_) { - tmp = (this.edittype && this.edittype == "textarea") ? $("td:eq("+i+")",obj.rows[ind]).text() : $("td:eq("+i+")",obj.rows[ind]).html(); + tmp = (this.edittype && this.edittype === "textarea") ? $("td[role='gridcell']:eq("+i+")",obj.rows[ind]).text() : $("td[role='gridcell']:eq("+i+")",obj.rows[ind]).html(); } - if(!tmp || tmp == " " || tmp == " " || (tmp.length==1 && tmp.charCodeAt(0)==160) ) {tmp='';} + if(!tmp || tmp === " " || tmp === " " || (tmp.length===1 && tmp.charCodeAt(0)===160) ) {tmp='';} } } var opt = $.extend({}, this.editoptions || {} ,{id:nm,name:nm}), frmopt = $.extend({}, {elmprefix:'',elmsuffix:'',rowabove:false,rowcontent:''}, this.formoptions || {}), rp = parseInt(frmopt.rowpos,10) || cnt+1, cp = parseInt((parseInt(frmopt.colpos,10) || 1)*2,10); - if(rowid == "_empty" && opt.defaultValue ) { + if(rowid === "_empty" && opt.defaultValue ) { tmp = $.isFunction(opt.defaultValue) ? opt.defaultValue.call($t) : opt.defaultValue; } if(!this.edittype) {this.edittype = "text";} if($t.p.autoencode) {tmp = $.jgrid.htmlDecode(tmp);} elc = $.jgrid.createEl.call($t,this.edittype,opt,tmp,false,$.extend({},$.jgrid.ajaxOptions,obj.p.ajaxSelectOptions || {})); - if(tmp === "" && this.edittype == "checkbox") {tmp = $(elc).attr("offval");} - if(tmp === "" && this.edittype == "select") {tmp = $("option:eq(0)",elc).text();} + //if(tmp === "" && this.edittype == "checkbox") {tmp = $(elc).attr("offval");} + //if(tmp === "" && this.edittype == "select") {tmp = $("option:eq(0)",elc).text();} if(rp_ge[$t.p.id].checkOnSubmit || rp_ge[$t.p.id].checkOnUpdate) {rp_ge[$t.p.id]._savedData[nm] = tmp;} $(elc).addClass("FormElement"); - if(this.edittype == 'text' || this.edittype == 'textarea') { + if( $.inArray(this.edittype, ['text','textarea','password','select']) > -1) { $(elc).addClass("ui-widget-content ui-corner-all"); } trdata = $(tb).find("tr[rowpos="+rp+"]"); @@ -7350,8 +7565,12 @@ $(tb).append(trdata); trdata[0].rp = rp; } - $("td:eq("+(cp-2)+")",trdata[0]).html( typeof frmopt.label === 'undefined' ? obj.p.colNames[i]: frmopt.label); + $("td:eq("+(cp-2)+")",trdata[0]).html(frmopt.label === undefined ? obj.p.colNames[i]: frmopt.label); $("td:eq("+(cp-1)+")",trdata[0]).append(frmopt.elmprefix).append(elc).append(frmopt.elmsuffix); + if($.isFunction(opt.custom_value) && rowid !== "_empty" ) { + opt.custom_value.call($t, $("#"+nm,"#"+frmgr),'set',tmp); + } + $.jgrid.bindEv.call($t, elc, opt); retpos[cnt] = i; cnt++; } @@ -7368,7 +7587,7 @@ var nm,cnt=0,tmp, fld,opt,vl,vlc; if(rp_ge[$t.p.id].checkOnSubmit || rp_ge[$t.p.id].checkOnUpdate) {rp_ge[$t.p.id]._savedData = {};rp_ge[$t.p.id]._savedData[obj.p.id+"_id"]=rowid;} var cm = obj.p.colModel; - if(rowid == '_empty') { + if(rowid === '_empty') { $(cm).each(function(){ nm = this.name; opt = $.extend({}, this.editoptions || {} ); @@ -7377,9 +7596,9 @@ vl = ""; if(opt.defaultValue ) { vl = $.isFunction(opt.defaultValue) ? opt.defaultValue.call($t) : opt.defaultValue; - if(fld[0].type=='checkbox') { + if(fld[0].type==='checkbox') { vlc = vl.toLowerCase(); - if(vlc.search(/(false|0|no|off|undefined)/i)<0 && vlc!=="") { + if(vlc.search(/(false|f|0|no|n|off|undefined)/i)<0 && vlc!=="") { fld[0].checked = true; fld[0].defaultChecked = true; fld[0].value = vl; @@ -7389,11 +7608,11 @@ } } else {fld.val(vl);} } else { - if( fld[0].type=='checkbox' ) { + if( fld[0].type==='checkbox' ) { fld[0].checked = false; fld[0].defaultChecked = false; vl = $(fld).attr("offval"); - } else if (fld[0].type && fld[0].type.substr(0,6)=='select') { + } else if (fld[0].type && fld[0].type.substr(0,6)==='select') { fld[0].selectedIndex = 0; } else { fld.val(vl); @@ -7411,13 +7630,13 @@ nm = cm[i].name; // hidden fields are included in the form if ( nm !== 'cb' && nm !== 'subgrid' && nm !== 'rn' && cm[i].editable===true) { - if(nm == obj.p.ExpandColumn && obj.p.treeGrid === true) { + if(nm === obj.p.ExpandColumn && obj.p.treeGrid === true) { tmp = $(this).text(); } else { try { tmp = $.unformat.call(obj, $(this),{rowId:rowid, colModel:cm[i]},i); } catch (_) { - tmp = cm[i].edittype=="textarea" ? $(this).text() : $(this).html(); + tmp = cm[i].edittype==="textarea" ? $(this).text() : $(this).html(); } } if($t.p.autoencode) {tmp = $.jgrid.htmlDecode(tmp);} @@ -7429,14 +7648,14 @@ case "button" : case "image": case "textarea": - if(tmp == " " || tmp == " " || (tmp.length==1 && tmp.charCodeAt(0)==160) ) {tmp='';} + if(tmp === " " || tmp === " " || (tmp.length===1 && tmp.charCodeAt(0)===160) ) {tmp='';} $("#"+nm,"#"+fmid).val(tmp); break; case "select": var opv = tmp.split(","); opv = $.map(opv,function(n){return $.trim(n);}); $("#"+nm+" option","#"+fmid).each(function(){ - if (!cm[i].editoptions.multiple && ($.trim(tmp) == $.trim($(this).text()) || opv[0] == $.trim($(this).text()) || opv[0] == $.trim($(this).val())) ){ + if (!cm[i].editoptions.multiple && ($.trim(tmp) === $.trim($(this).text()) || opv[0] === $.trim($(this).text()) || opv[0] === $.trim($(this).val())) ){ this.selected= true; } else if (cm[i].editoptions.multiple){ if( $.inArray($.trim($(this).text()), opv ) > -1 || $.inArray($.trim($(this).val()), opv ) > -1 ){ @@ -7450,19 +7669,17 @@ }); break; case "checkbox": - tmp = tmp+""; + tmp = String(tmp); if(cm[i].editoptions && cm[i].editoptions.value) { var cb = cm[i].editoptions.value.split(":"); - if(cb[0] == tmp) { - $("#"+nm,"#"+fmid)[$t.p.useProp ? 'prop': 'attr']("checked",true); - $("#"+nm,"#"+fmid)[$t.p.useProp ? 'prop': 'attr']("defaultChecked",true); //ie + if(cb[0] === tmp) { + $("#"+nm,"#"+fmid)[$t.p.useProp ? 'prop': 'attr']({"checked":true, "defaultChecked" : true}); } else { - $("#"+nm,"#"+fmid)[$t.p.useProp ? 'prop': 'attr']("checked", false); - $("#"+nm,"#"+fmid)[$t.p.useProp ? 'prop': 'attr']("defaultChecked", false); //ie + $("#"+nm,"#"+fmid)[$t.p.useProp ? 'prop': 'attr']({"checked":false, "defaultChecked" : false}); } } else { tmp = tmp.toLowerCase(); - if(tmp.search(/(false|0|no|off|undefined)/i)<0 && tmp!=="") { + if(tmp.search(/(false|f|0|no|n|off|undefined)/i)<0 && tmp!=="") { $("#"+nm,"#"+fmid)[$t.p.useProp ? 'prop': 'attr']("checked",true); $("#"+nm,"#"+fmid)[$t.p.useProp ? 'prop': 'attr']("defaultChecked",true); //ie } else { @@ -7477,8 +7694,8 @@ cm[i].editoptions.custom_value.call($t, $("#"+nm,"#"+fmid),'set',tmp); } else {throw "e1";} } catch (e) { - if (e=="e1") {$.jgrid.info_dialog(jQuery.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.nodefined,jQuery.jgrid.edit.bClose);} - else {$.jgrid.info_dialog(jQuery.jgrid.errors.errcap,e.message,jQuery.jgrid.edit.bClose);} + if (e==="e1") {$.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.nodefined,$.jgrid.edit.bClose);} + else {$.jgrid.info_dialog($.jgrid.errors.errcap,e.message,$.jgrid.edit.bClose);} } break; } @@ -7500,15 +7717,15 @@ var copydata, ret=[true,"",""], onCS = {}, opers = $t.p.prmNames, idname, oper, key, selr, i; var retvals = $($t).triggerHandler("jqGridAddEditBeforeCheckValues", [$("#"+frmgr), frmoper]); - if(retvals && typeof(retvals) === 'object') {postdata = retvals;} + if(retvals && typeof retvals === 'object') {postdata = retvals;} if($.isFunction(rp_ge[$t.p.id].beforeCheckValues)) { - retvals = rp_ge[$t.p.id].beforeCheckValues.call($t, postdata,$("#"+frmgr),postdata[$t.p.id+"_id"] == "_empty" ? opers.addoper : opers.editoper); - if(retvals && typeof(retvals) === 'object') {postdata = retvals;} + retvals = rp_ge[$t.p.id].beforeCheckValues.call($t, postdata,$("#"+frmgr),frmoper); + if(retvals && typeof retvals === 'object') {postdata = retvals;} } for( key in postdata ){ if(postdata.hasOwnProperty(key)) { - ret = $.jgrid.checkValues.call($t,postdata[key],key,$t); + ret = $.jgrid.checkValues.call($t,postdata[key],key); if(ret[0] === false) {break;} } } @@ -7516,14 +7733,14 @@ if(ret[0]) { onCS = $($t).triggerHandler("jqGridAddEditClickSubmit", [rp_ge[$t.p.id], postdata, frmoper]); if( onCS === undefined && $.isFunction( rp_ge[$t.p.id].onclickSubmit)) { - onCS = rp_ge[$t.p.id].onclickSubmit.call($t, rp_ge[$t.p.id], postdata) || {}; + onCS = rp_ge[$t.p.id].onclickSubmit.call($t, rp_ge[$t.p.id], postdata, frmoper) || {}; } ret = $($t).triggerHandler("jqGridAddEditBeforeSubmit", [postdata, $("#"+frmgr), frmoper]); if(ret === undefined) { ret = [true,"",""]; } if( ret[0] && $.isFunction(rp_ge[$t.p.id].beforeSubmit)) { - ret = rp_ge[$t.p.id].beforeSubmit.call($t,postdata,$("#"+frmgr)); + ret = rp_ge[$t.p.id].beforeSubmit.call($t,postdata,$("#"+frmgr), frmoper); } } @@ -7533,8 +7750,8 @@ oper = opers.oper; idname = opers.id; // we add to pos data array the action - the name is oper - postdata[oper] = ($.trim(postdata[$t.p.id+"_id"]) == "_empty") ? opers.addoper : opers.editoper; - if(postdata[oper] != opers.addoper) { + postdata[oper] = ($.trim(postdata[$t.p.id+"_id"]) === "_empty") ? opers.addoper : opers.editoper; + if(postdata[oper] !== opers.addoper) { postdata[idname] = postdata[$t.p.id+"_id"]; } else { // check to see if we have allredy this field in the form and if yes lieve it @@ -7543,16 +7760,16 @@ delete postdata[$t.p.id+"_id"]; postdata = $.extend(postdata,rp_ge[$t.p.id].editData,onCS); if($t.p.treeGrid === true) { - if(postdata[oper] == opers.addoper) { + if(postdata[oper] === opers.addoper) { selr = $($t).jqGrid("getGridParam", 'selrow'); - var tr_par_id = $t.p.treeGridModel == 'adjacency' ? $t.p.treeReader.parent_id_field : 'parent_id'; + var tr_par_id = $t.p.treeGridModel === 'adjacency' ? $t.p.treeReader.parent_id_field : 'parent_id'; postdata[tr_par_id] = selr; } for(i in $t.p.treeReader){ if($t.p.treeReader.hasOwnProperty(i)) { var itm = $t.p.treeReader[i]; if(postdata.hasOwnProperty(itm)) { - if(postdata[oper] == opers.addoper && i === 'parent_id_field') {continue;} + if(postdata[oper] === opers.addoper && i === 'parent_id_field') {continue;} delete postdata[itm]; } } @@ -7561,18 +7778,19 @@ postdata[idname] = $.jgrid.stripPref($t.p.idPrefix, postdata[idname]); var ajaxOptions = $.extend({ - url: rp_ge[$t.p.id].url ? rp_ge[$t.p.id].url : $($t).jqGrid('getGridParam','editurl'), + url: rp_ge[$t.p.id].url || $($t).jqGrid('getGridParam','editurl'), type: rp_ge[$t.p.id].mtype, data: $.isFunction(rp_ge[$t.p.id].serializeEditData) ? rp_ge[$t.p.id].serializeEditData.call($t,postdata) : postdata, - complete:function(data,Status){ + complete:function(data,status){ + var key; postdata[idname] = $t.p.idPrefix + postdata[idname]; - if(Status != "success") { + if(data.status >= 300 && data.status !== 304) { ret[0] = false; ret[1] = $($t).triggerHandler("jqGridAddEditErrorTextFormat", [data, frmoper]); if ($.isFunction(rp_ge[$t.p.id].errorTextFormat)) { - ret[1] = rp_ge[$t.p.id].errorTextFormat.call($t, data); + ret[1] = rp_ge[$t.p.id].errorTextFormat.call($t, data, frmoper); } else { - ret[1] = Status + " Status: '" + data.statusText + "'. Error code: " + data.status; + ret[1] = status + " Status: '" + data.statusText + "'. Error code: " + data.status; } } else { // data is posted successful @@ -7582,20 +7800,13 @@ ret = [true,"",""]; } if( ret[0] && $.isFunction(rp_ge[$t.p.id].afterSubmit) ) { - ret = rp_ge[$t.p.id].afterSubmit.call($t, data,postdata); + ret = rp_ge[$t.p.id].afterSubmit.call($t, data,postdata, frmoper); } } if(ret[0] === false) { $("#FormError>td",frmtb).html(ret[1]); $("#FormError",frmtb).show(); } else { - // remove some values if formattaer select or checkbox - $.each($t.p.colModel, function(){ - if(extpost[this.name] && this.formatter && this.formatter=='select') { - try {delete extpost[this.name];} catch (e) {} - } - }); - postdata = $.extend(postdata,extpost); if($t.p.autoencode) { $.each(postdata,function(n,v){ postdata[n] = $.jgrid.htmlDecode(v); @@ -7603,42 +7814,28 @@ } //rp_ge[$t.p.id].reloadAfterSubmit = rp_ge[$t.p.id].reloadAfterSubmit && $t.p.datatype != "local"; // the action is add - if(postdata[oper] == opers.addoper ) { + if(postdata[oper] === opers.addoper ) { //id processing // user not set the id ret[2] if(!ret[2]) {ret[2] = $.jgrid.randId();} postdata[idname] = ret[2]; + if(rp_ge[$t.p.id].reloadAfterSubmit) { + $($t).trigger("reloadGrid"); + } else { + if($t.p.treeGrid === true){ + $($t).jqGrid("addChildNode",ret[2],selr,postdata ); + } else { + $($t).jqGrid("addRowData",ret[2],postdata,p.addedrow); + } + } if(rp_ge[$t.p.id].closeAfterAdd) { - if(rp_ge[$t.p.id].reloadAfterSubmit) {$($t).trigger("reloadGrid");} - else { - if($t.p.treeGrid === true){ - $($t).jqGrid("addChildNode",ret[2],selr,postdata ); - } else { - $($t).jqGrid("addRowData",ret[2],postdata,p.addedrow); + if($t.p.treeGrid !== true){ $($t).jqGrid("setSelection",ret[2]); } - } $.jgrid.hideModal("#"+$.jgrid.jqID(IDs.themodal),{gb:"#gbox_"+$.jgrid.jqID(gID),jqm:p.jqModal,onClose: rp_ge[$t.p.id].onClose}); } else if (rp_ge[$t.p.id].clearAfterAdd) { - if(rp_ge[$t.p.id].reloadAfterSubmit) {$($t).trigger("reloadGrid");} - else { - if($t.p.treeGrid === true){ - $($t).jqGrid("addChildNode",ret[2],selr,postdata ); - } else { - $($t).jqGrid("addRowData",ret[2],postdata,p.addedrow); - } - } fillData("_empty",$t,frmgr); - } else { - if(rp_ge[$t.p.id].reloadAfterSubmit) {$($t).trigger("reloadGrid");} - else { - if($t.p.treeGrid === true){ - $($t).jqGrid("addChildNode",ret[2],selr,postdata ); - } else { - $($t).jqGrid("addRowData",ret[2],postdata,p.addedrow); } - } - } } else { // the action is update if(rp_ge[$t.p.id].reloadAfterSubmit) { @@ -7657,21 +7854,21 @@ copydata = data; setTimeout(function(){ $($t).triggerHandler("jqGridAddEditAfterComplete", [copydata, postdata, $("#"+frmgr), frmoper]); - rp_ge[$t.p.id].afterComplete.call($t, copydata, postdata, $("#"+frmgr)); + rp_ge[$t.p.id].afterComplete.call($t, copydata, postdata, $("#"+frmgr), frmoper); copydata=null; },500); } - if(rp_ge[$t.p.id].checkOnSubmit || rp_ge[$t.p.id].checkOnUpdate) { - $("#"+frmgr).data("disabled",false); - if(rp_ge[$t.p.id]._savedData[$t.p.id+"_id"] !="_empty"){ - for(var key in rp_ge[$t.p.id]._savedData) { - if(postdata[key]) { - rp_ge[$t.p.id]._savedData[key] = postdata[key]; + if(rp_ge[$t.p.id].checkOnSubmit || rp_ge[$t.p.id].checkOnUpdate) { + $("#"+frmgr).data("disabled",false); + if(rp_ge[$t.p.id]._savedData[$t.p.id+"_id"] !== "_empty"){ + for(key in rp_ge[$t.p.id]._savedData) { + if(rp_ge[$t.p.id]._savedData.hasOwnProperty(key) && postdata[key]) { + rp_ge[$t.p.id]._savedData[key] = postdata[key]; + } } } } } - } rp_ge[$t.p.id].processing=false; $("#sData", frmtb+"_2").removeClass('ui-state-active'); try{$(':input:visible',"#"+frmgr)[0].focus();} catch (e){} @@ -7688,17 +7885,17 @@ if (ret[0]) { if (rp_ge[$t.p.id].useDataProxy) { var dpret = $t.p.dataProxy.call($t, ajaxOptions, "set_"+$t.p.id); - if(typeof(dpret) == "undefined") { + if(dpret === undefined) { dpret = [true, ""]; } if(dpret[0] === false ) { ret[0] = false; ret[1] = dpret[1] || "Error deleting the selected row!" ; } else { - if(ajaxOptions.data.oper == opers.addoper && rp_ge[$t.p.id].closeAfterAdd ) { + if(ajaxOptions.data.oper === opers.addoper && rp_ge[$t.p.id].closeAfterAdd ) { $.jgrid.hideModal("#"+$.jgrid.jqID(IDs.themodal),{gb:"#gbox_"+$.jgrid.jqID(gID),jqm:p.jqModal, onClose: rp_ge[$t.p.id].onClose}); } - if(ajaxOptions.data.oper == opers.editoper && rp_ge[$t.p.id].closeAfterEdit ) { + if(ajaxOptions.data.oper === opers.editoper && rp_ge[$t.p.id].closeAfterEdit ) { $.jgrid.hideModal("#"+$.jgrid.jqID(IDs.themodal),{gb:"#gbox_"+$.jgrid.jqID(gID),jqm:p.jqModal, onClose: rp_ge[$t.p.id].onClose}); } } @@ -7716,7 +7913,7 @@ function compareData(nObj, oObj ) { var ret = false,key; for (key in nObj) { - if(nObj[key] != oObj[key]) { + if(nObj.hasOwnProperty(key) && nObj[key] != oObj[key]) { ret = true; break; } @@ -7727,10 +7924,9 @@ var stat = true; $("#FormError",frmtb).hide(); if(rp_ge[$t.p.id].checkOnUpdate) { - postdata = {};extpost={}; + postdata = {}; getFormData(); - newData = $.extend({},postdata,extpost); - diff = compareData(newData,rp_ge[$t.p.id]._savedData); + diff = compareData(postdata,rp_ge[$t.p.id]._savedData); if(diff) { $("#"+frmgr).data("disabled",true); $(".confirm","#"+IDs.themodal).show(); @@ -7741,8 +7937,9 @@ } function restoreInline() { - if (rowid !== "_empty" && typeof($t.p.savedRow) !== "undefined" && $t.p.savedRow.length > 0 && $.isFunction($.fn.jqGrid.restoreRow)) { - for (var i=0;i<$t.p.savedRow.length;i++) { + var i; + if (rowid !== "_empty" && $t.p.savedRow !== undefined && $t.p.savedRow.length > 0 && $.isFunction($.fn.jqGrid.restoreRow)) { + for (i=0;i<$t.p.savedRow.length;i++) { if ($t.p.savedRow[i].id == rowid) { $($t).jqGrid('restoreRow',rowid); break; @@ -7750,9 +7947,23 @@ } } } - function updateNav(cr,totr){ - if (cr===0) {$("#pData",frmtb+"_2").addClass('ui-state-disabled');} else {$("#pData",frmtb+"_2").removeClass('ui-state-disabled');} - if (cr==totr) {$("#nData",frmtb+"_2").addClass('ui-state-disabled');} else {$("#nData",frmtb+"_2").removeClass('ui-state-disabled');} + function updateNav(cr, posarr){ + var totr = posarr[1].length-1; + if (cr===0) { + $("#pData",frmtb+"_2").addClass('ui-state-disabled'); + } else if( posarr[1][cr-1] !== undefined && $("#"+$.jgrid.jqID(posarr[1][cr-1])).hasClass('ui-state-disabled')) { + $("#pData",frmtb+"_2").addClass('ui-state-disabled'); + } else { + $("#pData",frmtb+"_2").removeClass('ui-state-disabled'); + } + + if (cr===totr) { + $("#nData",frmtb+"_2").addClass('ui-state-disabled'); + } else if( posarr[1][cr+1] !== undefined && $("#"+$.jgrid.jqID(posarr[1][cr+1])).hasClass('ui-state-disabled')) { + $("#nData",frmtb+"_2").addClass('ui-state-disabled'); + } else { + $("#nData",frmtb+"_2").removeClass('ui-state-disabled'); + } } function getCurrPos() { var rowsInGrid = $($t).jqGrid("getDataIDs"), @@ -7763,11 +7974,11 @@ if ( $("#"+$.jgrid.jqID(IDs.themodal))[0] !== undefined ) { showFrm = $($t).triggerHandler("jqGridAddEditBeforeInitData", [$("#"+$.jgrid.jqID(frmgr)), frmoper]); - if(typeof(showFrm) == "undefined") { + if(showFrm === undefined) { showFrm = true; } if(showFrm && onBeforeInit) { - showFrm = onBeforeInit.call($t,$("#"+frmgr)); + showFrm = onBeforeInit.call($t,$("#"+frmgr), frmoper); } if(showFrm === false) {return;} restoreInline(); @@ -7788,7 +7999,7 @@ // filldata fillData(rowid,$t,frmgr); /// - if(rowid=="_empty" || !rp_ge[$t.p.id].viewPagerButtons) { + if(rowid==="_empty" || !rp_ge[$t.p.id].viewPagerButtons) { $("#pData, #nData",frmtb+"_2").hide(); } else { $("#pData, #nData",frmtb+"_2").show(); @@ -7802,28 +8013,29 @@ $("#"+frmgr).data("disabled",false); } $($t).triggerHandler("jqGridAddEditBeforeShowForm", [$("#"+frmgr), frmoper]); - if(onBeforeShow) { onBeforeShow.call($t, $("#"+frmgr)); } + if(onBeforeShow) { onBeforeShow.call($t, $("#"+frmgr), frmoper); } $("#"+$.jgrid.jqID(IDs.themodal)).data("onClose",rp_ge[$t.p.id].onClose); - $.jgrid.viewModal("#"+$.jgrid.jqID(IDs.themodal),{gbox:"#gbox_"+$.jgrid.jqID(gID),jqm:p.jqModal, jqM: false, overlay: p.overlay, modal:p.modal}); + $.jgrid.viewModal("#"+$.jgrid.jqID(IDs.themodal),{gbox:"#gbox_"+$.jgrid.jqID(gID),jqm:p.jqModal, jqM: false, overlay: p.overlay, modal:p.modal, overlayClass : p.overlayClass}); if(!closeovrl) { - $(".jqmOverlay").click(function(){ + $("." + $.jgrid.jqID(p.overlayClass)).click(function(){ if(!checkUpdates()) {return false;} $.jgrid.hideModal("#"+$.jgrid.jqID(IDs.themodal),{gb:"#gbox_"+$.jgrid.jqID(gID),jqm:p.jqModal, onClose: rp_ge[$t.p.id].onClose}); return false; }); } $($t).triggerHandler("jqGridAddEditAfterShowForm", [$("#"+frmgr), frmoper]); - if(onAfterShow) { onAfterShow.call($t, $("#"+frmgr)); } + if(onAfterShow) { onAfterShow.call($t, $("#"+frmgr), frmoper); } } else { var dh = isNaN(p.dataheight) ? p.dataheight : p.dataheight+"px", - frm = $("<form name='FormPost' id='"+frmgr+"' class='FormGrid' onSubmit='return false;' style='width:100%;overflow:auto;position:relative;height:"+dh+";'></form>").data("disabled",false), + dw = isNaN(p.datawidth) ? p.datawidth : p.datawidth+"px", + frm = $("<form name='FormPost' id='"+frmgr+"' class='FormGrid' onSubmit='return false;' style='width:"+dw+";overflow:auto;position:relative;height:"+dh+";'></form>").data("disabled",false), tbl = $("<table id='"+frmtborg+"' class='EditTable' cellspacing='0' cellpadding='0' border='0'><tbody></tbody></table>"); showFrm = $($t).triggerHandler("jqGridAddEditBeforeInitData", [$("#"+frmgr), frmoper]); - if(typeof(showFrm) == "undefined") { + if(showFrm === undefined) { showFrm = true; } if(showFrm && onBeforeInit) { - showFrm = onBeforeInit.call($t,$("#"+frmgr)); + showFrm = onBeforeInit.call($t,$("#"+frmgr,frmoper)); } if(showFrm === false) {return;} restoreInline(); @@ -7843,7 +8055,7 @@ // set the id. // use carefull only to change here colproperties. // create data - var rtlb = $t.p.direction == "rtl" ? true :false, + var rtlb = $t.p.direction === "rtl" ? true :false, bp = rtlb ? "nData" : "pData", bn = rtlb ? "pData" : "nData"; createData(rowid,$t,tbl,maxCols); @@ -7875,7 +8087,7 @@ p.closeOnEscape = false; cle = true; } - var tms = $("<span></span>").append(frm).append(bt); + var tms = $("<div></div>").append(frm).append(bt); $.jgrid.createModal(IDs,tms,p,"#gview_"+$.jgrid.jqID($t.p.id),$("#gbox_"+$.jgrid.jqID($t.p.id))[0]); if(rtlb) { $("#pData, #nData",frmtb+"_2").css("float","right"); @@ -7887,24 +8099,24 @@ $("#"+$.jgrid.jqID(IDs.themodal)).keydown( function( e ) { var wkey = e.target; if ($("#"+frmgr).data("disabled")===true ) {return false;}//?? - if(rp_ge[$t.p.id].savekey[0] === true && e.which == rp_ge[$t.p.id].savekey[1]) { // save - if(wkey.tagName != "TEXTAREA") { + if(rp_ge[$t.p.id].savekey[0] === true && e.which === rp_ge[$t.p.id].savekey[1]) { // save + if(wkey.tagName !== "TEXTAREA") { $("#sData", frmtb+"_2").trigger("click"); return false; } } if(e.which === 27) { if(!checkUpdates()) {return false;} - if(cle) {$.jgrid.hideModal(this,{gb:p.gbox,jqm:p.jqModal, onClose: rp_ge[$t.p.id].onClose});} + if(cle) {$.jgrid.hideModal("#"+$.jgrid.jqID(IDs.themodal),{gb:p.gbox,jqm:p.jqModal, onClose: rp_ge[$t.p.id].onClose});} return false; } if(rp_ge[$t.p.id].navkeys[0]===true) { - if($("#id_g",frmtb).val() == "_empty") {return true;} - if(e.which == rp_ge[$t.p.id].navkeys[1]){ //up + if($("#id_g",frmtb).val() === "_empty") {return true;} + if(e.which === rp_ge[$t.p.id].navkeys[1]){ //up $("#pData", frmtb+"_2").trigger("click"); return false; } - if(e.which == rp_ge[$t.p.id].navkeys[2]){ //down + if(e.which === rp_ge[$t.p.id].navkeys[2]){ //down $("#nData", frmtb+"_2").trigger("click"); return false; } @@ -7923,22 +8135,19 @@ p.closeicon = $.extend([true,"left","ui-icon-close"],p.closeicon); // beforeinitdata after creation of the form if(p.saveicon[0]===true) { - $("#sData",frmtb+"_2").addClass(p.saveicon[1] == "right" ? 'fm-button-icon-right' : 'fm-button-icon-left') + $("#sData",frmtb+"_2").addClass(p.saveicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left') .append("<span class='ui-icon "+p.saveicon[2]+"'></span>"); } if(p.closeicon[0]===true) { - $("#cData",frmtb+"_2").addClass(p.closeicon[1] == "right" ? 'fm-button-icon-right' : 'fm-button-icon-left') + $("#cData",frmtb+"_2").addClass(p.closeicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left') .append("<span class='ui-icon "+p.closeicon[2]+"'></span>"); } if(rp_ge[$t.p.id].checkOnSubmit || rp_ge[$t.p.id].checkOnUpdate) { bS ="<a href='javascript:void(0)' id='sNew' class='fm-button ui-state-default ui-corner-all' style='z-index:1002'>"+p.bYes+"</a>"; bN ="<a href='javascript:void(0)' id='nNew' class='fm-button ui-state-default ui-corner-all' style='z-index:1002'>"+p.bNo+"</a>"; bC ="<a href='javascript:void(0)' id='cNew' class='fm-button ui-state-default ui-corner-all' style='z-index:1002'>"+p.bExit+"</a>"; - var ii, zI = p.zIndex || 999;zI ++; - if ($.browser.msie && $.browser.version ==6) { - ii = '<iframe style="display:block;position:absolute;z-index:-1;filter:Alpha(Opacity=\'0\');" src="javascript:false;"></iframe>'; - } else {ii="";} - $("<div class='ui-widget-overlay jqgrid-overlay confirm' style='z-index:"+zI+";display:none;'> "+ii+"</div><div class='confirm ui-widget-content ui-jqconfirm' style='z-index:"+(zI+1)+"'>"+p.saveData+"<br/><br/>"+bS+bN+bC+"</div>").insertAfter("#"+frmgr); + var zI = p.zIndex || 999;zI ++; + $("<div class='"+ p.overlayClass+" jqgrid-overlay confirm' style='z-index:"+zI+";display:none;'> "+"</div><div class='confirm ui-widget-content ui-jqconfirm' style='z-index:"+(zI+1)+"'>"+p.saveData+"<br/><br/>"+bS+bN+bC+"</div>").insertAfter("#"+frmgr); $("#sNew","#"+$.jgrid.jqID(IDs.themodal)).click(function(){ postIt(); $("#"+frmgr).data("disabled",false); @@ -7948,7 +8157,7 @@ $("#nNew","#"+$.jgrid.jqID(IDs.themodal)).click(function(){ $(".confirm","#"+$.jgrid.jqID(IDs.themodal)).hide(); $("#"+frmgr).data("disabled",false); - setTimeout(function(){$(":input","#"+frmgr)[0].focus();},0); + setTimeout(function(){$(":input:visible","#"+frmgr)[0].focus();},0); return false; }); $("#cNew","#"+$.jgrid.jqID(IDs.themodal)).click(function(){ @@ -7960,37 +8169,36 @@ } // here initform - only once $($t).triggerHandler("jqGridAddEditInitializeForm", [$("#"+frmgr), frmoper]); - if(onInitializeForm) {onInitializeForm.call($t,$("#"+frmgr));} - if(rowid=="_empty" || !rp_ge[$t.p.id].viewPagerButtons) {$("#pData,#nData",frmtb+"_2").hide();} else {$("#pData,#nData",frmtb+"_2").show();} + if(onInitializeForm) {onInitializeForm.call($t,$("#"+frmgr), frmoper);} + if(rowid==="_empty" || !rp_ge[$t.p.id].viewPagerButtons) {$("#pData,#nData",frmtb+"_2").hide();} else {$("#pData,#nData",frmtb+"_2").show();} $($t).triggerHandler("jqGridAddEditBeforeShowForm", [$("#"+frmgr), frmoper]); - if(onBeforeShow) { onBeforeShow.call($t, $("#"+frmgr));} + if(onBeforeShow) { onBeforeShow.call($t, $("#"+frmgr), frmoper);} $("#"+$.jgrid.jqID(IDs.themodal)).data("onClose",rp_ge[$t.p.id].onClose); - $.jgrid.viewModal("#"+$.jgrid.jqID(IDs.themodal),{gbox:"#gbox_"+$.jgrid.jqID(gID),jqm:p.jqModal, overlay: p.overlay,modal:p.modal}); + $.jgrid.viewModal("#"+$.jgrid.jqID(IDs.themodal),{gbox:"#gbox_"+$.jgrid.jqID(gID),jqm:p.jqModal, overlay: p.overlay,modal:p.modal, overlayClass: p.overlayClass}); if(!closeovrl) { - $(".jqmOverlay").click(function(){ + $("." + $.jgrid.jqID(p.overlayClass)).click(function(){ if(!checkUpdates()) {return false;} $.jgrid.hideModal("#"+$.jgrid.jqID(IDs.themodal),{gb:"#gbox_"+$.jgrid.jqID(gID),jqm:p.jqModal, onClose: rp_ge[$t.p.id].onClose}); return false; }); } $($t).triggerHandler("jqGridAddEditAfterShowForm", [$("#"+frmgr), frmoper]); - if(onAfterShow) { onAfterShow.call($t, $("#"+frmgr)); } + if(onAfterShow) { onAfterShow.call($t, $("#"+frmgr), frmoper); } $(".fm-button","#"+$.jgrid.jqID(IDs.themodal)).hover( function(){$(this).addClass('ui-state-hover');}, function(){$(this).removeClass('ui-state-hover');} ); $("#sData", frmtb+"_2").click(function(){ - postdata = {};extpost={}; + postdata = {}; $("#FormError",frmtb).hide(); // all depend on ret array //ret[0] - succes //ret[1] - msg if not succes //ret[2] - the id that will be set if reload after submit false getFormData(); - if(postdata[$t.p.id+"_id"] == "_empty") {postIt();} + if(postdata[$t.p.id+"_id"] === "_empty") {postIt();} else if(p.checkOnSubmit===true ) { - newData = $.extend({},postdata,extpost); - diff = compareData(newData,rp_ge[$t.p.id]._savedData); + diff = compareData(postdata,rp_ge[$t.p.id]._savedData); if(diff) { $("#"+frmgr).data("disabled",true); $(".confirm","#"+$.jgrid.jqID(IDs.themodal)).show(); @@ -8012,9 +8220,9 @@ $("#FormError",frmtb).hide(); var npos = getCurrPos(); npos[0] = parseInt(npos[0],10); - if(npos[0] != -1 && npos[1][npos[0]+1]) { + if(npos[0] !== -1 && npos[1][npos[0]+1]) { $($t).triggerHandler("jqGridAddEditClickPgButtons", ['next',$("#"+frmgr),npos[1][npos[0]]]); - var nposret = true; + var nposret; if($.isFunction(p.onclickPgButtons)) { nposret = p.onclickPgButtons.call($t, 'next',$("#"+frmgr),npos[1][npos[0]]); if( nposret !== undefined && nposret === false ) {return false;} @@ -8026,7 +8234,7 @@ if($.isFunction(p.afterclickPgButtons)) { p.afterclickPgButtons.call($t, 'next',$("#"+frmgr),npos[1][npos[0]+1]); } - updateNav(npos[0]+1,npos[1].length-1); + updateNav(npos[0]+1,npos); } return false; }); @@ -8034,9 +8242,9 @@ if(!checkUpdates()) {return false;} $("#FormError",frmtb).hide(); var ppos = getCurrPos(); - if(ppos[0] != -1 && ppos[1][ppos[0]-1]) { + if(ppos[0] !== -1 && ppos[1][ppos[0]-1]) { $($t).triggerHandler("jqGridAddEditClickPgButtons", ['prev',$("#"+frmgr),ppos[1][ppos[0]]]); - var pposret = true; + var pposret; if($.isFunction(p.onclickPgButtons)) { pposret = p.onclickPgButtons.call($t, 'prev',$("#"+frmgr),ppos[1][ppos[0]]); if( pposret !== undefined && pposret === false ) {return false;} @@ -8048,21 +8256,22 @@ if($.isFunction(p.afterclickPgButtons)) { p.afterclickPgButtons.call($t, 'prev',$("#"+frmgr),ppos[1][ppos[0]-1]); } - updateNav(ppos[0]-1,ppos[1].length-1); + updateNav(ppos[0]-1,ppos); } return false; }); } var posInit =getCurrPos(); - updateNav(posInit[0],posInit[1].length-1); + updateNav(posInit[0],posInit); }); }, viewGridRow : function(rowid, p){ - p = $.extend({ + p = $.extend(true, { top : 0, left: 0, width: 0, + datawidth: 'auto', height: 'auto', dataheight: 'auto', modal: false, @@ -8077,7 +8286,8 @@ onClose: null, beforeShowForm : null, beforeInitData : null, - viewPagerButtons : true + viewPagerButtons : true, + recreateForm : false }, $.jgrid.view, p || {}); rp_ge[$(this)[0].p.id] = p; return this.each(function(){ @@ -8090,18 +8300,21 @@ onBeforeInit = $.isFunction(rp_ge[$t.p.id].beforeInitData) ? rp_ge[$t.p.id].beforeInitData : false, showFrm = true, maxCols = 1, maxRows=0; + if(p.recreateForm===true && $("#"+$.jgrid.jqID(IDs.themodal))[0] !== undefined) { + $("#"+$.jgrid.jqID(IDs.themodal)).remove(); + } function focusaref(){ //Sfari 3 issues if(rp_ge[$t.p.id].closeOnEscape===true || rp_ge[$t.p.id].navkeys[0]===true) { setTimeout(function(){$(".ui-jqdialog-titlebar-close","#"+$.jgrid.jqID(IDs.modalhead)).focus();},0); } } function createData(rowid,obj,tb,maxcols){ - var nm, hc,trdata, cnt=0,tmp, dc, retpos=[], ind=false, + var nm, hc,trdata, cnt=0,tmp, dc, retpos=[], ind=false, i, tdtmpl = "<td class='CaptionTD form-view-label ui-widget-content' width='"+p.labelswidth+"'> </td><td class='DataTD form-view-data ui-helper-reset ui-widget-content'> </td>", tmpl="", tdtmpl2 = "<td class='CaptionTD form-view-label ui-widget-content'> </td><td class='DataTD form-view-data ui-widget-content'> </td>", fmtnum = ['integer','number','currency'],max1 =0, max2=0 ,maxw,setme, viewfld; - for (var i =1;i<=maxcols;i++) { - tmpl += i == 1 ? tdtmpl : tdtmpl2; + for (i=1;i<=maxcols;i++) { + tmpl += i === 1 ? tdtmpl : tdtmpl2; } // find max number align rigth with property formatter $(obj.p.colModel).each( function() { @@ -8130,12 +8343,12 @@ hc = this.hidden === true ? true : false; } dc = hc ? "style='display:none'" : ""; - viewfld = (typeof this.viewable != 'boolean') ? true : this.viewable; + viewfld = (typeof this.viewable !== 'boolean') ? true : this.viewable; if ( nm !== 'cb' && nm !== 'subgrid' && nm !== 'rn' && viewfld) { if(ind === false) { tmp = ""; } else { - if(nm == obj.p.ExpandColumn && obj.p.treeGrid === true) { + if(nm === obj.p.ExpandColumn && obj.p.treeGrid === true) { tmp = $("td:eq("+i+")",obj.rows[ind]).text(); } else { tmp = $("td:eq("+i+")",obj.rows[ind]).html(); @@ -8157,7 +8370,7 @@ $(tb).append(trdata); trdata[0].rp = rp; } - $("td:eq("+(cp-2)+")",trdata[0]).html('<b>'+ (typeof frmopt.label === 'undefined' ? obj.p.colNames[i]: frmopt.label)+'</b>'); + $("td:eq("+(cp-2)+")",trdata[0]).html('<b>'+ (frmopt.label === undefined ? obj.p.colNames[i]: frmopt.label)+'</b>'); $("td:eq("+(cp-1)+")",trdata[0]).append("<span>"+tmp+"</span>").attr("id","v_"+nm); if(setme){ $("td:eq("+(cp-1)+") span",trdata[0]).css({'text-align':'right',width:maxw+"px"}); @@ -8174,7 +8387,7 @@ return retpos; } function fillData(rowid,obj){ - var nm, hc,cnt=0,tmp, opt,trv; + var nm, hc,cnt=0,tmp,trv; trv = $(obj).jqGrid("getInd",rowid,true); if(!trv) {return;} $('td',trv).each( function(i) { @@ -8186,12 +8399,11 @@ hc = obj.p.colModel[i].hidden === true ? true : false; } if ( nm !== 'cb' && nm !== 'subgrid' && nm !== 'rn') { - if(nm == obj.p.ExpandColumn && obj.p.treeGrid === true) { + if(nm === obj.p.ExpandColumn && obj.p.treeGrid === true) { tmp = $(this).text(); } else { tmp = $(this).html(); } - opt = $.extend({},obj.p.colModel[i].editoptions || {}); nm = $.jgrid.jqID("v_"+nm); $("#"+nm+" span","#"+frmtb).html(tmp); if (hc) {$("#"+nm,"#"+frmtb).parents("tr:first").hide();} @@ -8200,9 +8412,22 @@ }); if(cnt>0) {$("#id_g","#"+frmtb).val(rowid);} } - function updateNav(cr,totr){ - if (cr===0) {$("#pData","#"+frmtb+"_2").addClass('ui-state-disabled');} else {$("#pData","#"+frmtb+"_2").removeClass('ui-state-disabled');} - if (cr==totr) {$("#nData","#"+frmtb+"_2").addClass('ui-state-disabled');} else {$("#nData","#"+frmtb+"_2").removeClass('ui-state-disabled');} + function updateNav(cr,posarr){ + var totr = posarr[1].length-1; + if (cr===0) { + $("#pData","#"+frmtb+"_2").addClass('ui-state-disabled'); + } else if( posarr[1][cr-1] !== undefined && $("#"+$.jgrid.jqID(posarr[1][cr-1])).hasClass('ui-state-disabled')) { + $("#pData",frmtb+"_2").addClass('ui-state-disabled'); + } else { + $("#pData","#"+frmtb+"_2").removeClass('ui-state-disabled'); + } + if (cr===totr) { + $("#nData","#"+frmtb+"_2").addClass('ui-state-disabled'); + } else if( posarr[1][cr+1] !== undefined && $("#"+$.jgrid.jqID(posarr[1][cr+1])).hasClass('ui-state-disabled')) { + $("#nData",frmtb+"_2").addClass('ui-state-disabled'); + } else { + $("#nData","#"+frmtb+"_2").removeClass('ui-state-disabled'); + } } function getCurrPos() { var rowsInGrid = $($t).jqGrid("getDataIDs"), @@ -8214,7 +8439,7 @@ if ( $("#"+$.jgrid.jqID(IDs.themodal))[0] !== undefined ) { if(onBeforeInit) { showFrm = onBeforeInit.call($t,$("#"+frmgr)); - if(typeof(showFrm) == "undefined") { + if(showFrm === undefined) { showFrm = true; } } @@ -8226,12 +8451,13 @@ $.jgrid.viewModal("#"+$.jgrid.jqID(IDs.themodal),{gbox:"#gbox_"+$.jgrid.jqID(gID),jqm:p.jqModal, jqM: false, overlay: p.overlay, modal:p.modal}); focusaref(); } else { - var dh = isNaN(p.dataheight) ? p.dataheight : p.dataheight+"px"; - var frm = $("<form name='FormPost' id='"+frmgr_id+"' class='FormGrid' style='width:100%;overflow:auto;position:relative;height:"+dh+";'></form>"), + var dh = isNaN(p.dataheight) ? p.dataheight : p.dataheight+"px", + dw = isNaN(p.datawidth) ? p.datawidth : p.datawidth+"px", + frm = $("<form name='FormPost' id='"+frmgr_id+"' class='FormGrid' style='width:"+dw+";overflow:auto;position:relative;height:"+dh+";'></form>"), tbl =$("<table id='"+frmtb_id+"' class='EditTable' cellspacing='1' cellpadding='2' border='0' style='table-layout:fixed'><tbody></tbody></table>"); if(onBeforeInit) { showFrm = onBeforeInit.call($t,$("#"+frmgr)); - if(typeof(showFrm) == "undefined") { + if(showFrm === undefined) { showFrm = true; } } @@ -8244,7 +8470,7 @@ // set the id. $(frm).append(tbl); createData(rowid, $t, tbl, maxCols); - var rtlb = $t.p.direction == "rtl" ? true :false, + var rtlb = $t.p.direction === "rtl" ? true :false, bp = rtlb ? "nData" : "pData", bn = rtlb ? "pData" : "nData", @@ -8267,7 +8493,7 @@ }); } p.gbox = "#gbox_"+$.jgrid.jqID(gID); - var bt = $("<span></span>").append(frm).append("<table border='0' class='EditTable' id='"+frmtb+"_2'><tbody><tr id='Act_Buttons'><td class='navButton' width='"+p.labelswidth+"'>"+(rtlb ? bN+bP : bP+bN)+"</td><td class='EditButton'>"+bC+"</td></tr></tbody></table>"); + var bt = $("<div></div>").append(frm).append("<table border='0' class='EditTable' id='"+frmtb+"_2'><tbody><tr id='Act_Buttons'><td class='navButton' width='"+p.labelswidth+"'>"+(rtlb ? bN+bP : bP+bN)+"</td><td class='EditButton'>"+bC+"</td></tr></tbody></table>"); $.jgrid.createModal(IDs,bt,p,"#gview_"+$.jgrid.jqID($t.p.id),$("#gview_"+$.jgrid.jqID($t.p.id))[0]); if(rtlb) { $("#pData, #nData","#"+frmtb+"_2").css("float","right"); @@ -8277,7 +8503,7 @@ bt = null; $("#"+IDs.themodal).keydown( function( e ) { if(e.which === 27) { - if(rp_ge[$t.p.id].closeOnEscape) {$.jgrid.hideModal(this,{gb:p.gbox,jqm:p.jqModal, onClose: p.onClose});} + if(rp_ge[$t.p.id].closeOnEscape) {$.jgrid.hideModal("#"+$.jgrid.jqID(IDs.themodal),{gb:p.gbox,jqm:p.jqModal, onClose: p.onClose});} return false; } if(p.navkeys[0]===true) { @@ -8293,11 +8519,11 @@ }); p.closeicon = $.extend([true,"left","ui-icon-close"],p.closeicon); if(p.closeicon[0]===true) { - $("#cData","#"+frmtb+"_2").addClass(p.closeicon[1] == "right" ? 'fm-button-icon-right' : 'fm-button-icon-left') + $("#cData","#"+frmtb+"_2").addClass(p.closeicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left') .append("<span class='ui-icon "+p.closeicon[2]+"'></span>"); } if($.isFunction(p.beforeShowForm)) {p.beforeShowForm.call($t,$("#"+frmgr));} - $.jgrid.viewModal("#"+$.jgrid.jqID(IDs.themodal),{gbox:"#gbox_"+$.jgrid.jqID(gID),jqm:p.jqModal, modal:p.modal}); + $.jgrid.viewModal("#"+$.jgrid.jqID(IDs.themodal),{gbox:"#gbox_"+$.jgrid.jqID(gID),jqm:p.jqModal,overlay: p.overlay, modal:p.modal}); $(".fm-button:not(.ui-state-disabled)","#"+frmtb+"_2").hover( function(){$(this).addClass('ui-state-hover');}, function(){$(this).removeClass('ui-state-hover');} @@ -8311,7 +8537,7 @@ $("#FormError","#"+frmtb).hide(); var npos = getCurrPos(); npos[0] = parseInt(npos[0],10); - if(npos[0] != -1 && npos[1][npos[0]+1]) { + if(npos[0] !== -1 && npos[1][npos[0]+1]) { if($.isFunction(p.onclickPgButtons)) { p.onclickPgButtons.call($t,'next',$("#"+frmgr),npos[1][npos[0]]); } @@ -8320,7 +8546,7 @@ if($.isFunction(p.afterclickPgButtons)) { p.afterclickPgButtons.call($t,'next',$("#"+frmgr),npos[1][npos[0]+1]); } - updateNav(npos[0]+1,npos[1].length-1); + updateNav(npos[0]+1,npos); } focusaref(); return false; @@ -8328,7 +8554,7 @@ $("#pData", "#"+frmtb+"_2").click(function(){ $("#FormError","#"+frmtb).hide(); var ppos = getCurrPos(); - if(ppos[0] != -1 && ppos[1][ppos[0]-1]) { + if(ppos[0] !== -1 && ppos[1][ppos[0]-1]) { if($.isFunction(p.onclickPgButtons)) { p.onclickPgButtons.call($t,'prev',$("#"+frmgr),ppos[1][ppos[0]]); } @@ -8337,18 +8563,18 @@ if($.isFunction(p.afterclickPgButtons)) { p.afterclickPgButtons.call($t,'prev',$("#"+frmgr),ppos[1][ppos[0]-1]); } - updateNav(ppos[0]-1,ppos[1].length-1); + updateNav(ppos[0]-1,ppos); } focusaref(); return false; }); } var posInit =getCurrPos(); - updateNav(posInit[0],posInit[1].length-1); + updateNav(posInit[0],posInit); }); }, delGridRow : function(rowids,p) { - p = $.extend({ + p = $.extend(true, { top : 0, left: 0, width: 240, @@ -8391,11 +8617,11 @@ dtbl = "DelTbl_"+$.jgrid.jqID(gID),postd, idname, opers, oper, dtbl_id = "DelTbl_" + gID, IDs = {themodal:'delmod'+gID,modalhead:'delhd'+gID,modalcontent:'delcnt'+gID, scrollelm: dtbl}; - if (jQuery.isArray(rowids)) {rowids = rowids.join();} + if ($.isArray(rowids)) {rowids = rowids.join();} if ( $("#"+$.jgrid.jqID(IDs.themodal))[0] !== undefined ) { if(onBeforeInit) { showFrm = onBeforeInit.call($t,$("#"+dtbl)); - if(typeof(showFrm) == "undefined") { + if(showFrm === undefined) { showFrm = true; } } @@ -8410,8 +8636,9 @@ $.jgrid.viewModal("#"+$.jgrid.jqID(IDs.themodal),{gbox:"#gbox_"+$.jgrid.jqID(gID),jqm:rp_ge[$t.p.id].jqModal,jqM: false, overlay: rp_ge[$t.p.id].overlay, modal:rp_ge[$t.p.id].modal}); if(onAfterShow) {rp_ge[$t.p.id].afterShowForm.call($t,$("#"+dtbl));} } else { - var dh = isNaN(rp_ge[$t.p.id].dataheight) ? rp_ge[$t.p.id].dataheight : rp_ge[$t.p.id].dataheight+"px"; - var tbl = "<div id='"+dtbl_id+"' class='formdata' style='width:100%;overflow:auto;position:relative;height:"+dh+";'>"; + var dh = isNaN(rp_ge[$t.p.id].dataheight) ? rp_ge[$t.p.id].dataheight : rp_ge[$t.p.id].dataheight+"px", + dw = isNaN(p.datawidth) ? p.datawidth : p.datawidth+"px", + tbl = "<div id='"+dtbl_id+"' class='formdata' style='width:"+dw+";overflow:auto;position:relative;height:"+dh+";'>"; tbl += "<table class='DelTable'><tbody>"; // error data tbl += "<tr id='DelError' style='display:none'><td class='ui-state-error'></td></tr>"; @@ -8427,7 +8654,7 @@ if(onBeforeInit) { showFrm = onBeforeInit.call($t,$("#"+dtbl)); - if(typeof(showFrm) == "undefined") { + if(showFrm === undefined) { showFrm = true; } } @@ -8440,16 +8667,17 @@ p.delicon = $.extend([true,"left","ui-icon-scissors"],rp_ge[$t.p.id].delicon); p.cancelicon = $.extend([true,"left","ui-icon-cancel"],rp_ge[$t.p.id].cancelicon); if(p.delicon[0]===true) { - $("#dData","#"+dtbl+"_2").addClass(p.delicon[1] == "right" ? 'fm-button-icon-right' : 'fm-button-icon-left') + $("#dData","#"+dtbl+"_2").addClass(p.delicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left') .append("<span class='ui-icon "+p.delicon[2]+"'></span>"); } if(p.cancelicon[0]===true) { - $("#eData","#"+dtbl+"_2").addClass(p.cancelicon[1] == "right" ? 'fm-button-icon-right' : 'fm-button-icon-left') + $("#eData","#"+dtbl+"_2").addClass(p.cancelicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left') .append("<span class='ui-icon "+p.cancelicon[2]+"'></span>"); } $("#dData","#"+dtbl+"_2").click(function(){ - var ret=[true,""];onCS = {}; - var postdata = $("#DelData>td","#"+dtbl).text(); //the pair is name=val1,val2,... + var ret=[true,""], pk, + postdata = $("#DelData>td","#"+dtbl).text(); //the pair is name=val1,val2,... + onCS = {}; if( $.isFunction( rp_ge[$t.p.id].onclickSubmit ) ) {onCS = rp_ge[$t.p.id].onclickSubmit.call($t,rp_ge[$t.p.id], postdata) || {};} if( $.isFunction( rp_ge[$t.p.id].beforeSubmit ) ) {ret = rp_ge[$t.p.id].beforeSubmit.call($t,postdata);} if(ret[0] && !rp_ge[$t.p.id].processing) { @@ -8461,7 +8689,7 @@ idname = opers.id; postdata = String(postdata).split(","); if(!postdata.length) { return false; } - for( var pk in postdata) { + for(pk in postdata) { if(postdata.hasOwnProperty(pk)) { postdata[pk] = $.jgrid.stripPref($t.p.idPrefix, postdata[pk]); } @@ -8469,16 +8697,17 @@ postd[idname] = postdata.join(); $(this).addClass('ui-state-active'); var ajaxOptions = $.extend({ - url: rp_ge[$t.p.id].url ? rp_ge[$t.p.id].url : $($t).jqGrid('getGridParam','editurl'), + url: rp_ge[$t.p.id].url || $($t).jqGrid('getGridParam','editurl'), type: rp_ge[$t.p.id].mtype, data: $.isFunction(rp_ge[$t.p.id].serializeDelData) ? rp_ge[$t.p.id].serializeDelData.call($t,postd) : postd, - complete:function(data,Status){ - if(Status != "success") { + complete:function(data,status){ + var i; + if(data.status >= 300 && data.status !== 304) { ret[0] = false; if ($.isFunction(rp_ge[$t.p.id].errorTextFormat)) { ret[1] = rp_ge[$t.p.id].errorTextFormat.call($t,data); } else { - ret[1] = Status + " Status: '" + data.statusText + "'. Error code: " + data.status; + ret[1] = status + " Status: '" + data.statusText + "'. Error code: " + data.status; } } else { // data is posted successful @@ -8491,13 +8720,13 @@ $("#DelError>td","#"+dtbl).html(ret[1]); $("#DelError","#"+dtbl).show(); } else { - if(rp_ge[$t.p.id].reloadAfterSubmit && $t.p.datatype != "local") { + if(rp_ge[$t.p.id].reloadAfterSubmit && $t.p.datatype !== "local") { $($t).trigger("reloadGrid"); } else { if($t.p.treeGrid===true){ try {$($t).jqGrid("delTreeNode",$t.p.idPrefix+postdata[0]);} catch(e){} } else { - for(var i=0;i<postdata.length;i++) { + for(i=0;i<postdata.length;i++) { $($t).jqGrid("delRowData",$t.p.idPrefix+ postdata[i]); } } @@ -8525,7 +8754,7 @@ if (ret[0]) { if (rp_ge[$t.p.id].useDataProxy) { var dpret = $t.p.dataProxy.call($t, ajaxOptions, "del_"+$t.p.id); - if(typeof(dpret) == "undefined") { + if(dpret === undefined) { dpret = [true, ""]; } if(dpret[0] === false ) { @@ -8586,15 +8815,15 @@ }, $.jgrid.nav, o ||{}); return this.each(function() { if(this.nav) {return;} - var alertIDs = {themodal:'alertmod',modalhead:'alerthd',modalcontent:'alertcnt'}, + var alertIDs = {themodal: 'alertmod_' + this.p.id, modalhead: 'alerthd_' + this.p.id,modalcontent: 'alertcnt_' + this.p.id}, $t = this, twd, tdw; - if(!$t.grid || typeof elem != 'string') {return;} + if(!$t.grid || typeof elem !== 'string') {return;} if ($("#"+alertIDs.themodal)[0] === undefined) { if(!o.alerttop && !o.alertleft) { - if (typeof window.innerWidth != 'undefined') { + if (window.innerWidth !== undefined) { o.alertleft = window.innerWidth; o.alerttop = window.innerHeight; - } else if (typeof document.documentElement != 'undefined' && typeof document.documentElement.clientWidth != 'undefined' && document.documentElement.clientWidth !== 0) { + } else if (document.documentElement !== undefined && document.documentElement.clientWidth !== undefined && document.documentElement.clientWidth !== 0) { o.alertleft = document.documentElement.clientWidth; o.alerttop = document.documentElement.clientHeight; } else { @@ -8604,11 +8833,37 @@ o.alertleft = o.alertleft/2 - parseInt(o.alertwidth,10)/2; o.alerttop = o.alerttop/2-25; } - $.jgrid.createModal(alertIDs,"<div>"+o.alerttext+"</div><span tabindex='0'><span tabindex='-1' id='jqg_alrt'></span></span>",{gbox:"#gbox_"+$.jgrid.jqID($t.p.id),jqModal:true,drag:true,resize:true,caption:o.alertcap,top:o.alerttop,left:o.alertleft,width:o.alertwidth,height: o.alertheight,closeOnEscape:o.closeOnEscape, zIndex: o.alertzIndex},"","",true); + $.jgrid.createModal(alertIDs, + "<div>"+o.alerttext+"</div><span tabindex='0'><span tabindex='-1' id='jqg_alrt'></span></span>", + { + gbox:"#gbox_"+$.jgrid.jqID($t.p.id), + jqModal:true, + drag:true, + resize:true, + caption:o.alertcap, + top:o.alerttop, + left:o.alertleft, + width:o.alertwidth, + height: o.alertheight, + closeOnEscape:o.closeOnEscape, + zIndex: o.alertzIndex + }, + "#gview_"+$.jgrid.jqID($t.p.id), + $("#gbox_"+$.jgrid.jqID($t.p.id))[0], + true + ); } - var clone = 1; + var clone = 1, i, + onHoverIn = function () { + if (!$(this).hasClass('ui-state-disabled')) { + $(this).addClass("ui-state-hover"); + } + }, + onHoverOut = function () { + $(this).removeClass("ui-state-hover"); + }; if(o.cloneToTop && $t.p.toppager) {clone = 2;} - for(var i = 0; i<clone; i++) { + for(i = 0; i<clone; i++) { var tbd, navtbl = $("<table cellspacing='0' cellpadding='0' border='0' class='ui-pg-table navtable' style='float:left;table-layout:auto;'><tbody><tr></tr></tbody></table>"), sep = "<td class='ui-pg-button ui-state-disabled' style='width:4px;'><span class='ui-separator'></span></td>", @@ -8616,7 +8871,7 @@ if(i===0) { pgid = elem; elemids = $t.p.id; - if(pgid == $t.p.toppager) { + if(pgid === $t.p.toppager) { elemids += "_top"; clone = 1; } @@ -8624,7 +8879,7 @@ pgid = $t.p.toppager; elemids = $t.p.id+"_top"; } - if($t.p.direction == "rtl") {$(navtbl).attr("dir","rtl").css("float","right");} + if($t.p.direction === "rtl") {$(navtbl).attr("dir","rtl").css("float","right");} if (o.add) { pAdd = pAdd || {}; tbd = $("<td class='ui-pg-button ui-corner-all'></td>"); @@ -8641,14 +8896,7 @@ } } return false; - }).hover( - function () { - if (!$(this).hasClass('ui-state-disabled')) { - $(this).addClass("ui-state-hover"); - } - }, - function () {$(this).removeClass("ui-state-hover");} - ); + }).hover(onHoverIn, onHoverOut); tbd = null; } if (o.edit) { @@ -8673,14 +8921,7 @@ } } return false; - }).hover( - function () { - if (!$(this).hasClass('ui-state-disabled')) { - $(this).addClass("ui-state-hover"); - } - }, - function () {$(this).removeClass("ui-state-hover");} - ); + }).hover(onHoverIn, onHoverOut); tbd = null; } if (o.view) { @@ -8705,14 +8946,7 @@ } } return false; - }).hover( - function () { - if (!$(this).hasClass('ui-state-disabled')) { - $(this).addClass("ui-state-hover"); - } - }, - function () {$(this).removeClass("ui-state-hover");} - ); + }).hover(onHoverIn, onHoverOut); tbd = null; } if (o.del) { @@ -8742,14 +8976,7 @@ } } return false; - }).hover( - function () { - if (!$(this).hasClass('ui-state-disabled')) { - $(this).addClass("ui-state-hover"); - } - }, - function () {$(this).removeClass("ui-state-hover");} - ); + }).hover(onHoverIn, onHoverOut); tbd = null; } if(o.add || o.edit || o.del || o.view) {$("tr",navtbl).append(sep);} @@ -8769,14 +8996,7 @@ } } return false; - }).hover( - function () { - if (!$(this).hasClass('ui-state-disabled')) { - $(this).addClass("ui-state-hover"); - } - }, - function () {$(this).removeClass("ui-state-hover");} - ); + }).hover(onHoverIn, onHoverOut); if (pSearch.showOnLoad && pSearch.showOnLoad === true) { $(tbd,navtbl).click(); } @@ -8795,7 +9015,9 @@ try { var gID = $t.p.id; $t.p.postData.filters =""; + try { $("#fbox_"+$.jgrid.jqID(gID)).jqFilter('resetFilter'); + } catch(ef) {} if($.isFunction($t.clearToolbar)) {$t.clearToolbar.call($t,false);} } catch (e) {} switch (o.refreshstate) { @@ -8809,14 +9031,7 @@ if($.isFunction(o.afterRefresh)) {o.afterRefresh.call($t);} } return false; - }).hover( - function () { - if (!$(this).hasClass('ui-state-disabled')) { - $(this).addClass("ui-state-hover"); - } - }, - function () {$(this).removeClass("ui-state-hover");} - ); + }).hover(onHoverIn, onHoverOut); tbd = null; } tdw = $(".ui-jqgrid").css("font-size") || "11px"; @@ -8852,13 +9067,13 @@ if (findnav) { if( p.id && $("#"+$.jgrid.jqID(p.id), findnav)[0] !== undefined ) {return;} var tbd = $("<td></td>"); - if(p.buttonicon.toString().toUpperCase() == "NONE") { + if(p.buttonicon.toString().toUpperCase() === "NONE") { $(tbd).addClass('ui-pg-button ui-corner-all').append("<div class='ui-pg-div'>"+p.caption+"</div>"); } else { $(tbd).addClass('ui-pg-button ui-corner-all').append("<div class='ui-pg-div'><span class='ui-icon "+p.buttonicon+"'></span>"+p.caption+"</div>"); } if(p.id) {$(tbd).attr("id",p.id);} - if(p.position=='first'){ + if(p.position==='first'){ if(findnav.rows[0].cells.length ===0 ) { $("tr",findnav).append(tbd); } else { @@ -8889,7 +9104,8 @@ navSeparatorAdd:function (elem,p) { p = $.extend({ sepclass : "ui-separator", - sepcontent: '' + sepcontent: '', + position : "last" }, p ||{}); return this.each(function() { if( !this.grid) {return;} @@ -8897,17 +9113,26 @@ var findnav = $(".navtable",elem)[0]; if(findnav) { var sep = "<td class='ui-pg-button ui-state-disabled' style='width:4px;'><span class='"+p.sepclass+"'></span>"+p.sepcontent+"</td>"; - $("tr",findnav).append(sep); + if (p.position === 'first') { + if (findnav.rows[0].cells.length === 0) { + $("tr", findnav).append(sep); + } else { + $("tr td:eq(0)", findnav).before(sep); + } + } else { + $("tr", findnav).append(sep); + } } }); }, GridToForm : function( rowid, formid ) { return this.each(function(){ - var $t = this; + var $t = this, i; if (!$t.grid) {return;} var rowdata = $($t).jqGrid("getRowData",rowid); if (rowdata) { - for(var i in rowdata) { + for(i in rowdata) { + if(rowdata.hasOwnProperty(i)) { if ( $("[name="+$.jgrid.jqID(i)+"]",formid).is("input:radio") || $("[name="+$.jgrid.jqID(i)+"]",formid).is("input:checkbox")) { $("[name="+$.jgrid.jqID(i)+"]",formid).each( function() { if( $(this).val() == rowdata[i] ) { @@ -8922,6 +9147,7 @@ } } } + } }); }, FormToGrid : function(rowid, formid, mode, position){ @@ -8935,13 +9161,15 @@ $.each(fields, function(i, field){ griddata[field.name] = field.value; }); - if(mode=='add') {$($t).jqGrid("addRowData",rowid,griddata, position);} - else if(mode=='set') {$($t).jqGrid("setRowData",rowid,griddata);} + if(mode==='add') {$($t).jqGrid("addRowData",rowid,griddata, position);} + else if(mode==='set') {$($t).jqGrid("setRowData",rowid,griddata);} }); } }); })(jQuery); -;(function($){ +/*jshint eqeqeq:false, eqnull:true, devel:true */ +/*global jQuery */ +(function($){ /** * jqGrid extension for manipulating Grid Data * Tony Tomov tony(a)trirand.com @@ -8950,8 +9178,6 @@ * http://www.opensource.org/licenses/mit-license.php * http://www.gnu.org/licenses/gpl-2.0.html **/ -//jsHint options -/*global alert, $, jQuery */ "use strict"; $.jgrid.inlineEdit = $.jgrid.inlineEdit || {}; $.jgrid.extend({ @@ -8963,17 +9189,17 @@ if( $.type(args[0]) === "object" ) { o = args[0]; } else { - if (typeof keys !== "undefined") { o.keys = keys; } + if (keys !== undefined) { o.keys = keys; } if ($.isFunction(oneditfunc)) { o.oneditfunc = oneditfunc; } if ($.isFunction(successfunc)) { o.successfunc = successfunc; } - if (typeof url !== "undefined") { o.url = url; } - if (typeof extraparam !== "undefined") { o.extraparam = extraparam; } + if (url !== undefined) { o.url = url; } + if (extraparam !== undefined) { o.extraparam = extraparam; } if ($.isFunction(aftersavefunc)) { o.aftersavefunc = aftersavefunc; } if ($.isFunction(errorfunc)) { o.errorfunc = errorfunc; } if ($.isFunction(afterrestorefunc)) { o.afterrestorefunc = afterrestorefunc; } // last two not as param, but as object (sorry) - //if (typeof restoreAfterError !== "undefined") { o.restoreAfterError = restoreAfterError; } - //if (typeof mtype !== "undefined") { o.mtype = mtype || "POST"; } + //if (restoreAfterError !== undefined) { o.restoreAfterError = restoreAfterError; } + //if (mtype !== undefined) { o.mtype = mtype || "POST"; } } o = $.extend(true, { keys : false, @@ -8995,20 +9221,20 @@ ind = $($t).jqGrid("getInd",rowid,true); if( ind === false ) {return;} editable = $(ind).attr("editable") || "0"; - if (editable == "0" && !$(ind).hasClass("not-editable-row")) { + if (editable === "0" && !$(ind).hasClass("not-editable-row")) { cm = $t.p.colModel; $('td[role="gridcell"]',ind).each( function(i) { nm = cm[i].name; - var treeg = $t.p.treeGrid===true && nm == $t.p.ExpandColumn; + var treeg = $t.p.treeGrid===true && nm === $t.p.ExpandColumn; if(treeg) { tmp = $("span:first",this).html();} else { try { tmp = $.unformat.call($t,this,{rowId:rowid, colModel:cm[i]},i); } catch (_) { - tmp = ( cm[i].edittype && cm[i].edittype == 'textarea' ) ? $(this).text() : $(this).html(); + tmp = ( cm[i].edittype && cm[i].edittype === 'textarea' ) ? $(this).text() : $(this).html(); } } - if ( nm != 'cb' && nm != 'subgrid' && nm != 'rn') { + if ( nm !== 'cb' && nm !== 'subgrid' && nm !== 'rn') { if($t.p.autoencode) { tmp = $.jgrid.htmlDecode(tmp); } svr[nm]=tmp; if(cm[i].editable===true) { @@ -9017,13 +9243,14 @@ else { $(this).html(""); } var opt = $.extend({},cm[i].editoptions || {},{id:rowid+"_"+nm,name:nm}); if(!cm[i].edittype) { cm[i].edittype = "text"; } - if(tmp == " " || tmp == " " || (tmp.length==1 && tmp.charCodeAt(0)==160) ) {tmp='';} + if(tmp === " " || tmp === " " || (tmp.length===1 && tmp.charCodeAt(0)===160) ) {tmp='';} var elc = $.jgrid.createEl.call($t,cm[i].edittype,opt,tmp,true,$.extend({},$.jgrid.ajaxOptions,$t.p.ajaxSelectOptions || {})); $(elc).addClass("editable"); if(treeg) { $("span:first",this).append(elc); } else { $(this).append(elc); } + $.jgrid.bindEv.call($t, elc, opt); //Again IE - if(cm[i].edittype == "select" && typeof(cm[i].editoptions)!=="undefined" && cm[i].editoptions.multiple===true && typeof(cm[i].editoptions.dataUrl)==="undefined" && $.browser.msie) { + if(cm[i].edittype === "select" && cm[i].editoptions!==undefined && cm[i].editoptions.multiple===true && cm[i].editoptions.dataUrl===undefined && $.jgrid.msie) { $(elc).width($(elc).width()); } cnt++; @@ -9047,7 +9274,7 @@ } if (e.keyCode === 13) { var ta = e.target; - if(ta.tagName == 'TEXTAREA') { return true; } + if(ta.tagName === 'TEXTAREA') { return true; } if( $($t).jqGrid("saveRow", rowid, o ) ) { if($t.p._inlinenav) { try { @@ -9073,8 +9300,8 @@ o = args[0]; } else { if ($.isFunction(successfunc)) { o.successfunc = successfunc; } - if (typeof url !== "undefined") { o.url = url; } - if (typeof extraparam !== "undefined") { o.extraparam = extraparam; } + if (url !== undefined) { o.url = url; } + if (extraparam !== undefined) { o.extraparam = extraparam; } if ($.isFunction(aftersavefunc)) { o.aftersavefunc = aftersavefunc; } if ($.isFunction(errorfunc)) { o.errorfunc = errorfunc; } if ($.isFunction(afterrestorefunc)) { o.afterrestorefunc = afterrestorefunc; } @@ -9097,13 +9324,13 @@ ind = $($t).jqGrid("getInd",rowid,true); if(ind === false) {return success;} editable = $(ind).attr("editable"); - o.url = o.url ? o.url : $t.p.editurl; + o.url = o.url || $t.p.editurl; if (editable==="1") { var cm; $('td[role="gridcell"]',ind).each(function(i) { cm = $t.p.colModel[i]; nm = cm.name; - if ( nm != 'cb' && nm != 'subgrid' && cm.editable===true && nm != 'rn' && !$(this).hasClass('not-editable-cell')) { + if ( nm !== 'cb' && nm !== 'subgrid' && cm.editable===true && nm !== 'rn' && !$(this).hasClass('not-editable-cell')) { switch (cm.edittype) { case "checkbox": var cbv = ["Yes","No"]; @@ -9133,7 +9360,7 @@ ); tmp2[nm] = selectedText.join(","); } - if(cm.formatter && cm.formatter == 'select') { tmp2={}; } + if(cm.formatter && cm.formatter === 'select') { tmp2={}; } break; case 'custom' : try { @@ -9142,13 +9369,13 @@ if (tmp[nm] === undefined) { throw "e2"; } } else { throw "e1"; } } catch (e) { - if (e=="e1") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.nodefined,$.jgrid.edit.bClose); } - if (e=="e2") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.novalue,$.jgrid.edit.bClose); } + if (e==="e1") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.nodefined,$.jgrid.edit.bClose); } + if (e==="e2") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.novalue,$.jgrid.edit.bClose); } else { $.jgrid.info_dialog($.jgrid.errors.errcap,e.message,$.jgrid.edit.bClose); } } break; } - cv = $.jgrid.checkValues(tmp[nm],i,$t); + cv = $.jgrid.checkValues.call($t,tmp[nm],i); if(cv[0] === false) { cv[1] = tmp[nm] + " " + cv[1]; return false; @@ -9163,40 +9390,72 @@ }); if (cv[0] === false){ try { - var positions = $.jgrid.findPos($("#"+$.jgrid.jqID(rowid), $t.grid.bDiv)[0]); - $.jgrid.info_dialog($.jgrid.errors.errcap,cv[1],$.jgrid.edit.bClose,{left:positions[0],top:positions[1]}); + var tr = $t.rows.namedItem(rowid), positions = $.jgrid.findPos(tr); + $.jgrid.info_dialog($.jgrid.errors.errcap,cv[1],$.jgrid.edit.bClose,{left:positions[0],top:positions[1]+$(tr).outerHeight()}); } catch (e) { alert(cv[1]); } return success; } - var idname, opers, oper; - opers = $t.p.prmNames; - oper = opers.oper; - idname = opers.id; + var idname, opers = $t.p.prmNames, oldRowId = rowid; + if ($t.p.keyIndex === false) { + idname = opers.id; + } else { + idname = $t.p.colModel[$t.p.keyIndex + + ($t.p.rownumbers === true ? 1 : 0) + + ($t.p.multiselect === true ? 1 : 0) + + ($t.p.subGrid === true ? 1 : 0)].name; + } if(tmp) { - tmp[oper] = opers.editoper; - tmp[idname] = rowid; - if(typeof($t.p.inlineData) == 'undefined') { $t.p.inlineData ={}; } + tmp[opers.oper] = opers.editoper; + if (tmp[idname] === undefined || tmp[idname]==="") { + tmp[idname] = rowid; + } else if (ind.id !== $t.p.idPrefix + tmp[idname]) { + // rename rowid + var oldid = $.jgrid.stripPref($t.p.idPrefix, rowid); + if ($t.p._index[oldid] !== undefined) { + $t.p._index[tmp[idname]] = $t.p._index[oldid]; + delete $t.p._index[oldid]; + } + rowid = $t.p.idPrefix + tmp[idname]; + $(ind).attr("id", rowid); + if ($t.p.selrow === oldRowId) { + $t.p.selrow = rowid; + } + if ($.isArray($t.p.selarrrow)) { + var i = $.inArray(oldRowId, $t.p.selarrrow); + if (i>=0) { + $t.p.selarrrow[i] = rowid; + } + } + if ($t.p.multiselect) { + var newCboxId = "jqg_" + $t.p.id + "_" + rowid; + $("input.cbox",ind) + .attr("id", newCboxId) + .attr("name", newCboxId); + } + // TODO: to test the case of frozen columns + } + if($t.p.inlineData === undefined) { $t.p.inlineData ={}; } tmp = $.extend({},tmp,$t.p.inlineData,o.extraparam); } - if (o.url == 'clientArray') { + if (o.url === 'clientArray') { tmp = $.extend({},tmp, tmp2); if($t.p.autoencode) { $.each(tmp,function(n,v){ tmp[n] = $.jgrid.htmlDecode(v); }); } - var resp = $($t).jqGrid("setRowData",rowid,tmp); + var k, resp = $($t).jqGrid("setRowData",rowid,tmp); $(ind).attr("editable","0"); - for( var k=0;k<$t.p.savedRow.length;k++) { - if( $t.p.savedRow[k].id == rowid) {fr = k; break;} + for(k=0;k<$t.p.savedRow.length;k++) { + if( String($t.p.savedRow[k].id) === String(oldRowId)) {fr = k; break;} } if(fr >= 0) { $t.p.savedRow.splice(fr,1); } $($t).triggerHandler("jqGridInlineAfterSaveRow", [rowid, resp, tmp, o]); if( $.isFunction(o.aftersavefunc) ) { o.aftersavefunc.call($t, rowid,resp, o); } success = true; - $(ind).unbind("keydown"); + $(ind).removeClass("jqgrid-new-row").unbind("keydown"); } else { $("#lui_"+$.jgrid.jqID($t.p.id)).show(); tmp3 = $.extend({},tmp,tmp3); @@ -9209,14 +9468,14 @@ complete: function(res,stat){ $("#lui_"+$.jgrid.jqID($t.p.id)).hide(); if (stat === "success"){ - var ret = true, sucret; + var ret = true, sucret, k; sucret = $($t).triggerHandler("jqGridInlineSuccessSaveRow", [res, rowid, o]); if (!$.isArray(sucret)) {sucret = [true, tmp];} if (sucret[0] && $.isFunction(o.successfunc)) {sucret = o.successfunc.call($t, res);} if($.isArray(sucret)) { // expect array - status, data, rowid ret = sucret[0]; - tmp = sucret[1] ? sucret[1] : tmp; + tmp = sucret[1] || tmp; } else { ret = sucret; } @@ -9229,14 +9488,14 @@ tmp = $.extend({},tmp, tmp2); $($t).jqGrid("setRowData",rowid,tmp); $(ind).attr("editable","0"); - for( var k=0;k<$t.p.savedRow.length;k++) { - if( $t.p.savedRow[k].id == rowid) {fr = k; break;} + for(k=0;k<$t.p.savedRow.length;k++) { + if( String($t.p.savedRow[k].id) === String(rowid)) {fr = k; break;} } if(fr >= 0) { $t.p.savedRow.splice(fr,1); } $($t).triggerHandler("jqGridInlineAfterSaveRow", [rowid, res, tmp, o]); if( $.isFunction(o.aftersavefunc) ) { o.aftersavefunc.call($t, rowid,res); } success = true; - $(ind).unbind("keydown"); + $(ind).removeClass("jqgrid-new-row").unbind("keydown"); } else { $($t).triggerHandler("jqGridInlineErrorSaveRow", [rowid, res, stat, null, o]); if($.isFunction(o.errorfunc) ) { @@ -9279,17 +9538,17 @@ } else { if ($.isFunction(afterrestorefunc)) { o.afterrestorefunc = afterrestorefunc; } } - o = $.extend(true, $.jgrid.inlineEdit, o ); + o = $.extend(true, {}, $.jgrid.inlineEdit, o ); // End compatible return this.each(function(){ - var $t= this, fr, ind, ares={}; + var $t= this, fr, ind, ares={}, k; if (!$t.grid ) { return; } ind = $($t).jqGrid("getInd",rowid,true); if(ind === false) {return;} - for( var k=0;k<$t.p.savedRow.length;k++) { - if( $t.p.savedRow[k].id == rowid) {fr = k; break;} + for(k=0;k<$t.p.savedRow.length;k++) { + if( String($t.p.savedRow[k].id) === String(rowid)) {fr = k; break;} } if(fr >= 0) { if($.isFunction($.fn.datepicker)) { @@ -9298,7 +9557,7 @@ } catch (e) {} } $.each($t.p.colModel, function(){ - if(this.editable === true && this.name in $t.p.savedRow[fr] ) { + if(this.editable === true && $t.p.savedRow[fr].hasOwnProperty(this.name)) { ares[this.name] = $t.p.savedRow[fr][this.name]; } }); @@ -9306,7 +9565,10 @@ $(ind).attr("editable","0").unbind("keydown"); $t.p.savedRow.splice(fr,1); if($("#"+$.jgrid.jqID(rowid), "#"+$.jgrid.jqID($t.p.id)).hasClass("jqgrid-new-row")){ - setTimeout(function(){$($t).jqGrid("delRowData",rowid);},0); + setTimeout(function(){ + $($t).jqGrid("delRowData",rowid); + $($t).jqGrid('showAddEditButtons'); + },0); } } $($t).triggerHandler("jqGridInlineAfterRestoreRow", [rowid]); @@ -9318,7 +9580,7 @@ }, addRow : function ( p ) { p = $.extend(true, { - rowID : "new_row", + rowID : null, initdata : {}, position :"first", useDefValues : true, @@ -9328,6 +9590,7 @@ return this.each(function(){ if (!this.grid ) { return; } var $t = this; + p.rowID = $.isFunction(p.rowID) ? p.rowID.call($t, p) : ( (p.rowID != null) ? p.rowID : $.jgrid.randId()); if(p.useDefValues === true) { $($t.p.colModel).each(function(){ if( this.editoptions && this.editoptions.defaultValue ) { @@ -9352,7 +9615,7 @@ }); }, inlineNav : function (elem, o) { - o = $.extend({ + o = $.extend(true,{ edit: true, editicon: "ui-icon-pencil", add: true, @@ -9361,7 +9624,7 @@ saveicon:"ui-icon-disk", cancel: true, cancelicon:"ui-icon-cancel", - addParams : {useFormatter : false,rowID : "new_row"}, + addParams : {addRowParams: {extraparam: {}}}, editParams : {}, restoreAfterSelect : true }, $.jgrid.nav, o ||{}); @@ -9392,7 +9655,7 @@ "successfunc" : ap.onSuccess, "url" : ap.url, "extraparam" : ap.extraparam, - "aftersavefunc" : ap.afterSavef, + "aftersavefunc" : ap.afterSave, "errorfunc": ap.onError, "afterrestorefunc" : ap.afterRestore }; @@ -9448,16 +9711,18 @@ var sr = $t.p.savedRow[0].id; if(sr) { var opers = $t.p.prmNames, - oper = opers.oper; - if(!o.editParams.extraparam) { - o.editParams.extraparam = {}; - } + oper = opers.oper, tmpParams = {}; if($("#"+$.jgrid.jqID(sr), "#"+gID ).hasClass("jqgrid-new-row")) { - o.editParams.extraparam[oper] = opers.addoper; + o.addParams.addRowParams.extraparam[oper] = opers.addoper; + tmpParams = o.addParams.addRowParams; } else { + if(!o.editParams.extraparam) { + o.editParams.extraparam = {}; + } o.editParams.extraparam[oper] = opers.editoper; + tmpParams = o.editParams; } - if( $($t).jqGrid('saveRow', sr, o.editParams) ) { + if( $($t).jqGrid('saveRow', sr, tmpParams) ) { $($t).jqGrid('showAddEditButtons'); } } else { @@ -9474,9 +9739,14 @@ buttonicon : o.cancelicon, id : $t.p.id+"_ilcancel", onClickButton : function () { - var sr = $t.p.savedRow[0].id; + var sr = $t.p.savedRow[0].id, cancelPrm = {}; if(sr) { - $($t).jqGrid('restoreRow', sr, o.editParams); + if($("#"+$.jgrid.jqID(sr), "#"+gID ).hasClass("jqgrid-new-row")) { + cancelPrm = o.addParams.addRowParams; + } else { + cancelPrm = o.editParams; + } + $($t).jqGrid('restoreRow', sr, cancelPrm); $($t).jqGrid('showAddEditButtons'); } else { $.jgrid.viewModal("#alertmod",{gbox:"#gbox_"+gID,jqm:true});$("#jqg_alrt").focus(); @@ -9494,7 +9764,7 @@ $t.p.beforeSelectRow = function(id, stat) { var ret = true; if($t.p.savedRow.length > 0 && $t.p._inlinenav===true && ( id !== $t.p.selrow && $t.p.selrow !==null) ) { - if($t.p.selrow == o.addParams.rowID ) { + if($t.p.selrow === o.addParams.rowID ) { $($t).jqGrid('delRowData', $t.p.selrow); } else { $($t).jqGrid('restoreRow', $t.p.selrow, o.editParams); @@ -9523,7 +9793,9 @@ //end inline edit }); })(jQuery); -;(function($){ +/*jshint eqeqeq:false */ +/*global jQuery */ +(function($){ /* ** * jqGrid extension for cellediting Grid Data @@ -9577,7 +9849,7 @@ } cm = $t.p.colModel[iCol]; nm = cm.name; - if (nm=='subgrid' || nm=='cb' || nm=='rn') {return;} + if (nm==='subgrid' || nm==='cb' || nm==='rn') {return;} cc = $("td:eq("+iCol+")",$t.rows[iRow]); if (cm.editable===true && ed===true && !cc.hasClass("not-editable-cell")) { if(parseInt($t.p.iCol,10)>=0 && parseInt($t.p.iRow,10)>=0) { @@ -9589,7 +9861,7 @@ try { tmp = $.unformat.call($t,cc,{rowId: $t.rows[iRow].id, colModel:cm},iCol); } catch (_) { - tmp = ( cm.edittype && cm.edittype == 'textarea' ) ? $(cc).text() : $(cc).html(); + tmp = ( cm.edittype && cm.edittype === 'textarea' ) ? $(cc).text() : $(cc).html(); } if($t.p.autoencode) { tmp = $.jgrid.htmlDecode(tmp); } if (!cm.edittype) {cm.edittype = "text";} @@ -9606,6 +9878,7 @@ $t.p.beforeEditCell.call($t, $t.rows[iRow].id,nm,tmp,iRow,iCol); } $(cc).html("").append(elc).attr("tabindex","0"); + $.jgrid.bindEv.call($t, elc, opt); window.setTimeout(function () { $(elc).focus();},0); $("input, select, textarea",cc).bind("keydown",function(e) { if (e.keyCode === 27) { @@ -9699,9 +9972,9 @@ if (v===undefined) { throw "e2";} else { v2=v; } } else { throw "e1"; } } catch (e) { - if (e=="e1") { $.jgrid.info_dialog(jQuery.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.nodefined,jQuery.jgrid.edit.bClose); } - if (e=="e2") { $.jgrid.info_dialog(jQuery.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.novalue,jQuery.jgrid.edit.bClose); } - else {$.jgrid.info_dialog(jQuery.jgrid.errors.errcap,e.message,jQuery.jgrid.edit.bClose); } + if (e==="e1") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.nodefined,$.jgrid.edit.bClose); } + if (e==="e2") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.novalue,$.jgrid.edit.bClose); } + else {$.jgrid.info_dialog($.jgrid.errors.errcap,e.message,$.jgrid.edit.bClose); } } break; } @@ -9713,7 +9986,7 @@ var vv = $t.p.beforeSaveCell.call($t, $t.rows[iRow].id,nm, v, iRow,iCol); if (vv) {v = vv; v2=vv;} } - var cv = $.jgrid.checkValues(v,iCol,$t); + var cv = $.jgrid.checkValues.call($t,v,iCol); if(cv[0] === true) { var addpost = $($t).triggerHandler("jqGridBeforeSubmitCell", [$t.rows[iRow].id, nm, v, iRow, iCol]) || {}; if ($.isFunction($t.p.beforeSubmitCell)) { @@ -9721,7 +9994,7 @@ if (!addpost) {addpost={};} } if( $("input.hasDatepicker",cc).length >0) { $("input.hasDatepicker",cc).datepicker('hide'); } - if ($t.p.cellsubmit == 'remote') { + if ($t.p.cellsubmit === 'remote') { if ($t.p.cellurl) { var postdata = {}; if($t.p.autoencode) { v = $.jgrid.htmlEncode(v); } @@ -9742,7 +10015,7 @@ complete: function (result, stat) { $("#lui_"+$t.p.id).hide(); $t.grid.hDiv.loading = false; - if (stat == 'success') { + if (stat === 'success') { var ret = $($t).triggerHandler("jqGridAfterSubmitCell", [$t, result, postdata.id, nm, v, iRow, iCol]) || [true, '']; if (ret[0] === true && $.isFunction($t.p.afterSubmitCell)) { ret = $t.p.afterSubmitCell.call($t, result,postdata.id,nm,v,iRow,iCol); @@ -9783,7 +10056,7 @@ } catch (e) {} } } - if ($t.p.cellsubmit == 'clientArray') { + if ($t.p.cellsubmit === 'clientArray') { $(cc).empty(); $($t).jqGrid("setCell",$t.rows[iRow].id,iCol, v2, false, false, true); $(cc).addClass("dirty-cell"); @@ -9804,11 +10077,7 @@ $($t).jqGrid("restoreCell",iRow,iCol); } } - if ($.browser.opera) { - $("#"+$.jgrid.jqID($t.p.knv)).attr("tabindex","-1").focus(); - } else { - window.setTimeout(function () { $("#"+$.jgrid.jqID($t.p.knv)).attr("tabindex","-1").focus();},0); - } + window.setTimeout(function () { $("#"+$.jgrid.jqID($t.p.knv)).attr("tabindex","-1").focus();},0); }); }, restoreCell : function(iRow, iCol) { @@ -9837,10 +10106,10 @@ }, nextCell : function (iRow,iCol) { return this.each(function (){ - var $t = this, nCol=false; + var $t = this, nCol=false, i; if (!$t.grid || $t.p.cellEdit !== true) {return;} // try to find next editable cell - for (var i=iCol+1; i<$t.p.colModel.length; i++) { + for (i=iCol+1; i<$t.p.colModel.length; i++) { if ( $t.p.colModel[i].editable ===true) { nCol = i; break; } @@ -9856,10 +10125,10 @@ }, prevCell : function (iRow,iCol) { return this.each(function (){ - var $t = this, nCol=false; + var $t = this, nCol=false, i; if (!$t.grid || $t.p.cellEdit !== true) {return;} // try to find next editable cell - for (var i=iCol-1; i>=0; i--) { + for (i=iCol-1; i>=0; i--) { if ( $t.p.colModel[i].editable ===true) { nCol = i; break; } @@ -9879,26 +10148,26 @@ if (!$t.grid || $t.p.cellEdit !== true ) {return;} // trick to process keydown on non input elements $t.p.knv = $t.p.id + "_kn"; - var selection = $("<div style='position:absolute;top:-1000000px;width:1px;height:1px;' tabindex='0'><div tabindex='-1' style='width:1px;height:1px;' id='"+$t.p.knv+"'></div></div>"), + var selection = $("<div style='position:fixed;top:0px;width:1px;height:1px;' tabindex='0'><div tabindex='-1' style='width:1px;height:1px;' id='"+$t.p.knv+"'></div></div>"), i, kdir; function scrollGrid(iR, iC, tp){ - if (tp.substr(0,1)=='v') { + if (tp.substr(0,1)==='v') { var ch = $($t.grid.bDiv)[0].clientHeight, st = $($t.grid.bDiv)[0].scrollTop, nROT = $t.rows[iR].offsetTop+$t.rows[iR].clientHeight, pROT = $t.rows[iR].offsetTop; - if(tp == 'vd') { + if(tp === 'vd') { if(nROT >= ch) { $($t.grid.bDiv)[0].scrollTop = $($t.grid.bDiv)[0].scrollTop + $t.rows[iR].clientHeight; } } - if(tp == 'vu'){ + if(tp === 'vu'){ if (pROT < st ) { $($t.grid.bDiv)[0].scrollTop = $($t.grid.bDiv)[0].scrollTop - $t.rows[iR].clientHeight; } } } - if(tp=='h') { + if(tp==='h') { var cw = $($t.grid.bDiv)[0].clientWidth, sl = $($t.grid.bDiv)[0].scrollLeft, nCOL = $t.rows[iR].cells[iC].offsetLeft+$t.rows[iR].cells[iC].clientWidth, @@ -9912,7 +10181,7 @@ } function findNextVisible(iC,act){ var ind, i; - if(act == 'lft') { + if(act === 'lft') { ind = iC+1; for (i=iC;i>=0;i--){ if ($t.p.colModel[i].hidden !== true) { @@ -9921,7 +10190,7 @@ } } } - if(act == 'rgt') { + if(act === 'rgt') { ind = iC-1; for (i=iC; i<$t.p.colModel.length;i++){ if ($t.p.colModel[i].hidden !== true) { @@ -9938,7 +10207,7 @@ .focus() .keydown(function (e){ kdir = e.keyCode; - if($t.p.direction == "rtl") { + if($t.p.direction === "rtl") { if(kdir===37) { kdir = 39;} else if (kdir===39) { kdir = 37; } } @@ -9993,7 +10262,7 @@ $('td',this).each( function(i) { nm = $t.p.colModel[i].name; if ( nm !== 'cb' && nm !== 'subgrid') { - if (mthd=='dirty') { + if (mthd==='dirty') { if ($(this).hasClass('dirty-cell')) { try { res[nm] = $.unformat.call($t,this,{rowId:$t.rows[j].id, colModel:$t.p.colModel[i]},i); @@ -10020,7 +10289,9 @@ /// end cell editing }); })(jQuery); -;(function($){ +/*jshint eqeqeq:false */ +/*global jQuery */ +(function($){ /** * jqGrid extension for SubGrid Data * Tony Tomov tony(a)trirand.com @@ -10033,7 +10304,7 @@ $.jgrid.extend({ setSubGrid : function () { return this.each(function (){ - var $t = this, cm, + var $t = this, cm, i, suboptions = { plusicon : "ui-icon-plus", minusicon : "ui-icon-minus", @@ -10045,11 +10316,11 @@ }; $t.p.subGridOptions = $.extend(suboptions, $t.p.subGridOptions || {}); $t.p.colNames.unshift(""); - $t.p.colModel.unshift({name:'subgrid',width: $.browser.safari ? $t.p.subGridWidth+$t.p.cellLayout : $t.p.subGridWidth,sortable: false,resizable:false,hidedlg:true,search:false,fixed:true}); + $t.p.colModel.unshift({name:'subgrid',width: $.jgrid.cell_width ? $t.p.subGridWidth+$t.p.cellLayout : $t.p.subGridWidth,sortable: false,resizable:false,hidedlg:true,search:false,fixed:true}); cm = $t.p.subGridModel; if(cm[0]) { cm[0].align = $.extend([],cm[0].align || []); - for(var i=0;i<cm[0].name.length;i++) { cm[0].align[i] = cm[0].align[i] || 'left';} + for(i=0;i<cm[0].name.length;i++) { cm[0].align[i] = cm[0].align[i] || 'left';} } }); }, @@ -10122,7 +10393,7 @@ if (sjxml){ sgmap = ts.p.jsonReader.subgrid; result = $.jgrid.getAccessor(sjxml, sgmap.root); - if ( typeof result !== 'undefined' ) { + if ( result !== undefined ) { for (i=0;i<result.length;i++) { cur = result[i]; trdiv = $("<tr class='ui-widget-content ui-subtblcell'></tr>"); @@ -10327,7 +10598,8 @@ * http://www.gnu.org/licenses/gpl.html **/ -/*global document, jQuery, $ */ +/*jshint eqeqeq:false */ +/*global jQuery */ (function($) { "use strict"; $.jgrid.extend({ @@ -10343,10 +10615,10 @@ loaded = $t.p.treeReader.loaded, lft, rgt, curLevel, ident,lftpos, twrap, ldat, lf; while(i<len) { - var ind = $t.rows[i].id, dind = $t.p._index[ind], expan; + var ind = $.jgrid.stripPref($t.p.idPrefix, $t.rows[i].id), dind = $t.p._index[ind], expan; ldat = $t.p.data[dind]; //$t.rows[i].level = ldat[level]; - if($t.p.treeGridModel == 'nested') { + if($t.p.treeGridModel === 'nested') { if(!ldat[isLeaf]) { lft = parseInt(ldat[$t.p.treeReader.left_field],10); rgt = parseInt(ldat[$t.p.treeReader.right_field],10); @@ -10367,17 +10639,17 @@ lftpos = curLevel -1; } twrap = "<div class='tree-wrap tree-wrap-"+$t.p.direction+"' style='width:"+(ident*18)+"px;'>"; - twrap += "<div style='"+($t.p.direction=="rtl" ? "right:" : "left:")+(lftpos*18)+"px;' class='ui-icon "; + twrap += "<div style='"+($t.p.direction==="rtl" ? "right:" : "left:")+(lftpos*18)+"px;' class='ui-icon "; if(ldat[loaded] !== undefined) { - if(ldat[loaded]=="true" || ldat[loaded]===true) { + if(ldat[loaded]==="true" || ldat[loaded]===true) { ldat[loaded] = true; } else { ldat[loaded] = false; } } - if(ldat[isLeaf] == "true" || ldat[isLeaf] === true) { + if(ldat[isLeaf] === "true" || ldat[isLeaf] === true) { twrap += ((ldat[icon] !== undefined && ldat[icon] !== "") ? ldat[icon] : $t.p.treeIcons.leaf)+" tree-leaf treeclick"; ldat[isLeaf] = true; lf="leaf"; @@ -10385,7 +10657,7 @@ ldat[isLeaf] = false; lf=""; } - ldat[expanded] = ((ldat[expanded] == "true" || ldat[expanded] === true) ? true : false) && ldat[loaded]; + ldat[expanded] = ((ldat[expanded] === "true" || ldat[expanded] === true) ? true : false) && (ldat[loaded] || ldat[loaded] === undefined); if(ldat[expanded] === false) { twrap += ((ldat[isLeaf] === true) ? "'" : $t.p.treeIcons.plus+" tree-plus treeclick'"); } else { @@ -10406,7 +10678,7 @@ .find("div.treeclick") .bind("click",function(e){ var target = e.target || e.srcElement, - ind2 =$(target,$t.rows).closest("tr.jqgrow")[0].id, + ind2 =$.jgrid.stripPref($t.p.idPrefix,$(target,$t.rows).closest("tr.jqgrow")[0].id), pos = $t.p._index[ind2]; if(!$t.p.data[pos][isLeaf]){ if($t.p.data[pos][expanded]){ @@ -10425,7 +10697,7 @@ .css("cursor","pointer") .bind("click",function(e) { var target = e.target || e.srcElement, - ind2 =$(target,$t.rows).closest("tr.jqgrow")[0].id, + ind2 =$.jgrid.stripPref($t.p.idPrefix,$(target,$t.rows).closest("tr.jqgrow")[0].id), pos = $t.p._index[ind2]; if(!$t.p.data[pos][isLeaf]){ if($t.p.data[pos][expanded]){ @@ -10447,7 +10719,7 @@ }, setTreeGrid : function() { return this.each(function (){ - var $t = this, i=0, pico, ecol = false, nm, key, dupcols=[]; + var $t = this, i=0, pico, ecol = false, nm, key, tkey, dupcols=[]; if(!$t.p.treeGrid) {return;} if(!$t.p.treedatatype ) {$.extend($t.p,{treedatatype: $t.p.datatype});} $t.p.subGrid = false;$t.p.altRows =false; @@ -10456,9 +10728,9 @@ if($t.p.rowTotal === null ) { $t.p.rowNum = 10000; } $t.p.multiselect = false;$t.p.rowList = []; $t.p.expColInd = 0; - pico = 'ui-icon-triangle-1-' + ($t.p.direction=="rtl" ? 'w' : 'e'); + pico = 'ui-icon-triangle-1-' + ($t.p.direction==="rtl" ? 'w' : 'e'); $t.p.treeIcons = $.extend({plus:pico,minus:'ui-icon-triangle-1-s',leaf:'ui-icon-radio-off'},$t.p.treeIcons || {}); - if($t.p.treeGridModel == 'nested') { + if($t.p.treeGridModel === 'nested') { $t.p.treeReader = $.extend({ level_field: "level", left_field:"lft", @@ -10468,7 +10740,7 @@ loaded: "loaded", icon_field: "icon" },$t.p.treeReader); - } else if($t.p.treeGridModel == 'adjacency') { + } else if($t.p.treeGridModel === 'adjacency') { $t.p.treeReader = $.extend({ level_field: "level", parent_id_field: "parent", @@ -10481,14 +10753,14 @@ for ( key in $t.p.colModel){ if($t.p.colModel.hasOwnProperty(key)) { nm = $t.p.colModel[key].name; - if( nm == $t.p.ExpandColumn && !ecol ) { + if( nm === $t.p.ExpandColumn && !ecol ) { ecol = true; $t.p.expColInd = i; } i++; // - for(var tkey in $t.p.treeReader) { - if($t.p.treeReader[tkey] == nm) { + for(tkey in $t.p.treeReader) { + if($t.p.treeReader.hasOwnProperty(tkey) && $t.p.treeReader[tkey] === nm) { dupcols.push(nm); } } @@ -10513,7 +10785,7 @@ expanded = $t.p.treeReader.expanded_field, rows = $t.rows; $(childern).each(function(){ - var id = $.jgrid.getAccessor(this,$t.p.localReader.id); + var id = $t.p.idPrefix + $.jgrid.getAccessor(this,$t.p.localReader.id); $(rows.namedItem(id)).css("display",""); if(this[expanded]) { $($t).jqGrid("expandRow",this); @@ -10530,7 +10802,7 @@ expanded = $t.p.treeReader.expanded_field, rows = $t.rows; $(childern).each(function(){ - var id = $.jgrid.getAccessor(this,$t.p.localReader.id); + var id = $t.p.idPrefix + $.jgrid.getAccessor(this,$t.p.localReader.id); $(rows.namedItem(id)).css("display","none"); if(this[expanded]){ $($t).jqGrid("collapseRow",this); @@ -10556,7 +10828,7 @@ case 'adjacency' : var parent_id = $t.p.treeReader.parent_id_field; $($t.p.data).each(function(){ - if(this[parent_id] === null || String(this[parent_id]).toLowerCase() == "null") { + if(this[parent_id] === null || String(this[parent_id]).toLowerCase() === "null") { result.push(this); } }); @@ -10604,7 +10876,7 @@ var parent_id = $t.p.treeReader.parent_id_field, dtid = $t.p.localReader.id; $(this.p.data).each(function(){ - if(this[dtid] == rc[parent_id] ) { + if(this[dtid] === $.jgrid.stripPref($t.p.idPrefix, rc[parent_id]) ) { result = this; return false; } @@ -10635,7 +10907,7 @@ var parent_id = $t.p.treeReader.parent_id_field, dtid = $t.p.localReader.id; $(this.p.data).each(function(){ - if(this[parent_id] == rc[dtid]) { + if(this[parent_id] == $.jgrid.stripPref($t.p.idPrefix, rc[dtid])) { result.push(this); } }); @@ -10669,7 +10941,7 @@ $(this.p.data).each(function(i){ len = result.length; for (i = 0; i < len; i++) { - if (result[i][dtid] == this[parent_id]) { + if ($.jgrid.stripPref($t.p.idPrefix, result[i][dtid]) === this[parent_id]) { result.push(this); break; } @@ -10740,7 +11012,7 @@ if(!rc[expanded]) { var id = $.jgrid.getAccessor(rc,this.p.localReader.id); - var rc1 = $("#"+$.jgrid.jqID(id),this.grid.bDiv)[0]; + var rc1 = $("#" + this.p.idPrefix + $.jgrid.jqID(id),this.grid.bDiv)[0]; var position = this.p._index[id]; if( $(this).jqGrid("isNodeLoaded",this.p.data[position]) ) { rc[expanded] = true; @@ -10750,14 +11022,14 @@ $("div.treeclick",rc1).removeClass(this.p.treeIcons.plus+" tree-plus").addClass(this.p.treeIcons.minus+" tree-minus"); this.p.treeANode = rc1.rowIndex; this.p.datatype = this.p.treedatatype; - if(this.p.treeGridModel == 'nested') { + if(this.p.treeGridModel === 'nested') { $(this).jqGrid("setGridParam",{postData:{nodeid:id,n_left:rc[lft],n_right:rc[rgt],n_level:rc[level]}}); } else { $(this).jqGrid("setGridParam",{postData:{nodeid:id,parentid:rc[parent],n_level:rc[level]}} ); } $(this).trigger("reloadGrid"); rc[loaded] = true; - if(this.p.treeGridModel == 'nested') { + if(this.p.treeGridModel === 'nested') { $(this).jqGrid("setGridParam",{postData:{nodeid:'',n_left:'',n_right:'',n_level:''}}); } else { $(this).jqGrid("setGridParam",{postData:{nodeid:'',parentid:'',n_level:''}}); @@ -10773,7 +11045,7 @@ if(rc[expanded]) { rc[expanded] = false; var id = $.jgrid.getAccessor(rc,this.p.localReader.id); - var rc1 = $("#"+$.jgrid.jqID(id),this.grid.bDiv)[0]; + var rc1 = $("#" + this.p.idPrefix + $.jgrid.jqID(id),this.grid.bDiv)[0]; $("div.treeclick",rc1).removeClass(this.p.treeIcons.minus+" tree-minus").addClass(this.p.treeIcons.plus+" tree-plus"); } }); @@ -10830,7 +11102,7 @@ }, delTreeNode : function (rowid) { return this.each(function () { - var $t = this, rid = $t.p.localReader.id, + var $t = this, rid = $t.p.localReader.id, i, left = $t.p.treeReader.left_field, right = $t.p.treeReader.right_field, myright, width, res, key; if(!$t.grid || !$t.p.treeGrid) {return;} @@ -10841,7 +11113,7 @@ width = myright - parseInt($t.p.data[rc][left],10) + 1; var dr = $($t).jqGrid("getFullTreeNode",$t.p.data[rc]); if(dr.length>0){ - for (var i=0;i<dr.length;i++){ + for (i=0;i<dr.length;i++){ $($t).jqGrid("delRowData",dr[i][rid]); } } @@ -10871,7 +11143,7 @@ } }); }, - addChildNode : function( nodeid, parentid, data ) { + addChildNode : function( nodeid, parentid, data, expandData ) { //return this.each(function(){ var $t = this[0]; if(data) { @@ -10885,8 +11157,8 @@ right = $t.p.treeReader.right_field, loaded = $t.p.treeReader.loaded, method, parentindex, parentdata, parentlevel, i, len, max=0, rowind = parentid, leaf, maxright; - - if ( typeof nodeid === 'undefined' || nodeid === null ) { + if(expandData===undefined) {expandData = false;} + if ( nodeid === undefined || nodeid === null ) { i = $t.p.data.length-1; if( i>= 0 ) { while(i>=0){max = Math.max(max, parseInt($t.p.data[i][$t.p.localReader.id],10)); i--;} @@ -10894,48 +11166,48 @@ nodeid = max+1; } var prow = $($t).jqGrid('getInd', parentid); - leaf = false; - // if not a parent we assume root - if ( parentid === undefined || parentid === null || parentid==="") { - parentid = null; - rowind = null; - method = 'last'; - parentlevel = $t.p.tree_root_level; - i = $t.p.data.length+1; + leaf = false; + // if not a parent we assume root + if ( parentid === undefined || parentid === null || parentid==="") { + parentid = null; + rowind = null; + method = 'last'; + parentlevel = $t.p.tree_root_level; + i = $t.p.data.length+1; + } else { + method = 'after'; + parentindex = $t.p._index[parentid]; + parentdata = $t.p.data[parentindex]; + parentid = parentdata[$t.p.localReader.id]; + parentlevel = parseInt(parentdata[level],10)+1; + var childs = $($t).jqGrid('getFullTreeNode', parentdata); + // if there are child nodes get the last index of it + if(childs.length) { + i = childs[childs.length-1][$t.p.localReader.id]; + rowind = i; + i = $($t).jqGrid('getInd',rowind)+1; } else { - method = 'after'; - parentindex = $t.p._index[parentid]; - parentdata = $t.p.data[parentindex]; - parentid = parentdata[$t.p.localReader.id]; - parentlevel = parseInt(parentdata[level],10)+1; - var childs = $($t).jqGrid('getFullTreeNode', parentdata); - // if there are child nodes get the last index of it - if(childs.length) { - i = childs[childs.length-1][$t.p.localReader.id]; - rowind = i; - i = $($t).jqGrid('getInd',rowind)+1; - } else { - i = $($t).jqGrid('getInd', parentid)+1; - } - // if the node is leaf - if(parentdata[isLeaf]) { - leaf = true; - parentdata[expanded] = true; - //var prow = $($t).jqGrid('getInd', parentid); - $($t.rows[prow]) - .find("span.cell-wrapperleaf").removeClass("cell-wrapperleaf").addClass("cell-wrapper") - .end() - .find("div.tree-leaf").removeClass($t.p.treeIcons.leaf+" tree-leaf").addClass($t.p.treeIcons.minus+" tree-minus"); - $t.p.data[parentindex][isLeaf] = false; - parentdata[loaded] = true; - } + i = $($t).jqGrid('getInd', parentid)+1; } - len = i+1; + // if the node is leaf + if(parentdata[isLeaf]) { + leaf = true; + parentdata[expanded] = true; + //var prow = $($t).jqGrid('getInd', parentid); + $($t.rows[prow]) + .find("span.cell-wrapperleaf").removeClass("cell-wrapperleaf").addClass("cell-wrapper") + .end() + .find("div.tree-leaf").removeClass($t.p.treeIcons.leaf+" tree-leaf").addClass($t.p.treeIcons.minus+" tree-minus"); + $t.p.data[parentindex][isLeaf] = false; + parentdata[loaded] = true; + } + } + len = i+1; - data[expanded] = false; - data[loaded] = true; + if( data[expanded]===undefined) {data[expanded]= false;} + if( data[loaded]===undefined ) { data[loaded] = false;} data[level] = parentlevel; - data[isLeaf] = true; + if( data[isLeaf]===undefined) {data[isLeaf]= true;} if( $t.p.treeGridModel === "adjacency") { data[parent] = parentid; } @@ -10989,7 +11261,7 @@ $($t).jqGrid('addRowData', nodeid, data, method, rowind); $($t).jqGrid('setTreeNode', i, len); } - if(parentdata && !parentdata[expanded]) { + if(parentdata && !parentdata[expanded] && expandData) { $($t.rows[prow]) .find("div.treeclick") .click(); @@ -10999,27 +11271,29 @@ } }); })(jQuery); +/*jshint eqeqeq:false, eqnull:true */ +/*global jQuery */ // Grouping module -;(function($){ +(function($){ "use strict"; $.extend($.jgrid,{ template : function(format){ //jqgformat - var args = $.makeArray(arguments).slice(1), j = 1; - if(format===undefined) { format = ""; } + var args = $.makeArray(arguments).slice(1), j, al = args.length; + if(format==null) { format = ""; } return format.replace(/\{([\w\-]+)(?:\:([\w\.]*)(?:$(.*?)?$)?)?\}/g, function(m,i){ if(!isNaN(parseInt(i,10))) { - j++; return args[parseInt(i,10)]; - } else { - var nmarr = args[ j ], - k = nmarr.length; - while(k--) { - if(i===nmarr[k].nm) { - return nmarr[k].v; - break; + } + for(j=0; j < al;j++) { + if($.isArray(args[j])) { + var nmarr = args[ j ], + k = nmarr.length; + while(k--) { + if(i===nmarr[k].nm) { + return nmarr[k].v; + } } } - j++; } }); } @@ -11027,30 +11301,29 @@ $.jgrid.extend({ groupingSetup : function () { return this.each(function (){ - var $t = this, - grp = $t.p.groupingView; + var $t = this, i, j, cml, cm = $t.p.colModel, grp = $t.p.groupingView; if(grp !== null && ( (typeof grp === 'object') || $.isFunction(grp) ) ) { if(!grp.groupField.length) { $t.p.grouping = false; } else { - if ( typeof(grp.visibiltyOnNextGrouping) === 'undefined') { + if (grp.visibiltyOnNextGrouping === undefined) { grp.visibiltyOnNextGrouping = []; } grp.lastvalues=[]; grp.groups =[]; grp.counters =[]; - for(var i=0;i<grp.groupField.length;i++) { + for(i=0;i<grp.groupField.length;i++) { if(!grp.groupOrder[i]) { grp.groupOrder[i] = 'asc'; } if(!grp.groupText[i]) { grp.groupText[i] = '{0}'; } - if( typeof(grp.groupColumnShow[i]) !== 'boolean') { + if( typeof grp.groupColumnShow[i] !== 'boolean') { grp.groupColumnShow[i] = true; } - if( typeof(grp.groupSummary[i]) !== 'boolean') { + if( typeof grp.groupSummary[i] !== 'boolean') { grp.groupSummary[i] = false; } if(grp.groupColumnShow[i] === true) { @@ -11062,8 +11335,7 @@ } } grp.summary =[]; - var cm = $t.p.colModel; - for(var j=0, cml = cm.length; j < cml; j++) { + for(j=0, cml = cm.length; j < cml; j++) { if(cm[j].summaryType) { grp.summary.push({nm:cm[j].name,st:cm[j].summaryType, v: '', sr: cm[j].summaryRound, srt: cm[j].summaryRoundType || 'round'}); } @@ -11076,18 +11348,26 @@ }, groupingPrepare : function (rData, gdata, record, irow) { this.each(function(){ - var grp = this.p.groupingView, $t= this; - var grlen = grp.groupField.length, + var grp = this.p.groupingView, $t= this, i, + grlen = grp.groupField.length, fieldName, v, + displayName, + displayValue, changed = 0; - for(var i=0;i<grlen;i++) { + for(i=0;i<grlen;i++) { fieldName = grp.groupField[i]; + displayName = grp.displayField[i]; v = record[fieldName]; + displayValue = displayName == null ? null : record[displayName]; + + if( displayValue == null ) { + displayValue = v; + } if( v !== undefined ) { if(irow === 0 ) { // First record always starts a new group - grp.groups.push({idx:i,dataIndex:fieldName,value:v, startRow: irow, cnt:1, summary : [] } ); + grp.groups.push({idx:i,dataIndex:fieldName,value:v, displayValue: displayValue, startRow: irow, cnt:1, summary : [] } ); grp.lastvalues[i] = v; grp.counters[i] = {cnt:1, pos:grp.groups.length-1, summary: $.extend(true,[],grp.summary)}; $.each(grp.counters[i].summary,function() { @@ -11099,9 +11379,9 @@ }); grp.groups[grp.counters[i].pos].summary = grp.counters[i].summary; } else { - if( (typeof(v) !== "object" && (grp.lastvalues[i] !== v) ) ) { + if (typeof v !== "object" && ($.isArray(grp.isInTheSameGroup) && $.isFunction(grp.isInTheSameGroup[i]) ? ! grp.isInTheSameGroup[i].call($t, grp.lastvalues[i], v, i, grp): grp.lastvalues[i] !== v)) { // This record is not in same group as previous one - grp.groups.push({idx:i,dataIndex:fieldName,value:v, startRow: irow, cnt:1, summary : [] } ); + grp.groups.push({idx:i,dataIndex:fieldName,value:v, displayValue: displayValue, startRow: irow, cnt:1, summary : [] } ); grp.lastvalues[i] = v; changed = 1; grp.counters[i] = {cnt:1, pos:grp.groups.length-1, summary: $.extend(true,[],grp.summary)}; @@ -11116,7 +11396,7 @@ } else { if (changed === 1) { // This group has changed because an earlier group changed. - grp.groups.push({idx:i,dataIndex:fieldName,value:v, startRow: irow, cnt:1, summary : [] } ); + grp.groups.push({idx:i,dataIndex:fieldName,value:v, displayValue: displayValue, startRow: irow, cnt:1, summary : [] } ); grp.lastvalues[i] = v; grp.counters[i] = {cnt:1, pos:grp.groups.length-1, summary: $.extend(true,[],grp.summary)}; $.each(grp.counters[i].summary,function() { @@ -11152,6 +11432,7 @@ var $t = this, grp = $t.p.groupingView, strpos = hid.split('_'), + uidpos, //uid = hid.substring(0,strpos+1), num = parseInt(strpos[strpos.length-2], 10); strpos.splice(strpos.length-2,2); @@ -11179,7 +11460,12 @@ } else { if(r){ while(r) { - if( $(r).hasClass(uid+"_"+String(num) ) || $(r).hasClass(uid+"_"+String(num-1))) { break; } + uidpos = r.className.indexOf(uid); + if(uidpos !== -1) { + if( parseInt(r.className.substring(uidpos+uid.length + 1),10) <= num) { + break; + } + } $(r).hide(); r = r.nextSibling; } @@ -11190,7 +11476,12 @@ } else { if(r){ while(r) { - if($(r).hasClass(uid+"_"+String(num)) || $(r).hasClass(uid+"_"+String(num-1)) ) { break; } + uidpos = r.className.indexOf(uid); + if(uidpos !== -1) { + if( parseInt(r.className.substring(uidpos+uid.length + 1),10) <= num) { + break; + } + } $(r).show(); tspan = $(r).find("span."+"tree-wrap-"+$t.p.direction); if( tspan && $(tspan).hasClass(plus) ) { @@ -11211,11 +11502,11 @@ return this.each(function(){ var $t = this, grp = $t.p.groupingView, - str = "", icon = "", hid, clid, pmrtl = grp.groupCollapse ? grp.plusicon : grp.minusicon, gv, cp=[], ii, len =grp.groupField.length; + str = "", icon = "", hid, clid, pmrtl = grp.groupCollapse ? grp.plusicon : grp.minusicon, gv, cp=[], len =grp.groupField.length; pmrtl += " tree-wrap-"+$t.p.direction; - ii = 0; $.each($t.p.colModel, function (i,n){ - for(var ii=0;ii<len;ii++) { + var ii; + for(ii=0;ii<len;ii++) { if(grp.groupField[ii] === n.name ) { cp[ii] = i; break; @@ -11224,17 +11515,23 @@ }); var toEnd = 0; function findGroupIdx( ind , offset, grp) { + var ret = false, i; if(offset===0) { - return grp[ind]; + ret = grp[ind]; } else { var id = grp[ind].idx; - if(id===0) { return grp[ind]; } - for(var i=ind;i >= 0; i--) { - if(grp[i].idx === id-offset) { - return grp[i]; + if(id===0) { + ret = grp[ind]; + } else { + for(i=ind;i >= 0; i--) { + if(grp[i].idx === id-offset) { + ret = grp[i]; + break; + } } } } + return ret; } var sumreverse = $.makeArray(grp.groupSummary); sumreverse.reverse(); @@ -11244,16 +11541,19 @@ hid = clid+"_"+i; icon = "<span style='cursor:pointer;' class='ui-icon "+pmrtl+"' onclick=\"jQuery('#"+$.jgrid.jqID($t.p.id)+"').jqGrid('groupingToggle','"+hid+"');return false;\"></span>"; try { - gv = $t.formatter(hid, n.value, cp[n.idx], n.value ); + if ($.isArray(grp.formatDisplayField) && $.isFunction(grp.formatDisplayField[n.idx])) { + n.displayValue = grp.formatDisplayField[n.idx].call($t, n.displayValue, n.value, $t.p.colModel[cp[n.idx]], n.idx, grp); + } + gv = $t.formatter(hid, n.displayValue, cp[n.idx], n.value ); } catch (egv) { - gv = n.value; + gv = n.displayValue; } str += "<tr id=\""+hid+"\" role=\"row\" class= \"ui-widget-content jqgroup ui-row-"+$t.p.direction+" "+clid+"\"><td style=\"padding-left:"+(n.idx * 12) + "px;"+"\" colspan=\""+colspans+"\">"+icon+$.jgrid.template(grp.groupText[n.idx], gv, n.cnt, n.summary)+"</td></tr>"; var leaf = len-1 === n.idx; if( leaf ) { - var gg = grp.groups[i+1]; + var gg = grp.groups[i+1], k, kk, ik; var end = gg !== undefined ? grp.groups[i+1].startRow : grdata.length; - for(var kk=n.startRow;kk<end;kk++) { + for(kk=n.startRow;kk<end;kk++) { str += grdata[kk].join(''); } var jj; @@ -11265,7 +11565,7 @@ } toEnd = grp.groupField.length - jj; } - for (var ik = 0; ik < toEnd; ik++) { + for (ik = 0; ik < toEnd; ik++) { if(!sumreverse[ik]) { continue; } var hhdr = ""; if(grp.groupCollapse && !grp.showSummaryOnHide) { @@ -11275,7 +11575,7 @@ var fdata = findGroupIdx(i, ik, grp.groups), cm = $t.p.colModel, vv, grlen = fdata.cnt; - for(var k=0; k<colspans;k++) { + for(k=0; k<colspans;k++) { var tmpdata = "<td "+$t.formatCol(k,1,'')+"> </td>", tplfld = "{0}"; $.each(fdata.summary,function(){ @@ -11283,7 +11583,7 @@ if(cm[k].summaryTpl) { tplfld = cm[k].summaryTpl; } - if(typeof(this.st) === 'string' && this.st.toLowerCase() === 'avg') { + if(typeof this.st === 'string' && this.st.toLowerCase() === 'avg') { if(this.v && grlen > 0) { this.v = (this.v/grlen); } @@ -11312,14 +11612,14 @@ groupingGroupBy : function (name, options ) { return this.each(function(){ var $t = this; - if(typeof(name) === "string") { + if(typeof name === "string") { name = [name]; } var grp = $t.p.groupingView; $t.p.grouping = true; //Set default, in case visibilityOnNextGrouping is undefined - if (typeof grp.visibiltyOnNextGrouping === "undefined") { + if (grp.visibiltyOnNextGrouping === undefined) { grp.visibiltyOnNextGrouping = []; } var i; @@ -11341,14 +11641,14 @@ groupingRemove : function (current) { return this.each(function(){ var $t = this; - if(typeof(current) === 'undefined') { + if(current === undefined) { current = true; } $t.p.grouping = false; if(current===true) { - var grp = $t.p.groupingView; + var grp = $t.p.groupingView, i; // show previous hidden groups if they are hidden and weren't removed yet - for(var i=0;i<grp.groupField.length;i++) { + for(i=0;i<grp.groupField.length;i++) { if (!grp.groupColumnShow[i] && grp.visibiltyOnNextGrouping[i]) { $($t).jqGrid('showCol', grp.groupField); } @@ -11385,9 +11685,8 @@ if(v==="") {v=0;} if(rc.hasOwnProperty(field)) { return v+1; - } else { - return 0; } + return 0; }, avg: function() { @@ -11395,7 +11694,7 @@ // so use sum instead of duplicating the code (?) return funcs.sum(); } - } + }; if(!funcs[fn]) { throw ("jqGrid Grouping No such method: " + fn); @@ -11403,11 +11702,10 @@ var res = funcs[fn](); if (round != null) { - if (roundType == 'fixed') + if (roundType === 'fixed') { res = res.toFixed(round); - else { + } else { var mul = Math.pow(10, round); - res = Math.round(res * mul) / mul; } } @@ -11417,7 +11715,9 @@ } }); })(jQuery); -;(function($){ +/*jshint eqeqeq:false, eqnull:true, devel:true */ +/*global jQuery, xmlJsonClass */ +(function($){ /* * jqGrid extension for constructing Grid Data from external file * Tony Tomov tony(a)trirand.com @@ -11426,8 +11726,6 @@ * http://www.opensource.org/licenses/mit-license.php * http://www.gnu.org/licenses/gpl-2.0.html **/ -//jsHint options -/*global jQuery, $, alert, xmlJsonClass */ "use strict"; $.jgrid.extend({ @@ -11452,11 +11750,11 @@ var $t = this; var xmlConvert = function (xml,o) { var cnfg = $(o.xmlGrid.config,xml)[0]; - var xmldata = $(o.xmlGrid.data,xml)[0], jstr, jstr1; + var xmldata = $(o.xmlGrid.data,xml)[0], jstr, jstr1, key; if(xmlJsonClass.xml2json && $.jgrid.parse) { jstr = xmlJsonClass.xml2json(cnfg," "); jstr = $.jgrid.parse(jstr); - for(var key in jstr) { + for(key in jstr) { if(jstr.hasOwnProperty(key)) { jstr1=jstr[key]; } @@ -11476,7 +11774,7 @@ } }; var jsonConvert = function (jsonstr,o){ - if (jsonstr && typeof jsonstr == 'string') { + if (jsonstr && typeof jsonstr === 'string') { var _jsonparse = false; if($.jgrid.useJSON) { $.jgrid.useJSON = false; @@ -11504,7 +11802,7 @@ data: o.impData, dataType:"xml", complete: function(xml,stat) { - if(stat == 'success') { + if(stat === 'success') { xmlConvert(xml.responseXML,o); $($t).triggerHandler("jqGridImportComplete", [xml, o]); if($.isFunction(o.importComplete)) { @@ -11517,8 +11815,8 @@ break; case 'xmlstring' : // we need to make just the conversion and use the same code as xml - if(o.impstring && typeof o.impstring == 'string') { - var xmld = $.jgrid.stringToDoc(o.impstring); + if(o.impstring && typeof o.impstring === 'string') { + var xmld = $.parseXML(o.impstring); if(xmld) { xmlConvert(xmld,o); $($t).triggerHandler("jqGridImportComplete", [xmld, o]); @@ -11549,7 +11847,7 @@ }, o.ajaxOptions )); break; case 'jsonstring' : - if(o.impstring && typeof o.impstring == 'string') { + if(o.impstring && typeof o.impstring === 'string') { jsonConvert(o.impstring,o ); $($t).triggerHandler("jqGridImportComplete", [o.impstring, o]); if($.isFunction(o.importComplete)) { @@ -11570,7 +11868,7 @@ var ret = null; this.each(function () { if(!this.grid) { return;} - var gprm = $.extend(true, {},$(this).jqGrid("getGridParam")); + var key, gprm = $.extend(true, {},$(this).jqGrid("getGridParam")); // we need to check for: // 1.multiselect, 2.subgrid 3. treegrid and remove the unneded columns from colNames if(gprm.rownumbers) { @@ -11587,7 +11885,7 @@ } gprm.knv = null; if(gprm.treeGrid) { - for (var key in gprm.treeReader) { + for (key in gprm.treeReader) { if(gprm.treeReader.hasOwnProperty(key)) { gprm.colNames.splice(gprm.colNames.length-1); gprm.colModel.splice(gprm.colModel.length-1); @@ -11620,18 +11918,21 @@ return this.each(function(){ if(!this.grid) { return;} var url; - if(o.exptype == "remote") { + if(o.exptype === "remote") { var pdata = $.extend({},this.p.postData); pdata[o.oper] = o.tag; var params = jQuery.param(pdata); - if(o.url.indexOf("?") != -1) { url = o.url+"&"+params; } + if(o.url.indexOf("?") !== -1) { url = o.url+"&"+params; } else { url = o.url+"?"+params; } window.location = url; } }); } }); -})(jQuery);;(function($){ +})(jQuery); +/*jshint evil:true, eqeqeq:false, eqnull:true, devel:true */ +/*global jQuery */ +(function($){ /* ** * jqGrid addons using jQuery UI @@ -11641,10 +11942,11 @@ * http://www.gnu.org/licenses/gpl-2.0.html * depends on jQuery UI **/ -if ($.browser.msie && $.browser.version==8) { +"use strict"; +if ($.jgrid.msie && $.jgrid.msiever()===8) { $.expr[":"].hidden = function(elem) { return elem.offsetWidth === 0 || elem.offsetHeight === 0 || - elem.style.display == "none"; + elem.style.display === "none"; }; } // requiere load multiselect before grid @@ -11653,17 +11955,17 @@ if ($.ui.multiselect ) { if($.ui.multiselect.prototype._setSelected) { var setSelected = $.ui.multiselect.prototype._setSelected; - $.ui.multiselect.prototype._setSelected = function(item,selected) { - var ret = setSelected.call(this,item,selected); - if (selected && this.selectedList) { - var elt = this.element; - this.selectedList.find('li').each(function() { - if ($(this).data('optionLink')) { - $(this).data('optionLink').remove().appendTo(elt); - } - }); - } - return ret; + $.ui.multiselect.prototype._setSelected = function(item,selected) { + var ret = setSelected.call(this,item,selected); + if (selected && this.selectedList) { + var elt = this.element; + this.selectedList.find('li').each(function() { + if ($(this).data('optionLink')) { + $(this).data('optionLink').remove().appendTo(elt); + } + }); + } + return ret; }; } if($.ui.multiselect.prototype.destroy) { @@ -11674,7 +11976,7 @@ $.widget.prototype.destroy.apply(this, arguments); } else { $.Widget.prototype.destroy.apply(this, arguments); - } + } }; } $.jgrid._multiselect = true; @@ -11713,7 +12015,7 @@ var permutation = []; th.each(function() { var id = $(">div", this).get(0).id.replace(/^jqgh_/, "").replace(tid,""); - if (id in cmMap) { + if (cmMap.hasOwnProperty(id)) { permutation.push(cmMap[id]); } }); @@ -11802,8 +12104,8 @@ "close": function() { opts.cleanup(true); }, - "modal" : opts.modal ? opts.modal : false, - "resizable": opts.resizable ? opts.resizable : true, + "modal" : opts.modal || false, + "resizable": opts.resizable || true, "width": opts.width+20 }, opts.dialog_opts || {}); }, @@ -11845,7 +12147,7 @@ }, $.jgrid.col, opts || {}); if($.ui) { if ($.ui.multiselect ) { - if(opts.msel == "multiselect") { + if(opts.msel === "multiselect") { if(!$.jgrid._multiselect) { // should be in language file alert("Multiselect plugin loaded after jqGrid. Please load the plugin before the jqGrid!"); @@ -11885,11 +12187,11 @@ } select.append("<option value='"+i+"' "+ - (this.hidden?"":"selected='selected'")+">"+jQuery.jgrid.stripHtml(colNames[i])+"</option>"); + (this.hidden?"":"selected='selected'")+">"+$.jgrid.stripHtml(colNames[i])+"</option>"); }); function call(fn, obj) { if (!fn) { return; } - if (typeof fn == 'string') { + if (typeof fn === 'string') { if ($.fn[fn]) { $.fn[fn].apply(obj, $.makeArray(arguments).slice(2)); } @@ -11958,7 +12260,7 @@ }, gridDnD : function(opts) { return this.each(function(){ - var $t = this; + var $t = this, i, cn; if(!$t.grid) { return; } // Currently we disable a treeGrid drag and drop if($t.p.treeGrid) { return; } @@ -11966,14 +12268,14 @@ function updateDnD () { var datadnd = $.data($t,"dnd"); - $("tr.jqgrow:not(.ui-draggable)",$t).draggable($.isFunction(datadnd.drag) ? datadnd.drag.call($($t),datadnd) : datadnd.drag); + $("tr.jqgrow:not(.ui-draggable)",$t).draggable($.isFunction(datadnd.drag) ? datadnd.drag.call($($t),datadnd) : datadnd.drag); } var appender = "<table id='jqgrid_dnd' class='ui-jqgrid-dnd'></table>"; if($("#jqgrid_dnd")[0] === undefined) { $('body').append(appender); } - if(typeof opts == 'string' && opts == 'updateDnD' && $t.p.jqgdnd===true) { + if(typeof opts === 'string' && opts === 'updateDnD' && $t.p.jqgdnd===true) { updateDnD(); return; } @@ -11981,9 +12283,10 @@ "drag" : function (opts) { return $.extend({ start : function (ev, ui) { + var i, subgid; // if we are in subgrid mode try to collapse the node if($t.p.subGrid) { - var subgid = $(ui.helper).attr("id"); + subgid = $(ui.helper).attr("id"); try { $($t).jqGrid('collapseSubGridRow',subgid); } catch (e) {} @@ -11991,8 +12294,8 @@ // hack // drag and drop does not insert tr in table, when the table has no rows // we try to insert new empty row on the target(s) - for (var i=0;i<$.data($t,"dnd").connectWith.length;i++){ - if($($.data($t,"dnd").connectWith[i]).jqGrid('getGridParam','reccount') == "0" ){ + for (i=0;i<$.data($t,"dnd").connectWith.length;i++){ + if($($.data($t,"dnd").connectWith[i]).jqGrid('getGridParam','reccount') === 0 ){ $($.data($t,"dnd").connectWith[i]).jqGrid('addRowData','jqg_empty_row',{}); } } @@ -12003,13 +12306,14 @@ if(opts.onstart && $.isFunction(opts.onstart) ) { opts.onstart.call($($t),ev,ui); } }, stop :function(ev,ui) { + var i, ids; if(ui.helper.dropped && !opts.dragcopy) { - var ids = $(ui.helper).attr("id"); + ids = $(ui.helper).attr("id"); if(ids === undefined) { ids = $(this).attr("id"); } $($t).jqGrid('delRowData',ids ); } // if we have a empty row inserted from start event try to delete it - for (var i=0;i<$.data($t,"dnd").connectWith.length;i++){ + for (i=0;i<$.data($t,"dnd").connectWith.length;i++){ $($.data($t,"dnd").connectWith[i]).jqGrid('delRowData','jqg_empty_row'); } if(opts.onstop && $.isFunction(opts.onstop) ) { opts.onstop.call($($t),ev,ui); } @@ -12022,8 +12326,8 @@ if (!$(d).hasClass('jqgrow')) { return d;} var tid = $(d).closest("table.ui-jqgrid-btable"); if(tid.length > 0 && $.data(tid[0],"dnd") !== undefined) { - var cn = $.data(tid[0],"dnd").connectWith; - return $.inArray('#'+$.jgrid.jqID(this.id),cn) != -1 ? true : false; + var cn = $.data(tid[0],"dnd").connectWith; + return $.inArray('#'+$.jgrid.jqID(this.id),cn) !== -1 ? true : false; } return false; }, @@ -12032,18 +12336,20 @@ var accept = $(ui.draggable).attr("id"); var getdata = ui.draggable.parent().parent().jqGrid('getRowData',accept); if(!opts.dropbyname) { - var j =0, tmpdata = {}, nm; + var j =0, tmpdata = {}, nm, key; var dropmodel = $("#"+$.jgrid.jqID(this.id)).jqGrid('getGridParam','colModel'); try { - for (var key in getdata) { + for (key in getdata) { + if (getdata.hasOwnProperty(key)) { nm = dropmodel[j].name; - if( !(nm == 'cb' || nm =='rn' || nm == 'subgrid' )) { + if( !(nm === 'cb' || nm === 'rn' || nm === 'subgrid' )) { if(getdata.hasOwnProperty(key) && dropmodel[j]) { tmpdata[nm] = getdata[key]; } } j++; } + } getdata = tmpdata; } catch (e) {} } @@ -12052,7 +12358,7 @@ //parameters to this callback - event, element, data to be inserted, sender, reciever // should return object which will be inserted into the reciever var datatoinsert = opts.beforedrop.call(this,ev,ui,getdata,$('#'+$.jgrid.jqID($t.p.id)),$(this)); - if (typeof datatoinsert != "undefined" && datatoinsert !== null && typeof datatoinsert == "object") { getdata = datatoinsert; } + if (datatoinsert !== undefined && datatoinsert !== null && typeof datatoinsert === "object") { getdata = datatoinsert; } } if(ui.helper.dropped) { var grid; @@ -12097,12 +12403,12 @@ opts.connectWith = $.map(opts.connectWith,function(n){return $.trim(n);}); $.data($t,"dnd",opts); - if($t.p.reccount != "0" && !$t.p.jqgdnd) { + if($t.p.reccount !== 0 && !$t.p.jqgdnd) { updateDnD(); } $t.p.jqgdnd = true; - for (var i=0;i<opts.connectWith.length;i++){ - var cn =opts.connectWith[i]; + for (i=0;i<opts.connectWith.length;i++){ + cn =opts.connectWith[i]; $(cn).droppable($.isFunction(opts.drop) ? opts.drop.call($($t),opts) : opts.drop); } }); Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/js/jquery.jqGrid.src.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/grid.addons.js =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/grid.addons.js 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/grid.addons.js 2013-07-19 21:45:03 UTC (rev 166) @@ -1,6 +1,5 @@ (function($){ -/* - * %%Ignore-License +/* %%Ignore-License * jqGrid methods without support. Use as you wish * Tony Tomov tony(a)trirand.com * http://trirand.com/blog/ Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/grid.addons.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/grid.postext.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/grid.setcolumns.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/jquery.contextmenu.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/jquery.searchFilter.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/jquery.tablednd.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/searchFilter.css =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/searchFilter.css 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/searchFilter.css 2013-07-19 21:45:03 UTC (rev 166) @@ -1,4 +1,4 @@ -/* %%Ignore-License */ +/*%%Ignore-License*/ .ui-searchFilter { display: none; position: absolute; z-index: 770; overflow: visible;} .ui-searchFilter table {position:relative; margin:0em; width:auto} .ui-searchFilter table td {margin: 0em; padding: 1px;} Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/searchFilter.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/ui.multiselect.css =================================================================== --- sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/ui.multiselect.css 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/ui.multiselect.css 2013-07-19 21:45:03 UTC (rev 166) @@ -1,5 +1,4 @@ -/* %%Ignore-License - Multiselect +/* %%Ignore-License Multiselect ----------------------------------*/ .ui-multiselect { border: solid 1px; font-size: 0.8em; } Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/ui.multiselect.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jqgrid/src/main/resources/nuiton-js-jqgrid/plugins/ui.multiselect.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/site/rst/index.rst.vm =================================================================== --- sandbox/nuiton-js-jqgrid/src/site/rst/index.rst.vm 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/site/rst/index.rst.vm 2013-07-19 21:45:03 UTC (rev 166) @@ -1,8 +1,8 @@ .. - .. * #%L .. * Nuiton JS :: jqGrid -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2012 - 2013 CodeLutin .. * %% @@ -33,7 +33,7 @@ .. _documentation: http://www.trirand.com/jqgridwiki/doku.php Use -=== +--- Maven part:: @@ -90,6 +90,7 @@ - jqgrid-hr: specifique i18n - jqgrid-hr1250: specifique i18n - jqgrid-hu: specifique i18n +- jqgrid-id: specifique i18n - jqgrid-is: specifique i18n - jqgrid-it: specifique i18n - jqgrid-ja: specifique i18n @@ -111,6 +112,7 @@ - jqgrid-tr: specifique i18n - jqgrid-tw: specifique i18n - jqgrid-ua: specifique i18n +- jqgrid-vi: specifique i18n Available CSS ------------- Property changes on: sandbox/nuiton-js-jqgrid/src/site/rst/index.rst.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqgrid/src/site/site_en.xml =================================================================== --- sandbox/nuiton-js-jqgrid/src/site/site_en.xml 2013-07-19 21:34:13 UTC (rev 165) +++ sandbox/nuiton-js-jqgrid/src/site/site_en.xml 2013-07-19 21:45:03 UTC (rev 166) @@ -1,8 +1,8 @@ <!-- #%L Nuiton JS :: jqGrid - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin %% @@ -45,8 +45,8 @@ <menu ref="parent"/> - <menu name="Utilisateurs"> - <item name="Accueil" href="index.html"/> + <menu name="Users"> + <item name="Home" href="index.html"/> </menu> <menu ref="reports"/> Property changes on: sandbox/nuiton-js-jqgrid/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r165 - in sandbox/nuiton-js-jquery: . src/main/resources/META-INF/nuiton-js src/main/resources/nuiton-js-jquery src/site src/site/rst
by echatellier＠users.nuiton.org July 19, 2013

July 19, 2013

Author: echatellier Date: 2013-07-19 23:34:13 +0200 (Fri, 19 Jul 2013) New Revision: 165 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/165 Log: Fix jquery package Removed: sandbox/nuiton-js-jquery/changelog.txt Modified: sandbox/nuiton-js-jquery/LICENSE.txt sandbox/nuiton-js-jquery/README.txt sandbox/nuiton-js-jquery/pom.xml sandbox/nuiton-js-jquery/src/main/resources/META-INF/nuiton-js/wro-jquery.xml sandbox/nuiton-js-jquery/src/main/resources/nuiton-js-jquery/jquery-1.10.2.js sandbox/nuiton-js-jquery/src/site/rst/index.rst.vm sandbox/nuiton-js-jquery/src/site/site_en.xml Property changes on: sandbox/nuiton-js-jquery/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: sandbox/nuiton-js-jquery/changelog.txt =================================================================== --- sandbox/nuiton-js-jquery/changelog.txt 2013-07-19 21:33:12 UTC (rev 164) +++ sandbox/nuiton-js-jquery/changelog.txt 2013-07-19 21:34:13 UTC (rev 165) @@ -1,2 +0,0 @@ -Please refer to the release note : - http://maven-site.nuiton.org/nuiton-js/changes-report.html Property changes on: sandbox/nuiton-js-jquery/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jquery/src/main/resources/META-INF/nuiton-js/wro-jquery.xml =================================================================== --- sandbox/nuiton-js-jquery/src/main/resources/META-INF/nuiton-js/wro-jquery.xml 2013-07-19 21:33:12 UTC (rev 164) +++ sandbox/nuiton-js-jquery/src/main/resources/META-INF/nuiton-js/wro-jquery.xml 2013-07-19 21:34:13 UTC (rev 165) @@ -1,8 +1,8 @@ <!-- #%L Nuiton JS :: JQuery - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% Property changes on: sandbox/nuiton-js-jquery/src/main/resources/META-INF/nuiton-js/wro-jquery.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery/src/main/resources/nuiton-js-jquery/jquery-1.10.2.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jquery/src/site/rst/index.rst.vm =================================================================== --- sandbox/nuiton-js-jquery/src/site/rst/index.rst.vm 2013-07-19 21:33:12 UTC (rev 164) +++ sandbox/nuiton-js-jquery/src/site/rst/index.rst.vm 2013-07-19 21:34:13 UTC (rev 165) @@ -1,8 +1,8 @@ .. - .. * #%L .. * Nuiton JS :: JQuery -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2012 - 2013 CodeLutin .. * %% @@ -33,7 +33,7 @@ .. _documentation: http://api.jquery.com/ Use -=== +--- Maven part:: Property changes on: sandbox/nuiton-js-jquery/src/site/rst/index.rst.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jquery/src/site/site_en.xml =================================================================== --- sandbox/nuiton-js-jquery/src/site/site_en.xml 2013-07-19 21:33:12 UTC (rev 164) +++ sandbox/nuiton-js-jquery/src/site/site_en.xml 2013-07-19 21:34:13 UTC (rev 165) @@ -1,8 +1,8 @@ <!-- #%L Nuiton JS :: JQuery - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin %% @@ -45,8 +45,8 @@ <menu ref="parent"/> - <menu name="Utilisateurs"> - <item name="Accueil" href="index.html"/> + <menu name="Users"> + <item name="Home" href="index.html"/> </menu> <menu ref="reports"/> Property changes on: sandbox/nuiton-js-jquery/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r164 - in sandbox/nuiton-js-underscore: . src/main/resources/nuiton-js-underscore src/site src/site/rst
by echatellier＠users.nuiton.org July 19, 2013

July 19, 2013

Author: echatellier Date: 2013-07-19 23:33:12 +0200 (Fri, 19 Jul 2013) New Revision: 164 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/164 Log: Fix underscore package Removed: sandbox/nuiton-js-underscore/changelog.txt Modified: sandbox/nuiton-js-underscore/LICENSE.txt sandbox/nuiton-js-underscore/README.txt sandbox/nuiton-js-underscore/src/main/resources/nuiton-js-underscore/underscore.js sandbox/nuiton-js-underscore/src/site/rst/index.rst.vm sandbox/nuiton-js-underscore/src/site/site_en.xml Property changes on: sandbox/nuiton-js-underscore/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-underscore/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: sandbox/nuiton-js-underscore/changelog.txt =================================================================== --- sandbox/nuiton-js-underscore/changelog.txt 2013-07-19 21:32:56 UTC (rev 163) +++ sandbox/nuiton-js-underscore/changelog.txt 2013-07-19 21:33:12 UTC (rev 164) @@ -1,2 +0,0 @@ -Please refer to the release note : - http://maven-site.nuiton.org/nuiton-js/changes-report.html Property changes on: sandbox/nuiton-js-underscore/src/main/resources/nuiton-js-underscore/underscore.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-underscore/src/site/rst/index.rst.vm =================================================================== --- sandbox/nuiton-js-underscore/src/site/rst/index.rst.vm 2013-07-19 21:32:56 UTC (rev 163) +++ sandbox/nuiton-js-underscore/src/site/rst/index.rst.vm 2013-07-19 21:33:12 UTC (rev 164) @@ -22,8 +22,8 @@ .. * #L% .. - -Angular -======= +Underscore.js +============= Underscore_ is a utility-belt library for JavaScript that provides a lot of the functional programming support. @@ -33,7 +33,7 @@ .. _documentation: http://underscorejs.org/ Use -=== +--- Maven part:: Modified: sandbox/nuiton-js-underscore/src/site/site_en.xml =================================================================== --- sandbox/nuiton-js-underscore/src/site/site_en.xml 2013-07-19 21:32:56 UTC (rev 163) +++ sandbox/nuiton-js-underscore/src/site/site_en.xml 2013-07-19 21:33:12 UTC (rev 164) @@ -45,8 +45,8 @@ <menu ref="parent"/> - <menu name="Utilisateurs"> - <item name="Accueil" href="index.html"/> + <menu name="Users"> + <item name="Home" href="index.html"/> </menu> <menu ref="reports"/>

1 0

r163 - in sandbox/nuiton-js-select2: . src/main/resources/nuiton-js-select2 src/site src/site/rst
by echatellier＠users.nuiton.org July 19, 2013

July 19, 2013

Author: echatellier Date: 2013-07-19 23:32:56 +0200 (Fri, 19 Jul 2013) New Revision: 163 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/163 Log: Fix select2 package Modified: sandbox/nuiton-js-select2/LICENSE.txt sandbox/nuiton-js-select2/README.txt sandbox/nuiton-js-select2/generate-i18n-group.sh sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2-spinner.gif sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2.png sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ar.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ca.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_cs.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_da.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_de.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_el.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_es.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_et.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_eu.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_fi.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_fr.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_gl.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_he.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_hr.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_hu.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_id.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_is.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_it.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ja.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ko.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_lt.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_lv.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_mk.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_nl.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_no.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_pl.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_pt-BR.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_pt-PT.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ro.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ru.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_sk.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_sv.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_tr.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ua.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_vi.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_zh-CN.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_zh-TW.js sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2x2.png sandbox/nuiton-js-select2/src/site/rst/index.rst.vm sandbox/nuiton-js-select2/src/site/site_en.xml Modified: sandbox/nuiton-js-select2/LICENSE.txt =================================================================== --- sandbox/nuiton-js-select2/LICENSE.txt 2013-07-19 21:32:42 UTC (rev 162) +++ sandbox/nuiton-js-select2/LICENSE.txt 2013-07-19 21:32:56 UTC (rev 163) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Property changes on: sandbox/nuiton-js-select2/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/generate-i18n-group.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2-spinner.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ar.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ca.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_cs.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_da.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_de.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_el.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_es.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_et.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_eu.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_fi.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_fr.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_gl.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_he.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_hr.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_hu.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_id.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_is.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_it.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ja.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ko.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_lt.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_lv.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_mk.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_nl.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_no.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_pl.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_pt-BR.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_pt-PT.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ro.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ru.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_sk.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_sv.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_tr.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_ua.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_vi.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_zh-CN.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2_locale_zh-TW.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-select2/src/main/resources/nuiton-js-select2/select2x2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-select2/src/site/rst/index.rst.vm =================================================================== --- sandbox/nuiton-js-select2/src/site/rst/index.rst.vm 2013-07-19 21:32:42 UTC (rev 162) +++ sandbox/nuiton-js-select2/src/site/rst/index.rst.vm 2013-07-19 21:32:56 UTC (rev 163) @@ -25,23 +25,22 @@ Select2 ======= -Angular_ AngularJS is a toolset for building the framework most suited to your application development. +Select2_ is a jQuery based replacement for select boxes. It supports searching, remote data +sets, and infinite scrolling of results. - documentation_ -- tutorial_ -.. _Angular: http://www.angularjs.org/ -.. _documentation: http://www.angularjs.org/ -.. _tutorial: http://docs.angularjs.org/tutorial +.. _Select2: http://ivaynberg.github.io/select2/ +.. _documentation: http://ivaynberg.github.io/select2/ Use -=== +--- Maven part:: <dependency> <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angular</artifactId> + <artifactId>nuiton-js-select2</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> @@ -50,312 +49,54 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - <script language="javascript" type="text/javascript" src="<c:url value="/nuiton-js/angular.js"/>"></script> + <script language="javascript" type="text/javascript" src="<c:url value="/nuiton-js/select2.js"/>"></script> Available JS ------------ -- angular.js +- select2.js -extra: - -- angular-cookies.js -- angular-loader.js -- angular-mobile.js -- angular-resource.js -- angular-sanitize.js - i18n: -- angular-af-na.js -- angular-af-za.js -- angular-af.js -- angular-am-et.js -- angular-am.js -- angular-ar-001.js -- angular-ar-ae.js -- angular-ar-bh.js -- angular-ar-dz.js -- angular-ar-eg.js -- angular-ar-iq.js -- angular-ar-jo.js -- angular-ar-kw.js -- angular-ar-lb.js -- angular-ar-ly.js -- angular-ar-ma.js -- angular-ar-om.js -- angular-ar-qa.js -- angular-ar-sa.js -- angular-ar-sd.js -- angular-ar-sy.js -- angular-ar-tn.js -- angular-ar-ye.js -- angular-ar.js -- angular-bg-bg.js -- angular-bg.js -- angular-bn-bd.js -- angular-bn-in.js -- angular-bn.js -- angular-ca-ad.js -- angular-ca-es.js -- angular-ca.js -- angular-chr.js -- angular-cs-cz.js -- angular-cs.js -- angular-cy.js -- angular-da-dk.js -- angular-da.js -- angular-de-at.js -- angular-de-be.js -- angular-de-ch.js -- angular-de-de.js -- angular-de-li.js -- angular-de-lu.js -- angular-de.js -- angular-el-cy.js -- angular-el-gr.js -- angular-el-polyton.js -- angular-el.js -- angular-en-as.js -- angular-en-au.js -- angular-en-bb.js -- angular-en-be.js -- angular-en-bm.js -- angular-en-bw.js -- angular-en-bz.js -- angular-en-ca.js -- angular-en-dsrt-us.js -- angular-en-dsrt.js -- angular-en-fm.js -- angular-en-gb.js -- angular-en-gu.js -- angular-en-gy.js -- angular-en-hk.js -- angular-en-ie.js -- angular-en-in.js -- angular-en-iso.js -- angular-en-jm.js -- angular-en-mh.js -- angular-en-mp.js -- angular-en-mt.js -- angular-en-mu.js -- angular-en-na.js -- angular-en-nz.js -- angular-en-ph.js -- angular-en-pk.js -- angular-en-pr.js -- angular-en-pw.js -- angular-en-sg.js -- angular-en-tc.js -- angular-en-tt.js -- angular-en-um.js -- angular-en-us.js -- angular-en-vg.js -- angular-en-vi.js -- angular-en-za.js -- angular-en-zw.js -- angular-en-zz.js -- angular-en.js -- angular-es-419.js -- angular-es-ar.js -- angular-es-bo.js -- angular-es-cl.js -- angular-es-co.js -- angular-es-cr.js -- angular-es-do.js -- angular-es-ea.js -- angular-es-ec.js -- angular-es-es.js -- angular-es-gq.js -- angular-es-gt.js -- angular-es-hn.js -- angular-es-ic.js -- angular-es-mx.js -- angular-es-ni.js -- angular-es-pa.js -- angular-es-pe.js -- angular-es-pr.js -- angular-es-py.js -- angular-es-sv.js -- angular-es-us.js -- angular-es-uy.js -- angular-es-ve.js -- angular-es.js -- angular-et-ee.js -- angular-et.js -- angular-eu-es.js -- angular-eu.js -- angular-fa-af.js -- angular-fa-ir.js -- angular-fa.js -- angular-fi-fi.js -- angular-fi.js -- angular-fil-ph.js -- angular-fil.js -- angular-fr-be.js -- angular-fr-bf.js -- angular-fr-bi.js -- angular-fr-bj.js -- angular-fr-bl.js -- angular-fr-ca.js -- angular-fr-cd.js -- angular-fr-cf.js -- angular-fr-cg.js -- angular-fr-ch.js -- angular-fr-ci.js -- angular-fr-cm.js -- angular-fr-dj.js -- angular-fr-fr.js -- angular-fr-ga.js -- angular-fr-gf.js -- angular-fr-gn.js -- angular-fr-gp.js -- angular-fr-gq.js -- angular-fr-km.js -- angular-fr-lu.js -- angular-fr-mc.js -- angular-fr-mf.js -- angular-fr-mg.js -- angular-fr-ml.js -- angular-fr-mq.js -- angular-fr-ne.js -- angular-fr-re.js -- angular-fr-rw.js -- angular-fr-sn.js -- angular-fr-td.js -- angular-fr-tg.js -- angular-fr-yt.js -- angular-fr.js -- angular-gl-es.js -- angular-gl.js -- angular-gsw-ch.js -- angular-gsw.js -- angular-gu-in.js -- angular-gu.js -- angular-haw.js -- angular-he-il.js -- angular-he.js -- angular-hi-in.js -- angular-hi.js -- angular-hr-hr.js -- angular-hr.js -- angular-hu-hu.js -- angular-hu.js -- angular-id-id.js -- angular-id.js -- angular-in.js -- angular-is-is.js -- angular-is.js -- angular-it-ch.js -- angular-it-it.js -- angular-it-sm.js -- angular-it.js -- angular-iw.js -- angular-ja-jp.js -- angular-ja.js -- angular-kn-in.js -- angular-kn.js -- angular-ko-kr.js -- angular-ko.js -- angular-ln-cd.js -- angular-ln-cg.js -- angular-ln.js -- angular-lt-lt.js -- angular-lt.js -- angular-lv-lv.js -- angular-lv.js -- angular-ml-in.js -- angular-ml.js -- angular-mo.js -- angular-mr-in.js -- angular-mr.js -- angular-ms-bn.js -- angular-ms-my.js -- angular-ms.js -- angular-mt-mt.js -- angular-mt.js -- angular-nl-aw.js -- angular-nl-be.js -- angular-nl-cw.js -- angular-nl-nl.js -- angular-nl-sx.js -- angular-nl.js -- angular-no.js -- angular-or-in.js -- angular-or.js -- angular-pl-pl.js -- angular-pl.js -- angular-pt-ao.js -- angular-pt-br.js -- angular-pt-gw.js -- angular-pt-mz.js -- angular-pt-pt.js -- angular-pt-st.js -- angular-pt.js -- angular-ro-md.js -- angular-ro-ro.js -- angular-ro.js -- angular-ru-md.js -- angular-ru-ru.js -- angular-ru-ua.js -- angular-ru.js -- angular-sk-sk.js -- angular-sk.js -- angular-sl-si.js -- angular-sl.js -- angular-sq-al.js -- angular-sq.js -- angular-sr-cyrl-ba.js -- angular-sr-cyrl-me.js -- angular-sr-cyrl-rs.js -- angular-sr-cyrl.js -- angular-sr-latn-ba.js -- angular-sr-latn-me.js -- angular-sr-latn-rs.js -- angular-sr-latn.js -- angular-sr-rs.js -- angular-sr.js -- angular-sv-fi.js -- angular-sv-se.js -- angular-sv.js -- angular-sw-ke.js -- angular-sw-tz.js -- angular-sw.js -- angular-ta-in.js -- angular-ta-lk.js -- angular-ta.js -- angular-te-in.js -- angular-te.js -- angular-th-th.js -- angular-th.js -- angular-tl-ph.js -- angular-tl.js -- angular-tr-tr.js -- angular-tr.js -- angular-uk-ua.js -- angular-uk.js -- angular-ur-in.js -- angular-ur-pk.js -- angular-ur.js -- angular-vi-vn.js -- angular-vi.js -- angular-zh-cn.js -- angular-zh-hans-cn.js -- angular-zh-hans-hk.js -- angular-zh-hans-mo.js -- angular-zh-hans-sg.js -- angular-zh-hans.js -- angular-zh-hant-hk.js -- angular-zh-hant-mo.js -- angular-zh-hant-tw.js -- angular-zh-hant.js -- angular-zh-hk.js -- angular-zh-tw.js -- angular-zh.js -- angular-zu-za.js -- angular-zu.js +- select2-ar.js +- select2-ca.js +- select2-cs.js +- select2-da.js +- select2-de.js +- select2-el.js +- select2-es.js +- select2-et.js +- select2-eu.js +- select2-fi.js +- select2-fr.js +- select2-gl.js +- select2-he.js +- select2-hr.js +- select2-hu.js +- select2-id.js +- select2-is.js +- select2-it.js +- select2-ja.js +- select2-ko.js +- select2-lt.js +- select2-lv.js +- select2-mk.js +- select2-nl.js +- select2-no.js +- select2-pl.js +- select2-pt-BR.js +- select2-pt-PT.js +- select2-ro.js +- select2-ru.js +- select2-sk.js +- select2-sv.js +- select2-tr.js +- select2-ua.js +- select2-vi.js +- select2-zh-CN.js +- select2-zh-TW.js Available CSS ------------- -*none* +- select2.css Modified: sandbox/nuiton-js-select2/src/site/site_en.xml =================================================================== --- sandbox/nuiton-js-select2/src/site/site_en.xml 2013-07-19 21:32:42 UTC (rev 162) +++ sandbox/nuiton-js-select2/src/site/site_en.xml 2013-07-19 21:32:56 UTC (rev 163) @@ -45,8 +45,8 @@ <menu ref="parent"/> - <menu name="Utilisateurs"> - <item name="Accueil" href="index.html"/> + <menu name="Users"> + <item name="Home" href="index.html"/> </menu> <menu ref="reports"/>

1 0

r162 - in sandbox/nuiton-js-mustache: . src/main/resources/nuiton-js-mustache src/site src/site/rst
by echatellier＠users.nuiton.org July 19, 2013

July 19, 2013

Author: echatellier Date: 2013-07-19 23:32:42 +0200 (Fri, 19 Jul 2013) New Revision: 162 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/162 Log: Fix mustache package Removed: sandbox/nuiton-js-mustache/changelog.txt Modified: sandbox/nuiton-js-mustache/LICENSE.txt sandbox/nuiton-js-mustache/README.txt sandbox/nuiton-js-mustache/src/main/resources/nuiton-js-mustache/mustache.js sandbox/nuiton-js-mustache/src/site/rst/index.rst.vm sandbox/nuiton-js-mustache/src/site/site_en.xml Property changes on: sandbox/nuiton-js-mustache/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-mustache/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: sandbox/nuiton-js-mustache/changelog.txt =================================================================== --- sandbox/nuiton-js-mustache/changelog.txt 2013-07-19 21:32:28 UTC (rev 161) +++ sandbox/nuiton-js-mustache/changelog.txt 2013-07-19 21:32:42 UTC (rev 162) @@ -1,2 +0,0 @@ -Please refer to the release note : - http://maven-site.nuiton.org/nuiton-js/changes-report.html Property changes on: sandbox/nuiton-js-mustache/src/main/resources/nuiton-js-mustache/mustache.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-mustache/src/site/rst/index.rst.vm =================================================================== --- sandbox/nuiton-js-mustache/src/site/rst/index.rst.vm 2013-07-19 21:32:28 UTC (rev 161) +++ sandbox/nuiton-js-mustache/src/site/rst/index.rst.vm 2013-07-19 21:32:42 UTC (rev 162) @@ -1,8 +1,8 @@ .. - .. * #%L .. * Nuiton JS :: Mustache -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2012 - 2013 CodeLutin .. * %% @@ -35,7 +35,7 @@ .. _demo: http://mustache.github.io/#demo Use -=== +--- Maven part:: Property changes on: sandbox/nuiton-js-mustache/src/site/rst/index.rst.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-mustache/src/site/site_en.xml =================================================================== --- sandbox/nuiton-js-mustache/src/site/site_en.xml 2013-07-19 21:32:28 UTC (rev 161) +++ sandbox/nuiton-js-mustache/src/site/site_en.xml 2013-07-19 21:32:42 UTC (rev 162) @@ -45,8 +45,8 @@ <menu ref="parent"/> - <menu name="Utilisateurs"> - <item name="Accueil" href="index.html"/> + <menu name="Users"> + <item name="Home" href="index.html"/> </menu> <menu ref="reports"/>

1 0

r161 - in sandbox/nuiton-js-moment: . src/main/resources/META-INF/nuiton-js src/main/resources/nuiton-js-moment src/site src/site/rst
by echatellier＠users.nuiton.org July 19, 2013

July 19, 2013

Author: echatellier Date: 2013-07-19 23:32:28 +0200 (Fri, 19 Jul 2013) New Revision: 161 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/161 Log: Update moment js Removed: sandbox/nuiton-js-moment/changelog.txt Modified: sandbox/nuiton-js-moment/LICENSE.txt sandbox/nuiton-js-moment/README.txt sandbox/nuiton-js-moment/pom.xml sandbox/nuiton-js-moment/src/main/resources/META-INF/nuiton-js/wro-moment.xml sandbox/nuiton-js-moment/src/main/resources/nuiton-js-moment/moment.js sandbox/nuiton-js-moment/src/site/rst/index.rst.vm sandbox/nuiton-js-moment/src/site/site_en.xml Property changes on: sandbox/nuiton-js-moment/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-moment/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: sandbox/nuiton-js-moment/changelog.txt =================================================================== --- sandbox/nuiton-js-moment/changelog.txt 2013-07-19 21:31:58 UTC (rev 160) +++ sandbox/nuiton-js-moment/changelog.txt 2013-07-19 21:32:28 UTC (rev 161) @@ -1,2 +0,0 @@ -Please refer to the release note : - http://maven-site.nuiton.org/nuiton-js/changes-report.html Modified: sandbox/nuiton-js-moment/pom.xml =================================================================== --- sandbox/nuiton-js-moment/pom.xml 2013-07-19 21:31:58 UTC (rev 160) +++ sandbox/nuiton-js-moment/pom.xml 2013-07-19 21:32:28 UTC (rev 161) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-js-moment</artifactId> - <version>2.0.0-1</version> + <version>2.1.0-1-SNAPSHOT</version> <name>Nuiton JS :: Moment</name> <description>Moment.js packaging</description> @@ -22,9 +22,9 @@ <url>http://momentjs.com/</url> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-moment-2.0.0-1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-moment-2.0.0-1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-js/tags/nuiton-js-moment-2…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-moment-2.1.0-1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-moment-2.1.0-1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-js/tags/nuiton-js-moment-2…</url> </scm> <licenses> Property changes on: sandbox/nuiton-js-moment/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-moment/src/main/resources/META-INF/nuiton-js/wro-moment.xml =================================================================== --- sandbox/nuiton-js-moment/src/main/resources/META-INF/nuiton-js/wro-moment.xml 2013-07-19 21:31:58 UTC (rev 160) +++ sandbox/nuiton-js-moment/src/main/resources/META-INF/nuiton-js/wro-moment.xml 2013-07-19 21:32:28 UTC (rev 161) @@ -1,3 +1,26 @@ + <groups xmlns="http://www.isdc.ro/wro"> <group name='moment'> Property changes on: sandbox/nuiton-js-moment/src/main/resources/META-INF/nuiton-js/wro-moment.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-moment/src/main/resources/nuiton-js-moment/moment.js =================================================================== --- sandbox/nuiton-js-moment/src/main/resources/nuiton-js-moment/moment.js 2013-07-19 21:31:58 UTC (rev 160) +++ sandbox/nuiton-js-moment/src/main/resources/nuiton-js-moment/moment.js 2013-07-19 21:32:28 UTC (rev 161) @@ -1,5 +1,6 @@ +// %%Ignore-License // moment.js -// version : 2.0.0 +// version : 2.1.0 // author : Tim Wood // license : MIT // momentjs.com @@ -11,7 +12,7 @@ ************************************/ var moment, - VERSION = "2.0.0", + VERSION = "2.1.0", round = Math.round, i, // internal storage for language config files languages = {}, @@ -21,21 +22,19 @@ // ASP.NET json date format regex aspNetJsonRegex = /^\/?Date$(\-?\d+)/i, + aspNetTimeSpanJsonRegex = /(\-)?(\d*)?\.?(\d+)\:(\d+)\:(\d+)\.?(\d{3})?/, // format tokens - formattingTokens = /(\[[^\[]*\])|(\$?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g, + formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g, localFormattingTokens = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g, - // parsing tokens - parseMultipleFormatChunker = /([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi, - // parsing token regexes parseTokenOneOrTwoDigits = /\d\d?/, // 0 - 99 parseTokenOneToThreeDigits = /\d{1,3}/, // 0 - 999 parseTokenThreeDigits = /\d{3}/, // 000 - 999 parseTokenFourDigits = /\d{1,4}/, // 0 - 9999 parseTokenSixDigits = /[+\-]?\d{1,6}/, // -999,999 - 999,999 - parseTokenWord = /[0-9]*[a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF]+\s*?[\u0600-\u06FF]+/i, // any word (or two) characters or numbers including two word month in arabic. + parseTokenWord = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i, // any word (or two) characters or numbers including two/three word month in arabic. parseTokenTimezone = /Z|[\+\-]\d\d:?\d\d/i, // +00:00 -00:00 +0000 -0000 or Z parseTokenT = /T/i, // T (ISO seperator) parseTokenTimestampMs = /[\+\-]?\d+(\.\d{1,3})?/, // 123456789 123456789.123 @@ -57,7 +56,7 @@ parseTimezoneChunker = /([\+\-]|\d\d)/gi, // getter and setter names - proxyGettersAndSetters = 'Month|Date|Hours|Minutes|Seconds|Milliseconds'.split('|'), + proxyGettersAndSetters = 'Date|Hours|Minutes|Seconds|Milliseconds'.split('|'), unitMillisecondFactors = { 'Milliseconds' : 1, 'Seconds' : 1e3, @@ -68,6 +67,17 @@ 'Years' : 31536e6 }, + unitAliases = { + ms : 'millisecond', + s : 'second', + m : 'minute', + h : 'hour', + d : 'day', + w : 'week', + M : 'month', + y : 'year' + }, + // format function strings formatFunctions = {}, @@ -118,6 +128,30 @@ YYYYY : function () { return leftZeroFill(this.year(), 5); }, + gg : function () { + return leftZeroFill(this.weekYear() % 100, 2); + }, + gggg : function () { + return this.weekYear(); + }, + ggggg : function () { + return leftZeroFill(this.weekYear(), 5); + }, + GG : function () { + return leftZeroFill(this.isoWeekYear() % 100, 2); + }, + GGGG : function () { + return this.isoWeekYear(); + }, + GGGGG : function () { + return leftZeroFill(this.isoWeekYear(), 5); + }, + e : function () { + return this.weekday(); + }, + E : function () { + return this.isoWeekday(); + }, a : function () { return this.lang().meridiem(this.hours(), this.minutes(), true); }, @@ -163,6 +197,12 @@ } return b + leftZeroFill(~~(10 * a / 6), 4); }, + z : function () { + return this.zoneAbbr(); + }, + zz : function () { + return this.zoneName(); + }, X : function () { return this.unix(); } @@ -173,15 +213,15 @@ return leftZeroFill(func.call(this, a), count); }; } - function ordinalizeToken(func) { + function ordinalizeToken(func, period) { return function (a) { - return this.lang().ordinal(func.call(this, a)); + return this.lang().ordinal(func.call(this, a), period); }; } while (ordinalizeTokens.length) { i = ordinalizeTokens.pop(); - formatTokenFunctions[i + 'o'] = ordinalizeToken(formatTokenFunctions[i]); + formatTokenFunctions[i + 'o'] = ordinalizeToken(formatTokenFunctions[i], i); } while (paddedTokens.length) { i = paddedTokens.pop(); @@ -205,8 +245,7 @@ // Duration Constructor function Duration(duration) { - var data = this._data = {}, - years = duration.years || duration.year || duration.y || 0, + var years = duration.years || duration.year || duration.y || 0, months = duration.months || duration.month || duration.M || 0, weeks = duration.weeks || duration.week || duration.w || 0, days = duration.days || duration.day || duration.d || 0, @@ -215,6 +254,9 @@ seconds = duration.seconds || duration.second || duration.s || 0, milliseconds = duration.milliseconds || duration.millisecond || duration.ms || 0; + // store reference to input for deterministic cloning + this._input = duration; + // representation for dateAddRemove this._milliseconds = milliseconds + seconds * 1e3 + // 1000 @@ -230,29 +272,9 @@ this._months = months + years * 12; - // The following code bubbles up values, see the tests for - // examples of what that means. - data.milliseconds = milliseconds % 1000; - seconds += absRound(milliseconds / 1000); + this._data = {}; - data.seconds = seconds % 60; - minutes += absRound(seconds / 60); - - data.minutes = minutes % 60; - hours += absRound(minutes / 60); - - data.hours = hours % 24; - days += absRound(hours / 24); - - days += weeks * 7; - data.days = days % 30; - - months += absRound(days / 30); - - data.months = months % 12; - years += absRound(months / 12); - - data.years = years; + this._bubble(); } @@ -289,24 +311,36 @@ } // helper function for _.addTime and _.subtractTime - function addOrSubtractDurationFromMoment(mom, duration, isAdding) { - var ms = duration._milliseconds, - d = duration._days, - M = duration._months, + function addOrSubtractDurationFromMoment(mom, duration, isAdding, ignoreUpdateOffset) { + var milliseconds = duration._milliseconds, + days = duration._days, + months = duration._months, + minutes, + hours, currentDate; - if (ms) { - mom._d.setTime(+mom + ms * isAdding); + if (milliseconds) { + mom._d.setTime(+mom._d + milliseconds * isAdding); } - if (d) { - mom.date(mom.date() + d * isAdding); + // store the minutes and hours so we can restore them + if (days || months) { + minutes = mom.minute(); + hours = mom.hour(); } - if (M) { - currentDate = mom.date(); - mom.date(1) - .month(mom.month() + M * isAdding) - .date(Math.min(currentDate, mom.daysInMonth())); + if (days) { + mom.date(mom.date() + days * isAdding); } + if (months) { + mom.month(mom.month() + months * isAdding); + } + if (milliseconds && !ignoreUpdateOffset) { + moment.updateOffset(mom); + } + // restore the minutes and hours after possibly changing dst + if (days || months) { + mom.minute(minutes); + mom.hour(hours); + } } // check if is an array @@ -328,7 +362,11 @@ return diffs + lengthDiff; } + function normalizeUnits(units) { + return units ? unitAliases[units] || units.toLowerCase().replace(/(.)s$/, '$1') : units; + } + /************************************ Languages ************************************/ @@ -358,7 +396,7 @@ }, monthsParse : function (monthName) { - var i, mom, regex, output; + var i, mom, regex; if (!this._monthsParse) { this._monthsParse = []; @@ -393,6 +431,27 @@ return this._weekdaysMin[m.day()]; }, + weekdaysParse : function (weekdayName) { + var i, mom, regex; + + if (!this._weekdaysParse) { + this._weekdaysParse = []; + } + + for (i = 0; i < 7; i++) { + // make the regex if we don't have it already + if (!this._weekdaysParse[i]) { + mom = moment([2000, 1]).day(i); + regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, ''); + this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i'); + } + // test the regex + if (this._weekdaysParse[i].test(weekdayName)) { + return i; + } + } + }, + _longDateFormat : { LT : "h:mm A", L : "MM/DD/YYYY", @@ -411,6 +470,11 @@ return output; }, + isPM : function (input) { + return ((input + '').toLowerCase()[0] === 'p'); + }, + + _meridiemParse : /[ap]\.?m?\.?/i, meridiem : function (hours, minutes, isLower) { if (hours > 11) { return isLower ? 'pm' : 'PM'; @@ -424,7 +488,7 @@ nextDay : '[Tomorrow at] LT', nextWeek : 'dddd [at] LT', lastDay : '[Yesterday at] LT', - lastWeek : '[last] dddd [at] LT', + lastWeek : '[Last] dddd [at] LT', sameElse : 'L' }, calendar : function (key, mom) { @@ -472,7 +536,7 @@ }, week : function (mom) { - return weekOfYear(mom, this._week.dow, this._week.doy); + return weekOfYear(mom, this._week.dow, this._week.doy).week; }, _week : { dow : 0, // Sunday is the first day of the week. @@ -504,7 +568,12 @@ return moment.fn._lang; } if (!languages[key] && hasModule) { - require('./lang/' + key); + try { + require('./lang/' + key); + } catch (e) { + // call with no params to set to default + return moment.fn._lang; + } } return languages[key]; } @@ -536,7 +605,7 @@ return function (mom) { var output = ""; for (i = 0; i < length; i++) { - output += typeof array[i].call === 'function' ? array[i].call(mom, format) : array[i]; + output += array[i] instanceof Function ? array[i].call(mom, format) : array[i]; } return output; }; @@ -568,7 +637,7 @@ // get the regex to find the next token - function getParseRegexForToken(token) { + function getParseRegexForToken(token, config) { switch (token) { case 'DDDD': return parseTokenThreeDigits; @@ -586,9 +655,10 @@ case 'dd': case 'ddd': case 'dddd': + return parseTokenWord; case 'a': case 'A': - return parseTokenWord; + return getLangDefinition(config._l)._meridiemParse; case 'X': return parseTokenTimestampMs; case 'Z': @@ -616,10 +686,17 @@ } } + function timezoneMinutesFromString(string) { + var tzchunk = (parseTokenTimezone.exec(string) || [])[0], + parts = (tzchunk + '').match(parseTimezoneChunker) || ['-', 0, 0], + minutes = +(parts[1] * 60) + ~~parts[2]; + + return parts[0] === '+' ? -minutes : minutes; + } + // function to convert string input to date function addTimeToArrayFromToken(token, input, config) { - var a, b, - datePartArray = config._a; + var a, datePartArray = config._a; switch (token) { // MONTH @@ -657,7 +734,7 @@ // AM / PM case 'a' : // fall through to A case 'A' : - config._isPm = ((input + '').toLowerCase() === 'pm'); + config._isPm = getLangDefinition(config._l).isPM(input); break; // 24 HOUR case 'H' : // fall through to hh @@ -690,18 +767,7 @@ case 'Z' : // fall through to ZZ case 'ZZ' : config._useUTC = true; - a = (input + '').match(parseTimezoneChunker); - if (a && a[1]) { - config._tzh = ~~a[1]; - } - if (a && a[2]) { - config._tzm = ~~a[2]; - } - // reverse offsets - if (a && a[0] === '+') { - config._tzh = -config._tzh; - config._tzm = -config._tzm; - } + config._tzm = timezoneMinutesFromString(input); break; } @@ -727,8 +793,8 @@ } // add the offsets to the time to be parsed so that we can have a clean array for checking isValid - input[3] += config._tzh || 0; - input[4] += config._tzm || 0; + input[3] += ~~((config._tzm || 0) / 60); + input[4] += ~~((config._tzm || 0) % 60); date = new Date(0); @@ -753,7 +819,7 @@ config._a = []; for (i = 0; i < tokens.length; i++) { - parsedInput = (getParseRegexForToken(tokens[i]).exec(string) || [])[0]; + parsedInput = (getParseRegexForToken(tokens[i], config).exec(string) || [])[0]; if (parsedInput) { string = string.slice(string.indexOf(parsedInput) + parsedInput.length); } @@ -762,6 +828,12 @@ addTimeToArrayFromToken(tokens[i], parsedInput, config); } } + + // add remaining unparsed input to the string + if (string) { + config._il = string; + } + // handle am pm if (config._isPm && config._a[3] < 12) { config._a[3] += 12; @@ -782,22 +854,22 @@ scoreToBeat = 99, i, - currentDate, currentScore; - while (config._f.length) { + for (i = 0; i < config._f.length; i++) { tempConfig = extend({}, config); - tempConfig._f = config._f.pop(); + tempConfig._f = config._f[i]; makeDateFromStringAndFormat(tempConfig); tempMoment = new Moment(tempConfig); - if (tempMoment.isValid()) { - bestMoment = tempMoment; - break; + currentScore = compareArrays(tempConfig._a, tempMoment.toArray()); + + // if there is any input that was not parsed + // add a penalty for that format + if (tempMoment._il) { + currentScore += tempMoment._il.length; } - currentScore = compareArrays(tempConfig._a, tempMoment.toArray()); - if (currentScore < scoreToBeat) { scoreToBeat = currentScore; bestMoment = tempMoment; @@ -810,9 +882,12 @@ // date from iso format function makeDateFromString(config) { var i, - string = config._i; - if (isoRegex.exec(string)) { - config._f = 'YYYY-MM-DDT'; + string = config._i, + match = isoRegex.exec(string); + + if (match) { + // match[2] should be "T" or undefined + config._f = 'YYYY-MM-DD' + (match[2] || " "); for (i = 0; i < 4; i++) { if (isoTimes[i][1].exec(string)) { config._f += isoTimes[i][0]; @@ -894,7 +969,8 @@ // (eg. ISO weeks use thursday (4)) function weekOfYear(mom, firstDayOfWeek, firstDayOfWeekOfYear) { var end = firstDayOfWeekOfYear - firstDayOfWeek, - daysToDayOfWeek = firstDayOfWeekOfYear - mom.day(); + daysToDayOfWeek = firstDayOfWeekOfYear - mom.day(), + adjustedMoment; if (daysToDayOfWeek > end) { @@ -905,7 +981,11 @@ daysToDayOfWeek += 7; } - return Math.ceil(moment(mom).add('d', daysToDayOfWeek).dayOfYear() / 7); + adjustedMoment = moment(mom).add('d', daysToDayOfWeek); + return { + week: Math.ceil(adjustedMoment.dayOfYear() / 7), + year: adjustedMoment.year() + }; } @@ -970,7 +1050,9 @@ moment.duration = function (input, key) { var isDuration = moment.isDuration(input), isNumber = (typeof input === 'number'), - duration = (isDuration ? input._data : (isNumber ? {} : input)), + duration = (isDuration ? input._input : (isNumber ? {} : input)), + matched = aspNetTimeSpanJsonRegex.exec(input), + sign, ret; if (isNumber) { @@ -979,6 +1061,16 @@ } else { duration.milliseconds = input; } + } else if (matched) { + sign = (matched[1] === "-") ? -1 : 1; + duration = { + y: 0, + d: ~~matched[2] * sign, + h: ~~matched[3] * sign, + m: ~~matched[4] * sign, + s: ~~matched[5] * sign, + ms: ~~matched[6] * sign + }; } ret = new Duration(duration); @@ -996,12 +1088,14 @@ // default format moment.defaultFormat = isoFormat; + // This function will be called whenever a moment is mutated. + // It is intended to keep the offset in sync with the timezone. + moment.updateOffset = function () {}; + // This function will load languages and then set the global language. If // no arguments are passed in, it will simply return the current global // language key. moment.lang = function (key, values) { - var i; - if (!key) { return moment.fn._lang._abbr; } @@ -1044,11 +1138,11 @@ }, valueOf : function () { - return +this._d; + return +this._d + ((this._offset || 0) * 60000); }, unix : function () { - return Math.floor(+this._d / 1000); + return Math.floor(+this / 1000); }, toString : function () { @@ -1056,11 +1150,11 @@ }, toDate : function () { - return this._d; + return this._offset ? new Date(+this) : this._d; }, - toJSON : function () { - return moment.utc(this).format('YYYY-MM-DD[T]HH:mm:ss.SSS[Z]'); + toISOString : function () { + return formatMoment(moment(this).utc(), 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]'); }, toArray : function () { @@ -1088,11 +1182,11 @@ }, utc : function () { - this._isUTC = true; - return this; + return this.zone(0); }, local : function () { + this.zone(0); this._isUTC = false; return this; }, @@ -1127,29 +1221,34 @@ }, diff : function (input, units, asFloat) { - var that = this._isUTC ? moment(input).utc() : moment(input).local(), + var that = this._isUTC ? moment(input).zone(this._offset || 0) : moment(input).local(), zoneDiff = (this.zone() - that.zone()) * 6e4, diff, output; - if (units) { - // standardize on singular form - units = units.replace(/s$/, ''); - } + units = normalizeUnits(units); if (units === 'year' || units === 'month') { + // average number of days in the months in the given dates diff = (this.daysInMonth() + that.daysInMonth()) * 432e5; // 24 * 60 * 60 * 1000 / 2 + // difference in months output = ((this.year() - that.year()) * 12) + (this.month() - that.month()); - output += ((this - moment(this).startOf('month')) - (that - moment(that).startOf('month'))) / diff; + // adjust by taking difference in days, average number of days + // and dst in the given months. + output += ((this - moment(this).startOf('month')) - + (that - moment(that).startOf('month'))) / diff; + // same as above but with zones, to negate all dst + output -= ((this.zone() - moment(this).startOf('month').zone()) - + (that.zone() - moment(that).startOf('month').zone())) * 6e4 / diff; if (units === 'year') { output = output / 12; } } else { - diff = (this - that) - zoneDiff; + diff = (this - that); output = units === 'second' ? diff / 1e3 : // 1000 units === 'minute' ? diff / 6e4 : // 1000 * 60 units === 'hour' ? diff / 36e5 : // 1000 * 60 * 60 - units === 'day' ? diff / 864e5 : // 1000 * 60 * 60 * 24 - units === 'week' ? diff / 6048e5 : // 1000 * 60 * 60 * 24 * 7 + units === 'day' ? (diff - zoneDiff) / 864e5 : // 1000 * 60 * 60 * 24, negate dst + units === 'week' ? (diff - zoneDiff) / 6048e5 : // 1000 * 60 * 60 * 24 * 7, negate dst diff; } return asFloat ? output : absRound(output); @@ -1180,18 +1279,52 @@ }, isDST : function () { - return (this.zone() < moment([this.year()]).zone() || - this.zone() < moment([this.year(), 5]).zone()); + return (this.zone() < this.clone().month(0).zone() || + this.zone() < this.clone().month(5).zone()); }, day : function (input) { var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay(); - return input == null ? day : - this.add({ d : input - day }); + if (input != null) { + if (typeof input === 'string') { + input = this.lang().weekdaysParse(input); + if (typeof input !== 'number') { + return this; + } + } + return this.add({ d : input - day }); + } else { + return day; + } }, + month : function (input) { + var utc = this._isUTC ? 'UTC' : '', + dayOfMonth, + daysInMonth; + + if (input != null) { + if (typeof input === 'string') { + input = this.lang().monthsParse(input); + if (typeof input !== 'number') { + return this; + } + } + + dayOfMonth = this.date(); + this.date(1); + this._d['set' + utc + 'Month'](input); + this.date(Math.min(dayOfMonth, this.daysInMonth())); + + moment.updateOffset(this); + return this; + } else { + return this._d['get' + utc + 'Month'](); + } + }, + startOf: function (units) { - units = units.replace(/s$/, ''); + units = normalizeUnits(units); // the following switch intentionally omits break keywords // to utilize falling through the cases. switch (units) { @@ -1218,14 +1351,14 @@ // weeks are a special case if (units === 'week') { - this.day(0); + this.weekday(0); } return this; }, endOf: function (units) { - return this.startOf(units).add(units.replace(/s?$/, 's'), 1).subtract('ms', 1); + return this.startOf(units).add(units, 1).subtract('ms', 1); }, isAfter: function (input, units) { @@ -1243,10 +1376,44 @@ return +this.clone().startOf(units) === +moment(input).startOf(units); }, - zone : function () { - return this._isUTC ? 0 : this._d.getTimezoneOffset(); + min: function (other) { + other = moment.apply(null, arguments); + return other < this ? this : other; }, + max: function (other) { + other = moment.apply(null, arguments); + return other > this ? this : other; + }, + + zone : function (input) { + var offset = this._offset || 0; + if (input != null) { + if (typeof input === "string") { + input = timezoneMinutesFromString(input); + } + if (Math.abs(input) < 16) { + input = input * 60; + } + this._offset = input; + this._isUTC = true; + if (offset !== input) { + addOrSubtractDurationFromMoment(this, moment.duration(offset - input, 'm'), 1, true); + } + } else { + return this._isUTC ? offset : this._d.getTimezoneOffset(); + } + return this; + }, + + zoneAbbr : function () { + return this._isUTC ? "UTC" : ""; + }, + + zoneName : function () { + return this._isUTC ? "Coordinated Universal Time" : ""; + }, + daysInMonth : function () { return moment.utc([this.year(), this.month() + 1, 0]).date(); }, @@ -1256,16 +1423,38 @@ return input == null ? dayOfYear : this.add("d", (input - dayOfYear)); }, - isoWeek : function (input) { - var week = weekOfYear(this, 1, 4); - return input == null ? week : this.add("d", (input - week) * 7); + weekYear : function (input) { + var year = weekOfYear(this, this.lang()._week.dow, this.lang()._week.doy).year; + return input == null ? year : this.add("y", (input - year)); }, + isoWeekYear : function (input) { + var year = weekOfYear(this, 1, 4).year; + return input == null ? year : this.add("y", (input - year)); + }, + week : function (input) { var week = this.lang().week(this); return input == null ? week : this.add("d", (input - week) * 7); }, + isoWeek : function (input) { + var week = weekOfYear(this, 1, 4).week; + return input == null ? week : this.add("d", (input - week) * 7); + }, + + weekday : function (input) { + var weekday = (this._d.getDay() + 7 - this.lang()._week.dow) % 7; + return input == null ? weekday : this.add("d", input - weekday); + }, + + isoWeekday : function (input) { + // behaves the same as moment#day except + // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6) + // as a setter, sunday should belong to the previous week. + return input == null ? this.day() || 7 : this.day(this.day() % 7 ? input : input - 7); + }, + // If passed a language key, it will set the language for this // instance. Otherwise, it will return the language configuration // variables for this instance. @@ -1285,6 +1474,7 @@ var utc = this._isUTC ? 'UTC' : ''; if (input != null) { this._d['set' + utc + key](input); + moment.updateOffset(this); return this; } else { return this._d['get' + utc + key](); @@ -1302,15 +1492,49 @@ // add plural methods moment.fn.days = moment.fn.day; + moment.fn.months = moment.fn.month; moment.fn.weeks = moment.fn.week; moment.fn.isoWeeks = moment.fn.isoWeek; + // add aliased format methods + moment.fn.toJSON = moment.fn.toISOString; + /************************************ Duration Prototype ************************************/ moment.duration.fn = Duration.prototype = { + _bubble : function () { + var milliseconds = this._milliseconds, + days = this._days, + months = this._months, + data = this._data, + seconds, minutes, hours, years; + + // The following code bubbles up values, see the tests for + // examples of what that means. + data.milliseconds = milliseconds % 1000; + + seconds = absRound(milliseconds / 1000); + data.seconds = seconds % 60; + + minutes = absRound(seconds / 60); + data.minutes = minutes % 60; + + hours = absRound(minutes / 60); + data.hours = hours % 24; + + days += absRound(hours / 24); + data.days = days % 30; + + months += absRound(days / 30); + data.months = months % 12; + + years = absRound(months / 12); + data.years = years; + }, + weeks : function () { return absRound(this.days() / 7); }, @@ -1318,7 +1542,8 @@ valueOf : function () { return this._milliseconds + this._days * 864e5 + - this._months * 2592e6; + (this._months % 12) * 2592e6 + + ~~(this._months / 12) * 31536e6; }, humanize : function (withSuffix) { @@ -1332,6 +1557,41 @@ return this.lang().postformat(output); }, + add : function (input, val) { + // supports only 2.0-style add(1, 's') or add(moment) + var dur = moment.duration(input, val); + + this._milliseconds += dur._milliseconds; + this._days += dur._days; + this._months += dur._months; + + this._bubble(); + + return this; + }, + + subtract : function (input, val) { + var dur = moment.duration(input, val); + + this._milliseconds -= dur._milliseconds; + this._days -= dur._days; + this._months -= dur._months; + + this._bubble(); + + return this; + }, + + get : function (units) { + units = normalizeUnits(units); + return this[units.toLowerCase() + 's'](); + }, + + as : function (units) { + units = normalizeUnits(units); + return this['as' + units.charAt(0).toUpperCase() + units.slice(1) + 's'](); + }, + lang : moment.fn.lang }; @@ -1355,6 +1615,9 @@ } makeDurationAsGetter('Weeks', 6048e5); + moment.duration.fn.asMonths = function () { + return (+this - this.years() * 31536e6) / 2592e6 + this.years() * 12; + }; /************************************ Property changes on: sandbox/nuiton-js-moment/src/main/resources/nuiton-js-moment/moment.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-moment/src/site/rst/index.rst.vm =================================================================== --- sandbox/nuiton-js-moment/src/site/rst/index.rst.vm 2013-07-19 21:31:58 UTC (rev 160) +++ sandbox/nuiton-js-moment/src/site/rst/index.rst.vm 2013-07-19 21:32:28 UTC (rev 161) @@ -1,8 +1,8 @@ .. - .. * #%L .. * Nuiton JS :: Bootstrap -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2012 - 2013 CodeLutin .. * %% @@ -33,7 +33,7 @@ .. _documentation: http://momentjs.com/ Use -=== +--- Maven part:: Property changes on: sandbox/nuiton-js-moment/src/site/rst/index.rst.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-moment/src/site/site_en.xml =================================================================== --- sandbox/nuiton-js-moment/src/site/site_en.xml 2013-07-19 21:31:58 UTC (rev 160) +++ sandbox/nuiton-js-moment/src/site/site_en.xml 2013-07-19 21:32:28 UTC (rev 161) @@ -1,3 +1,26 @@ + <project name="${project.name}"> <bannerLeft> @@ -22,8 +45,8 @@ <menu ref="parent"/> - <menu name="Utilisateurs"> - <item name="Accueil" href="index.html"/> + <menu name="Users"> + <item name="Home" href="index.html"/> </menu> <menu ref="reports"/> Property changes on: sandbox/nuiton-js-moment/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

July 19, 2013

Author: echatellier Date: 2013-07-19 23:31:58 +0200 (Fri, 19 Jul 2013) New Revision: 160 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/160 Log: Fix jquery-ui package Removed: sandbox/nuiton-js-jquery-ui/changelog.txt Modified: sandbox/nuiton-js-jquery-ui/LICENSE.txt sandbox/nuiton-js-jquery-ui/README.txt sandbox/nuiton-js-jquery-ui/generate-i18n-group.sh sandbox/nuiton-js-jquery-ui/generate-theme-group.sh sandbox/nuiton-js-jquery-ui/generate-ui-group.sh sandbox/nuiton-js-jquery-ui/pom.xml sandbox/nuiton-js-jquery-ui/src/main/resources/META-INF/nuiton-js/wro-jquery-ui.xml sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/animated-overlay.gif sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_flat_0_aaaaaa_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_flat_75_ffffff_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_glass_55_fbf9ee_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_glass_65_ffffff_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_glass_75_dadada_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_glass_75_e6e6e6_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_glass_95_fef1ec_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-icons_222222_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-icons_2e83ff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-icons_454545_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-icons_888888_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-icons_cd0a0a_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.accordion.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.autocomplete.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.button.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.core.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.datepicker.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.dialog.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.menu.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.progressbar.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.resizable.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.selectable.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.slider.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.spinner.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.tabs.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.tooltip.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_diagonals-thick_8_333333_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_flat_65_ffffff_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_glass_40_111111_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_glass_55_1c1c1c_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_highlight-hard_100_f9f9f9_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_highlight-hard_40_aaaaaa_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_highlight-soft_50_aaaaaa_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_inset-hard_45_cd0a0a_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_inset-hard_55_ffeb80_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-icons_222222_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-icons_4ca300_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-icons_bbbbbb_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-icons_ededed_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-icons_ffcf29_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_diagonals-thick_75_f3d8d8_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_dots-small_65_a6a6a6_2x2.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_flat_0_333333_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_flat_65_ffffff_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_flat_75_ffffff_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_glass_55_fbf8ee_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_highlight-hard_100_eeeeee_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_highlight-hard_100_f6f6f6_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_highlight-soft_15_cc0000_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-icons_004276_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-icons_cc0000_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_glass_50_3baae3_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-icons_2694e8_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-icons_2e83ff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-icons_3d80b3_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-icons_72a7cf_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_flat_30_cccccc_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_flat_50_5c5c5c_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_glass_40_ffc73d_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_highlight-hard_20_0972a5_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_highlight-soft_33_003147_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_highlight-soft_35_222222_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_highlight-soft_44_444444_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_highlight-soft_80_eeeeee_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_loop_25_000000_21x21.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-icons_222222_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-icons_4b8e0b_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-icons_a83300_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-icons_cccccc_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_diagonals-thick_15_0b3e6f_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_dots-medium_30_0b58a2_4x4.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_dots-small_20_333333_2x2.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_dots-small_30_a32d00_2x2.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_dots-small_40_00498f_2x2.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_flat_0_aaaaaa_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_flat_40_292929_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_gloss-wave_20_111111_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-icons_00498f_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-icons_98d2fb_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-icons_9ccdfc_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_flat_0_aaaaaa_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_flat_0_eeeeee_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_flat_55_994d53_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_flat_55_fafafa_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_gloss-wave_30_3d3644_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_highlight-soft_100_dcd9de_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_highlight-soft_100_eae6ea_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_highlight-soft_25_30273a_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_highlight-soft_45_5f5964_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-icons_454545_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-icons_734d99_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-icons_8d78a5_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-icons_a8a3ae_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-icons_ebccce_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_diagonals-small_25_c5ddfc_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_diagonals-thick_20_e69700_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_diagonals-thick_22_1484e6_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_diagonals-thick_26_2293f7_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_flat_0_e69700_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_flat_0_e6b900_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_highlight-soft_100_f9f9f9_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_inset-hard_100_eeeeee_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-icons_0a82eb_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-icons_0b54d5_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-icons_5fa5e3_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-icons_fcdd4a_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_flat_0_aaaaaa_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_flat_0_eeeeee_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_flat_55_ffffff_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_flat_75_ffffff_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_glass_65_ffffff_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_highlight-soft_25_0073ea_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_highlight-soft_50_dddddd_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-icons_0073ea_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-icons_454545_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-icons_666666_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-icons_ff0084_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_diagonals-small_40_db4865_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_diagonals-small_50_93c3cd_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_diagonals-small_50_ff3853_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_diagonals-small_75_ccd232_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_dots-medium_80_ffff38_4x4.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_dots-small_35_35414f_2x2.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_flat_75_ba9217_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_flat_75_ffffff_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_white-lines_85_f7f7ba_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-icons_454545_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-icons_88a206_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-icons_c02669_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-icons_e1e463_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-icons_ffeb33_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_flat_75_aaaaaa_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_glass_100_f5f0e5_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_glass_25_cb842e_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_glass_70_ede4d4_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_highlight-hard_65_fee4bd_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_inset-soft_100_f4f0ec_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-icons_c47a23_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-icons_cb672b_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-icons_f08000_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-icons_f35f07_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-icons_ff7519_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_diagonals-small_0_aaaaaa_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_diagonals-thick_15_444444_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_diagonals-thick_95_ffdc2e_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_glass_55_fbf5d0_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_highlight-hard_30_285c00_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_highlight-soft_33_3a8104_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_highlight-soft_50_4eb305_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_highlight-soft_60_4ca20b_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_inset-soft_10_285c00_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-icons_4eb305_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-icons_72b42d_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-icons_cd0a0a_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_flat_0_aaaaaa_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_glass_15_5f391b_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_gloss-wave_20_1c160d_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_gloss-wave_25_453326_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_gloss-wave_30_44372c_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_highlight-soft_20_201913_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_highlight-soft_20_619226_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_inset-soft_10_201913_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-icons_222222_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-icons_9bcc60_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-icons_add978_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-icons_e3ddc9_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-icons_f1fd86_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-icons_3383bb_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-icons_454545_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-icons_70b2e1_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-icons_999999_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-icons_fbc856_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_diagonal-maze_20_6e4f1c_10x10.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_diagonal-maze_40_000000_10x10.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_10_eceadf_60x60.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_10_f8f7f6_60x60.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_15_eceadf_60x60.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_15_f7f3de_60x60.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_15_ffffff_60x60.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_65_654b24_60x60.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_68_b83400_60x60.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-icons_222222_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-icons_3572ac_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-icons_8c291d_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-icons_b83400_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-icons_fbdb93_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_217bc0_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_2e83ff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_469bdd_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_6da8d5_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_cd0a0a_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_d8e7f3_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_f9bd01_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_glass_55_fcf0ba_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_gloss-wave_100_ece8da_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_highlight-hard_100_f5f3e5_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_highlight-hard_100_fafaf4_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_highlight-hard_15_459e00_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_highlight-hard_95_cccccc_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_highlight-soft_25_67b021_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_highlight-soft_95_ffedad_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_inset-soft_15_2b2922_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-icons_808080_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-icons_847e71_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-icons_8DC262_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-icons_cd0a0a_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-icons_eeeeee_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_flat_55_999999_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_flat_75_aaaaaa_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_glass_45_0078ae_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_glass_55_f8da4e_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_glass_75_79c9ec_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_gloss-wave_45_e14f1c_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_gloss-wave_50_6eac2c_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_gloss-wave_75_2191c0_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_inset-hard_100_fcfdfd_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_0078ae_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_056b93_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_d8e7f3_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_e0fdff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_f5e175_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_f7a50d_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_fcd113_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_diagonals-medium_20_d34d17_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_flat_30_cccccc_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_flat_50_5c5c5c_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_gloss-wave_45_817865_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_gloss-wave_60_fece2f_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_gloss-wave_70_ffdd57_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_gloss-wave_90_fff9e5_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_highlight-soft_100_feeebd_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_inset-soft_30_ffffff_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_3d3d3d_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_bd7b00_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_d19405_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_eb990f_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_ed9f26_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_fadc7a_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_ffe180_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_diamond_10_4f4221_10x8.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_diamond_20_372806_10x8.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_diamond_25_675423_10x8.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_diamond_25_d5ac5d_10x8.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_diamond_8_261803_10x8.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_diamond_8_443113_10x8.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_flat_75_ddd4b0_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_highlight-hard_65_fee4bd_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_070603_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_e8e2b5_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_e9cd86_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_efec9f_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_f2ec64_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_f9f2bd_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_ff7519_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_diagonals-small_50_262626_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_flat_0_303030_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_flat_0_4c4c4c_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_glass_40_0a0a0a_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_glass_55_f1fbe5_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_glass_60_000000_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_gloss-wave_55_000000_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_gloss-wave_85_9fda58_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_gloss-wave_95_f6ecd5_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-icons_000000_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-icons_1f1f1f_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-icons_9fda58_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-icons_b8ec79_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-icons_cd0a0a_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_flat_30_cccccc_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_flat_50_5c5c5c_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_glass_20_555555_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_glass_40_ffc73d_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_gloss-wave_25_333333_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_highlight-soft_80_eeeeee_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_inset-soft_25_000000_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_inset-soft_30_f58400_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-icons_222222_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-icons_4b8e0b_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-icons_a83300_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-icons_cccccc_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-icons_222222_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-icons_228ef1_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-icons_ef8c08_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-icons_ffd27a_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-icons_ffffff_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_flat_0_aaaaaa_40x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_glass_95_fef1ec_1x400.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_gloss-wave_16_121212_500x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_highlight-hard_15_888888_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_highlight-hard_55_555555_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_highlight-soft_35_adadad_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_highlight-soft_60_dddddd_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_inset-soft_15_121212_1x100.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_666666_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_aaaaaa_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_bbbbbb_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_c98000_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_cccccc_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_cd0a0a_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_f29a00_256x240.png sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/jquery.ui.theme.css sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-af.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ar-DZ.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ar.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-az.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-be.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-bg.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-bs.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ca.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-cs.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-cy-GB.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-da.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-de.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-el.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-en-AU.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-en-GB.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-en-NZ.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-eo.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-es.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-et.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-eu.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-fa.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-fi.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-fo.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-fr-CA.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-fr-CH.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-fr.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-gl.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-he.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-hi.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-hr.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-hu.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-hy.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-id.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-is.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-it.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ja.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ka.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-kk.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-km.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ko.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ky.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-lb.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-lt.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-lv.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-mk.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ml.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ms.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-nb.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-nl-BE.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-nl.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-nn.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-no.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-pl.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-pt-BR.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-pt.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-rm.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ro.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ru.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-sk.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-sl.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-sq.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-sr-SR.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-sr.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-sv.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ta.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-th.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-tj.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-tr.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-uk.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-vi.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-zh-CN.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-zh-HK.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-zh-TW.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.accordion.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.autocomplete.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.button.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.core.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.datepicker.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.dialog.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.draggable.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.droppable.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-blind.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-bounce.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-clip.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-drop.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-explode.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-fade.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-fold.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-highlight.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-pulsate.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-scale.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-shake.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-slide.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-transfer.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.menu.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.mouse.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.position.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.progressbar.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.resizable.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.selectable.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.slider.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.sortable.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.spinner.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.tabs.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.tooltip.js sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.widget.js sandbox/nuiton-js-jquery-ui/src/site/rst/index.rst.vm sandbox/nuiton-js-jquery-ui/src/site/site_en.xml Property changes on: sandbox/nuiton-js-jquery-ui/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: sandbox/nuiton-js-jquery-ui/changelog.txt =================================================================== --- sandbox/nuiton-js-jquery-ui/changelog.txt 2013-07-19 21:30:55 UTC (rev 159) +++ sandbox/nuiton-js-jquery-ui/changelog.txt 2013-07-19 21:31:58 UTC (rev 160) @@ -1,2 +0,0 @@ -Please refer to the release note : - http://maven-site.nuiton.org/nuiton-js/changes-report.html Property changes on: sandbox/nuiton-js-jquery-ui/generate-i18n-group.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/generate-theme-group.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/generate-ui-group.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jquery-ui/src/main/resources/META-INF/nuiton-js/wro-jquery-ui.xml =================================================================== --- sandbox/nuiton-js-jquery-ui/src/main/resources/META-INF/nuiton-js/wro-jquery-ui.xml 2013-07-19 21:30:55 UTC (rev 159) +++ sandbox/nuiton-js-jquery-ui/src/main/resources/META-INF/nuiton-js/wro-jquery-ui.xml 2013-07-19 21:31:58 UTC (rev 160) @@ -1,8 +1,8 @@ <!-- #%L Nuiton JS :: JQuery UI - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/META-INF/nuiton-js/wro-jquery-ui.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/animated-overlay.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_flat_75_ffffff_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_glass_55_fbf9ee_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_glass_65_ffffff_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_glass_75_dadada_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_glass_75_e6e6e6_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_glass_95_fef1ec_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-icons_2e83ff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-icons_888888_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.accordion.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.autocomplete.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.button.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.core.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.datepicker.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.dialog.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.menu.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.progressbar.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.resizable.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.selectable.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.slider.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.spinner.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.tabs.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/base/jquery.ui.tooltip.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_diagonals-thick_8_333333_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_flat_65_ffffff_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_glass_40_111111_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_glass_55_1c1c1c_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_highlight-hard_100_f9f9f9_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_highlight-hard_40_aaaaaa_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_highlight-soft_50_aaaaaa_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_inset-hard_45_cd0a0a_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-bg_inset-hard_55_ffeb80_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-icons_4ca300_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-icons_bbbbbb_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-icons_ededed_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-icons_ffcf29_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/black-tie/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_diagonals-thick_75_f3d8d8_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_dots-small_65_a6a6a6_2x2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_flat_0_333333_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_flat_65_ffffff_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_flat_75_ffffff_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_glass_55_fbf8ee_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_highlight-hard_100_eeeeee_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_highlight-hard_100_f6f6f6_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-bg_highlight-soft_15_cc0000_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-icons_004276_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-icons_cc0000_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/blitzer/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_glass_50_3baae3_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-icons_2694e8_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-icons_2e83ff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-icons_3d80b3_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-icons_72a7cf_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/cupertino/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_flat_30_cccccc_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_flat_50_5c5c5c_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_glass_40_ffc73d_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_highlight-hard_20_0972a5_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_highlight-soft_33_003147_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_highlight-soft_35_222222_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_highlight-soft_44_444444_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_highlight-soft_80_eeeeee_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-bg_loop_25_000000_21x21.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-icons_4b8e0b_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-icons_a83300_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-icons_cccccc_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dark-hive/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_diagonals-thick_15_0b3e6f_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_dots-medium_30_0b58a2_4x4.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_dots-small_20_333333_2x2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_dots-small_30_a32d00_2x2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_dots-small_40_00498f_2x2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_flat_40_292929_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-bg_gloss-wave_20_111111_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-icons_00498f_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-icons_98d2fb_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-icons_9ccdfc_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/dot-luv/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_flat_0_eeeeee_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_flat_55_994d53_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_flat_55_fafafa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_gloss-wave_30_3d3644_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_highlight-soft_100_dcd9de_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_highlight-soft_100_eae6ea_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_highlight-soft_25_30273a_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-bg_highlight-soft_45_5f5964_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-icons_734d99_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-icons_8d78a5_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-icons_a8a3ae_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-icons_ebccce_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/eggplant/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_diagonals-small_25_c5ddfc_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_diagonals-thick_20_e69700_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_diagonals-thick_22_1484e6_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_diagonals-thick_26_2293f7_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_flat_0_e69700_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_flat_0_e6b900_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_highlight-soft_100_f9f9f9_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-bg_inset-hard_100_eeeeee_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-icons_0a82eb_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-icons_0b54d5_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-icons_5fa5e3_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-icons_fcdd4a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/excite-bike/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_flat_0_eeeeee_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_flat_55_ffffff_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_flat_75_ffffff_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_glass_65_ffffff_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_highlight-soft_25_0073ea_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-bg_highlight-soft_50_dddddd_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-icons_0073ea_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-icons_666666_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-icons_ff0084_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/flick/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_diagonals-small_40_db4865_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_diagonals-small_50_93c3cd_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_diagonals-small_50_ff3853_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_diagonals-small_75_ccd232_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_dots-medium_80_ffff38_4x4.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_dots-small_35_35414f_2x2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_flat_75_ba9217_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_flat_75_ffffff_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-bg_white-lines_85_f7f7ba_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-icons_88a206_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-icons_c02669_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-icons_e1e463_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-icons_ffeb33_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/hot-sneaks/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_flat_75_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_glass_100_f5f0e5_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_glass_25_cb842e_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_glass_70_ede4d4_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_highlight-hard_65_fee4bd_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-bg_inset-soft_100_f4f0ec_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-icons_c47a23_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-icons_cb672b_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-icons_f08000_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-icons_f35f07_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-icons_ff7519_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/humanity/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_diagonals-small_0_aaaaaa_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_diagonals-thick_15_444444_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_diagonals-thick_95_ffdc2e_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_glass_55_fbf5d0_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_highlight-hard_30_285c00_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_highlight-soft_33_3a8104_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_highlight-soft_50_4eb305_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_highlight-soft_60_4ca20b_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-bg_inset-soft_10_285c00_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-icons_4eb305_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-icons_72b42d_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/le-frog/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_glass_15_5f391b_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_gloss-wave_20_1c160d_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_gloss-wave_25_453326_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_gloss-wave_30_44372c_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_highlight-soft_20_201913_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_highlight-soft_20_619226_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-bg_inset-soft_10_201913_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-icons_9bcc60_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-icons_add978_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-icons_e3ddc9_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-icons_f1fd86_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/mint-choc/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-icons_3383bb_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-icons_70b2e1_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-icons_999999_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/images/ui-icons_fbc856_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/overcast/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_diagonal-maze_20_6e4f1c_10x10.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_diagonal-maze_40_000000_10x10.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_10_eceadf_60x60.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_10_f8f7f6_60x60.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_15_eceadf_60x60.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_15_f7f3de_60x60.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_15_ffffff_60x60.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_65_654b24_60x60.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-bg_fine-grain_68_b83400_60x60.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-icons_3572ac_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-icons_8c291d_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-icons_b83400_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-icons_fbdb93_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/pepper-grinder/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_217bc0_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_2e83ff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_469bdd_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_6da8d5_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_d8e7f3_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/images/ui-icons_f9bd01_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/redmond/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/smoothness/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_glass_55_fcf0ba_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_gloss-wave_100_ece8da_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_highlight-hard_100_f5f3e5_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_highlight-hard_100_fafaf4_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_highlight-hard_15_459e00_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_highlight-hard_95_cccccc_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_highlight-soft_25_67b021_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_highlight-soft_95_ffedad_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-bg_inset-soft_15_2b2922_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-icons_808080_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-icons_847e71_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-icons_8DC262_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-icons_eeeeee_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/south-street/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_flat_55_999999_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_flat_75_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_glass_45_0078ae_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_glass_55_f8da4e_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_glass_75_79c9ec_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_gloss-wave_45_e14f1c_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_gloss-wave_50_6eac2c_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_gloss-wave_75_2191c0_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-bg_inset-hard_100_fcfdfd_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_0078ae_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_056b93_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_d8e7f3_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_e0fdff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_f5e175_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_f7a50d_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/images/ui-icons_fcd113_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/start/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_diagonals-medium_20_d34d17_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_flat_30_cccccc_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_flat_50_5c5c5c_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_gloss-wave_45_817865_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_gloss-wave_60_fece2f_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_gloss-wave_70_ffdd57_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_gloss-wave_90_fff9e5_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_highlight-soft_100_feeebd_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-bg_inset-soft_30_ffffff_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_3d3d3d_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_bd7b00_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_d19405_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_eb990f_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_ed9f26_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_fadc7a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/images/ui-icons_ffe180_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/sunny/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_diamond_10_4f4221_10x8.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_diamond_20_372806_10x8.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_diamond_25_675423_10x8.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_diamond_25_d5ac5d_10x8.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_diamond_8_261803_10x8.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_diamond_8_443113_10x8.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_flat_75_ddd4b0_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-bg_highlight-hard_65_fee4bd_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_070603_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_e8e2b5_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_e9cd86_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_efec9f_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_f2ec64_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_f9f2bd_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/images/ui-icons_ff7519_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/swanky-purse/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_diagonals-small_50_262626_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_flat_0_303030_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_flat_0_4c4c4c_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_glass_40_0a0a0a_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_glass_55_f1fbe5_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_glass_60_000000_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_gloss-wave_55_000000_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_gloss-wave_85_9fda58_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-bg_gloss-wave_95_f6ecd5_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-icons_000000_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-icons_1f1f1f_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-icons_9fda58_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-icons_b8ec79_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/trontastic/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_flat_30_cccccc_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_flat_50_5c5c5c_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_glass_20_555555_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_glass_40_ffc73d_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_gloss-wave_25_333333_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_highlight-soft_80_eeeeee_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_inset-soft_25_000000_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-bg_inset-soft_30_f58400_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-icons_4b8e0b_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-icons_a83300_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-icons_cccccc_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-darkness/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-icons_228ef1_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-icons_ef8c08_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-icons_ffd27a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/ui-lightness/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_glass_95_fef1ec_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_gloss-wave_16_121212_500x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_highlight-hard_15_888888_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_highlight-hard_55_555555_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_highlight-soft_35_adadad_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_highlight-soft_60_dddddd_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-bg_inset-soft_15_121212_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_666666_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_aaaaaa_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_bbbbbb_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_c98000_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_cccccc_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/images/ui-icons_f29a00_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/css/vader/jquery.ui.theme.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-af.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ar-DZ.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ar.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-az.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-be.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-bg.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-bs.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ca.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-cs.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-cy-GB.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-da.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-de.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-el.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-en-AU.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-en-GB.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-en-NZ.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-eo.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-es.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-et.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-eu.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-fa.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-fi.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-fo.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-fr-CA.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-fr-CH.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-fr.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-gl.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-he.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-hi.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-hr.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-hu.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-hy.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-id.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-is.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-it.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ja.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ka.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-kk.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-km.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ko.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ky.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-lb.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-lt.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-lv.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-mk.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ml.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ms.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-nb.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-nl-BE.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-nl.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-nn.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-no.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-pl.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-pt-BR.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-pt.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-rm.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ro.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ru.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-sk.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-sl.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-sq.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-sr-SR.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-sr.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-sv.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-ta.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-th.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-tj.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-tr.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-uk.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-vi.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-zh-CN.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-zh-HK.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/i18n/jquery.ui.datepicker-zh-TW.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.accordion.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.autocomplete.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.button.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.core.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.datepicker.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.dialog.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.draggable.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.droppable.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-blind.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-bounce.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-clip.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-drop.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-explode.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-fade.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-fold.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-highlight.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-pulsate.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-scale.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-shake.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-slide.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect-transfer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.effect.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.menu.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.mouse.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.position.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.progressbar.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.resizable.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.selectable.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.slider.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.sortable.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.spinner.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.tabs.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.tooltip.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jquery-ui/src/main/resources/nuiton-js-jquery-ui/js/jquery.ui.widget.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jquery-ui/src/site/rst/index.rst.vm =================================================================== --- sandbox/nuiton-js-jquery-ui/src/site/rst/index.rst.vm 2013-07-19 21:30:55 UTC (rev 159) +++ sandbox/nuiton-js-jquery-ui/src/site/rst/index.rst.vm 2013-07-19 21:31:58 UTC (rev 160) @@ -1,8 +1,8 @@ .. - .. * #%L .. * Nuiton JS :: JQuery UI -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2012 - 2013 CodeLutin .. * %% @@ -33,7 +33,7 @@ .. _documentation: http://canjs.com/guides/index.html Use -=== +--- Maven part:: Property changes on: sandbox/nuiton-js-jquery-ui/src/site/rst/index.rst.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jquery-ui/src/site/site_en.xml =================================================================== --- sandbox/nuiton-js-jquery-ui/src/site/site_en.xml 2013-07-19 21:30:55 UTC (rev 159) +++ sandbox/nuiton-js-jquery-ui/src/site/site_en.xml 2013-07-19 21:31:58 UTC (rev 160) @@ -1,8 +1,8 @@ <!-- #%L Nuiton JS :: JQuery UI - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin %% @@ -45,8 +45,8 @@ <menu ref="parent"/> - <menu name="Utilisateurs"> - <item name="Accueil" href="index.html"/> + <menu name="Users"> + <item name="Home" href="index.html"/> </menu> <menu ref="reports"/> Property changes on: sandbox/nuiton-js-jquery-ui/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0