[Commits] r2441 - in core/branches/1.0: docsrc docsrc/lib geoext/build geoext/examples geoext/lib/GeoExt/data geoext/lib/GeoExt/plugins geoext/lib/GeoExt/widgets geoext/lib/GeoExt/widgets/tree
commits at geoext.org
commits at geoext.org
Sat Oct 9 20:58:39 CEST 2010
Author: ahocevar
Date: 2010-10-09 20:58:39 +0200 (Sat, 09 Oct 2010)
New Revision: 2441
Modified:
core/branches/1.0/docsrc/conf.py
core/branches/1.0/docsrc/downloads.rst
core/branches/1.0/docsrc/lib/template.jst
core/branches/1.0/geoext/build/Makefile
core/branches/1.0/geoext/examples/print-preview-osm.js
core/branches/1.0/geoext/lib/GeoExt/data/PrintPage.js
core/branches/1.0/geoext/lib/GeoExt/data/PrintProvider.js
core/branches/1.0/geoext/lib/GeoExt/plugins/PrintExtent.js
core/branches/1.0/geoext/lib/GeoExt/widgets/WMSLegend.js
core/branches/1.0/geoext/lib/GeoExt/widgets/tree/LayerLoader.js
core/branches/1.0/geoext/lib/GeoExt/widgets/tree/LayerParamLoader.js
Log:
Pulled up r2419, r2420, r2421, r2422, r2427, r2428, r2429 and r2438 from trunk.
Modified: core/branches/1.0/docsrc/conf.py
===================================================================
--- core/branches/1.0/docsrc/conf.py 2010-10-09 17:05:54 UTC (rev 2440)
+++ core/branches/1.0/docsrc/conf.py 2010-10-09 18:58:39 UTC (rev 2441)
@@ -47,7 +47,7 @@
# The short X.Y version.
version = '1.0'
# The full version, including alpha/beta/rc tags.
-release = '1.0'
+release = '1.0-rc1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Modified: core/branches/1.0/docsrc/downloads.rst
===================================================================
--- core/branches/1.0/docsrc/downloads.rst 2010-10-09 17:05:54 UTC (rev 2440)
+++ core/branches/1.0/docsrc/downloads.rst 2010-10-09 18:58:39 UTC (rev 2441)
@@ -5,11 +5,12 @@
Current Release
---------------
- * GeoExt 0.7 (`Source <http://trac.geoext.org/attachment/wiki/Download/GeoExt-release-0.7.zip?format=raw>`__ | `Release Notes <http://trac.geoext.org/wiki/Release/0.7/Notes>`__)
+ * GeoExt 1.0-rc1 (`Source <http://trac.geoext.org/attachment/wiki/Download/GeoExt-release-1.0-rc1.zip?format=raw>`__ | `Release Notes <http://trac.geoext.org/wiki/Release/1.0/Notes>`__)
* :doc:`Build your own download <./builder/v0.7>` (with just the components you need).
Previous Releases
-----------------
+ * GeoExt 0.7 (:doc:`Custom Build <./builder/v0.7>` | `Source <http://trac.geoext.org/attachment/wiki/Download/GeoExt-release-0.7.zip?format=raw>`__ | `Release Notes <http://trac.geoext.org/wiki/Release/0.7/Notes>`__)
* GeoExt 0.6 (:doc:`Custom Build <./builder/v0.6>` | `Source <http://trac.geoext.org/attachment/wiki/Download/GeoExt-release-0.6.zip?format=raw>`__ | `Release Notes <http://trac.geoext.org/wiki/Release/0.6/Notes>`__)
* GeoExt 0.5 (`Source <http://trac.geoext.org/attachment/wiki/Download/GeoExt-release-0.5.zip?format=raw>`__ | `Release Notes <http://trac.geoext.org/wiki/Release/0.5/Notes>`__)
Modified: core/branches/1.0/docsrc/lib/template.jst
===================================================================
--- core/branches/1.0/docsrc/lib/template.jst 2010-10-09 17:05:54 UTC (rev 2440)
+++ core/branches/1.0/docsrc/lib/template.jst 2010-10-09 18:58:39 UTC (rev 2441)
@@ -6,6 +6,7 @@
* Header (full class name)
* Base Link and Ineritance (optional link to ext super and parent classes)
* Xtype (optional)
+ * Ptype (optional)
* Constructor (class def)
* Examples (optional)
* Config Options (optional)
@@ -20,7 +21,7 @@
:class:`{{ module }}.{{ class }}`
================================================================================
-{% if base_link is defined or xtype is defined or _parents is defined%}
+{% if base_link is defined or xtype is defined or ptype is defined or _parents is defined %}
.. cssclass:: meta
{% if base_link is defined or _parents is defined %}
@@ -33,7 +34,11 @@
xtype
``{{ xtype }}``
{% endif %}
+{% if ptype is defined %}
+ptype
+ ``{{ ptype }}``
{% endif %}
+{% endif %}
{{ constructor }}
Modified: core/branches/1.0/geoext/build/Makefile
===================================================================
--- core/branches/1.0/geoext/build/Makefile 2010-10-09 17:05:54 UTC (rev 2440)
+++ core/branches/1.0/geoext/build/Makefile 2010-10-09 18:58:39 UTC (rev 2441)
@@ -38,11 +38,16 @@
examples:
mkdir -p $(LIB_NAME)/examples
rsync -au --exclude=.svn `pwd`/../examples `pwd`/$(LIB_NAME)
- for file in `find $(LIB_NAME)/examples/ -name "*.html"`; do \
- sed -i "s/\.\.\/lib\/GeoExt\.js/\.\.\/script\/GeoExt\.js/g" $${file} ; \
- sed -i "s/geoext-all-debug\.css/geoext-all\.css/g" $${file} ; \
- done ;
+ for file in `find $(LIB_NAME)/examples -name "*.html"`; do \
+ sed -i.bak "s/\.\.\/lib\/GeoExt\.js/\.\.\/script\/GeoExt\.js/g" $${file} ; \
+ sed -i.bak "s/geoext-all-debug\.css/geoext-all\.css/g" $${file} ; \
+ rm $${file}.bak ; \
+ done ;
+docs:
+ mkdir -p $(LIB_NAME)/docs
+ cp -Rf ../../../www/* $(LIB_NAME)/docs
+
lib:
@echo "Building the library."
mkdir -p $(LIB_NAME)/script $(LIB_NAME)/resources/css
@@ -69,3 +74,5 @@
zip $(ZIP_NAME) -r $(LIB_NAME)
dist: examples zip
+
+release: examples docs zip
Modified: core/branches/1.0/geoext/examples/print-preview-osm.js
===================================================================
--- core/branches/1.0/geoext/examples/print-preview-osm.js 2010-10-09 17:05:54 UTC (rev 2440)
+++ core/branches/1.0/geoext/examples/print-preview-osm.js 2010-10-09 18:58:39 UTC (rev 2441)
@@ -6,7 +6,7 @@
* of the license.
*/
-/** api: example[print-preview]
+/** api: example[print-preview-osm]
* Printing OpenStreetMap
* ----------------------------------------
* PrintMapPanel with an OSM map.
Modified: core/branches/1.0/geoext/lib/GeoExt/data/PrintPage.js
===================================================================
--- core/branches/1.0/geoext/lib/GeoExt/data/PrintPage.js 2010-10-09 17:05:54 UTC (rev 2440)
+++ core/branches/1.0/geoext/lib/GeoExt/data/PrintPage.js 2010-10-09 18:58:39 UTC (rev 2441)
@@ -79,10 +79,11 @@
}
this.addEvents(
- /** api: events[change]
+ /** api: event[change]
* Triggered when any of the page properties have changed
*
* Listener arguments:
+ *
* * printPage - :class:`GeoExt.data.PrintPage` this printPage
* * modifications - ``Object`` Object with one or more of
* ``scale``, ``center`` and ``rotation``, notifying
Modified: core/branches/1.0/geoext/lib/GeoExt/data/PrintProvider.js
===================================================================
--- core/branches/1.0/geoext/lib/GeoExt/data/PrintProvider.js 2010-10-09 17:05:54 UTC (rev 2440)
+++ core/branches/1.0/geoext/lib/GeoExt/data/PrintProvider.js 2010-10-09 18:58:39 UTC (rev 2441)
@@ -182,41 +182,45 @@
}
this.addEvents(
- /** api: events[loadcapabilities]
+ /** api: event[loadcapabilities]
* Triggered when the capabilities have finished loading. This
* event will only fire when ``capabilities`` is not configured.
*
* Listener arguments:
+ *
* * printProvider - :class:`GeoExt.data.PrintProvider` this
* PrintProvider
* * capabilities - ``Object`` the capabilities
*/
"loadcapabilities",
- /** api: events[layoutchange]
+ /** api: event[layoutchange]
* Triggered when the layout is changed.
*
* Listener arguments:
+ *
* * printProvider - :class:`GeoExt.data.PrintProvider` this
* PrintProvider
* * layout - ``Ext.data.Record`` the new layout
*/
"layoutchange",
- /** api: events[dpichange]
+ /** api: event[dpichange]
* Triggered when the dpi value is changed.
*
* Listener arguments:
+ *
* * printProvider - :class:`GeoExt.data.PrintProvider` this
* PrintProvider
* * dpi - ``Ext.data.Record`` the new dpi record
*/
"dpichange",
- /** api: events[beforeprint]
+ /** api: event[beforeprint]
* Triggered when the print method is called.
*
* Listener arguments:
+ *
* * printProvider - :class:`GeoExt.data.PrintProvider` this
* PrintProvider
* * map - ``OpenLayers.Map`` the map being printed
@@ -226,33 +230,36 @@
*/
"beforeprint",
- /** api: events[print]
+ /** api: event[print]
* Triggered when the print document is opened.
*
* Listener arguments:
+ *
* * printProvider - :class:`GeoExt.data.PrintProvider` this
* PrintProvider
* * url - ``String`` the url of the print document
*/
"print",
- /** api: events[printexception]
+ /** api: event[printexception]
* Triggered when using the ``POST`` method, when the print
* backend returns an exception.
*
* Listener arguments:
+ *
* * printProvider - :class:`GeoExt.data.PrintProvider` this
* PrintProvider
* * response - ``Object`` the response object of the XHR
*/
"printexception",
- /** api: events[beforeencodelayer]
+ /** api: event[beforeencodelayer]
* Triggered before a layer is encoded. This can be used to
* exclude layers from the printing, by having the listener
* return false.
*
* Listener arguments:
+ *
* * printProvider - :class:`GeoExt.data.PrintProvider` this
* PrintProvider
* * layer - ``OpenLayers.Layer`` the layer which is about to be
@@ -260,12 +267,13 @@
*/
"beforeencodelayer",
- /** api: events[encodelayer]
+ /** api: event[encodelayer]
* Triggered when a layer is encoded. This can be used to modify
* the encoded low-level layer object that will be sent to the
* print service.
*
* Listener arguments:
+ *
* * printProvider - :class:`GeoExt.data.PrintProvider` this
* PrintProvider
* * layer - ``OpenLayers.Layer`` the layer which is about to be
Modified: core/branches/1.0/geoext/lib/GeoExt/plugins/PrintExtent.js
===================================================================
--- core/branches/1.0/geoext/lib/GeoExt/plugins/PrintExtent.js 2010-10-09 17:05:54 UTC (rev 2440)
+++ core/branches/1.0/geoext/lib/GeoExt/plugins/PrintExtent.js 2010-10-09 18:58:39 UTC (rev 2441)
@@ -124,7 +124,7 @@
}
this.addEvents(
- /** api: events[selectpage]
+ /** api: event[selectpage]
* Triggered when a page has been selected using the control
*
* Listener arguments:
Modified: core/branches/1.0/geoext/lib/GeoExt/widgets/WMSLegend.js
===================================================================
--- core/branches/1.0/geoext/lib/GeoExt/widgets/WMSLegend.js 2010-10-09 17:05:54 UTC (rev 2440)
+++ core/branches/1.0/geoext/lib/GeoExt/widgets/WMSLegend.js 2010-10-09 18:58:39 UTC (rev 2441)
@@ -43,18 +43,18 @@
defaultStyleIsFirst: true,
/** api: config[useScaleParameter]
- * ``Boolean``
- * Should we use the optional SCALE parameter in the SLD WMS
- * GetLegendGraphic request? Defaults to true.
+ * ``Boolean``
+ * Should we use the optional SCALE parameter in the SLD WMS
+ * GetLegendGraphic request? Defaults to true.
*/
useScaleParameter: true,
/** api: config[baseParams]
* ``Object``
- * Optional parameters to add to the legend url, this can e.g. be used to
- * support vendor-specific parameters in a SLD WMS GetLegendGraphic
- * request. To override the default MIME type of image/gif use the
- * FORMAT parameter in baseParams.
+ * Optional parameters to add to the legend url, this can e.g. be used to
+ * support vendor-specific parameters in a SLD WMS GetLegendGraphic
+ * request. To override the default MIME type of image/gif use the
+ * FORMAT parameter in baseParams.
*
* .. code-block:: javascript
*
Modified: core/branches/1.0/geoext/lib/GeoExt/widgets/tree/LayerLoader.js
===================================================================
--- core/branches/1.0/geoext/lib/GeoExt/widgets/tree/LayerLoader.js 2010-10-09 17:05:54 UTC (rev 2440)
+++ core/branches/1.0/geoext/lib/GeoExt/widgets/tree/LayerLoader.js 2010-10-09 18:58:39 UTC (rev 2441)
@@ -30,21 +30,23 @@
Ext.apply(this, config);
this.addEvents(
- /** api: events[beforeload]
+ /** api: event[beforeload]
* Triggered before loading children. Return false to avoid
* loading children.
*
* Listener arguments:
+ *
* * loader - :class:`GeoExt.tree.LayerLoader` this loader
* * node - ``Ex.tree.TreeNode`` the node that this loader is
* configured with
*/
"beforeload",
- /** api: events[load]
+ /** api: event[load]
* Triggered after children wer loaded.
*
* Listener arguments:
+ *
* * loader - :class:`GeoExt.tree.LayerLoader` this loader
* * node - ``Ex.tree.TreeNode`` the node that this loader is
* configured with
Modified: core/branches/1.0/geoext/lib/GeoExt/widgets/tree/LayerParamLoader.js
===================================================================
--- core/branches/1.0/geoext/lib/GeoExt/widgets/tree/LayerParamLoader.js 2010-10-09 17:05:54 UTC (rev 2440)
+++ core/branches/1.0/geoext/lib/GeoExt/widgets/tree/LayerParamLoader.js 2010-10-09 18:58:39 UTC (rev 2441)
@@ -24,21 +24,23 @@
Ext.apply(this, config);
this.addEvents(
- /** api: events[beforeload]
+ /** api: event[beforeload]
* Triggered before loading children. Return false to avoid
* loading children.
*
* Listener arguments:
+ *
* * loader - :class:`GeoExt.tree.LayerLoader` this loader
* * node - ``Ex.tree.TreeNode`` the node that this loader is
* configured with
*/
"beforeload",
- /** api: events[load]
+ /** api: event[load]
* Triggered after children were loaded.
*
* Listener arguments:
+ *
* * loader - :class:`GeoExt.tree.LayerLoader` this loader
* * node - ``Ex.tree.TreeNode`` the node that this loader is
* configured with
More information about the Commits
mailing list