Skip to content

Commit

Permalink
Added Touch lib.
Browse files Browse the repository at this point in the history
Fixed issues with event adding.
Updated sample app.
  • Loading branch information
Stuart98 committed Jan 24, 2014
1 parent 7d0a799 commit db081cd
Show file tree
Hide file tree
Showing 2,436 changed files with 477,818 additions and 8 deletions.
5 changes: 0 additions & 5 deletions packages/Ext.ux.StoreMap/examples/ExtSample/app/view/Map.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ Ext.define('ExtSample.view.Map', {
store: 'Markers',
groupMarkers: false,
linkMarkers: true
},

initialize: function(){
this.callParent(arguments);

}

});
18 changes: 18 additions & 0 deletions packages/Ext.ux.StoreMap/examples/ExtSample/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ Ext.Loader.addClassPathMappings({
"Ext": "../../../../ext/src",
"Ext.Msg": "../../../../ext/src/window/MessageBox.js",
"Ext.rtl.EventObjectImpl": "../../../../ext/src/rtl/EventObject.js",
"Ext.ux.ExtStoreMap": "../../src/Ext.ux.ExtStoreMap.js",
"Ext.ux.GMapPanel": "../../src/Ext.ux.GMapPanel.js",
"Ext.ux.StoreMap": "../../src/Ext.ux.StoreMap.js",
"Ext.ux.StoreMapBase": "../../src/Ext.ux.StoreMapBase.js",
"ExtSample": "app"
});
Ext.ClassManager.addNameAlternateMappings({
Expand Down Expand Up @@ -757,6 +759,7 @@ Ext.ClassManager.addNameAlternateMappings({
"Ext.ux.DataView.DragSelector": [],
"Ext.ux.DataView.Draggable": [],
"Ext.ux.DataView.LabelEditor": [],
"Ext.ux.ExtStoreMap": [],
"Ext.ux.FieldReplicator": [],
"Ext.ux.GMapPanel": [],
"Ext.ux.GroupTabPanel": [],
Expand All @@ -769,6 +772,7 @@ Ext.ClassManager.addNameAlternateMappings({
"Ext.ux.SlidingPager": [],
"Ext.ux.Spotlight": [],
"Ext.ux.StoreMap": [],
"Ext.ux.StoreMapBase": [],
"Ext.ux.TabCloseMenu": [],
"Ext.ux.TabReorderer": [],
"Ext.ux.TabScrollerMenu": [],
Expand Down Expand Up @@ -832,7 +836,10 @@ Ext.ClassManager.addNameAlternateMappings({
],
"ExtSample.Application": [],
"ExtSample.controller.Main": [],
"ExtSample.model.Marker": [],
"ExtSample.store.Markers": [],
"ExtSample.view.Main": [],
"ExtSample.view.Map": [],
"ExtSample.view.Viewport": []
});
Ext.ClassManager.addNameAliasMappings({
Expand Down Expand Up @@ -1698,6 +1705,9 @@ Ext.ClassManager.addNameAliasMappings({
"Ext.ux.DataView.DragSelector": [],
"Ext.ux.DataView.Draggable": [],
"Ext.ux.DataView.LabelEditor": [],
"Ext.ux.ExtStoreMap": [
"widget.ExtMap"
],
"Ext.ux.FieldReplicator": [],
"Ext.ux.GMapPanel": [
"widget.gmappanel"
Expand All @@ -1722,6 +1732,9 @@ Ext.ClassManager.addNameAliasMappings({
"Ext.ux.StoreMap": [
"widget.storemap"
],
"Ext.ux.StoreMapBase": [
"widget.StoreMapBase"
],
"Ext.ux.TabCloseMenu": [
"plugin.tabclosemenu"
],
Expand Down Expand Up @@ -1825,9 +1838,14 @@ Ext.ClassManager.addNameAliasMappings({
],
"ExtSample.Application": [],
"ExtSample.controller.Main": [],
"ExtSample.model.Marker": [],
"ExtSample.store.Markers": [],
"ExtSample.view.Main": [
"widget.app-main"
],
"ExtSample.view.Map": [
"widget.Map"
],
"ExtSample.view.Viewport": []
});
Ext.setVersion("Ext.ux.StoreMap", "1.0.0");
Expand Down
4 changes: 1 addition & 3 deletions packages/Ext.ux.StoreMap/src/Ext.ux.StoreMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Ext.define('Ext.ux.StoreMap', {
scope: this
});

this.callParent(arguments);
this.callParent(arguments);

if (me.getStore()) {
if (me.getMap()) {
Expand Down Expand Up @@ -330,14 +330,12 @@ Ext.define('Ext.ux.StoreMap', {
* @param {Object} oldLocation
*/
updateCurrentLocation: function(location, oldLocation){

if (!this.getMap()) {
//this.un('mapready', 'doUpdateCurrentLocation', this);
this.on('mapready', 'doUpdateCurrentLocation', this, { delay: 150, single: true, args: [location] });
} else {
this.doUpdateCurrentLocation(location);
}

},

/**
Expand Down
164 changes: 164 additions & 0 deletions touch/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
<project name="extjs" default="build" basedir=".">

<target name="init-antcontrib">
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath>
<pathelement location="${cmd.dir}/lib/ant-contrib-1.0b3.jar"/>
<pathelement
location="${cmd..dir}/lib/commons-httpclient-3.0.1.jar"/>
<pathelement
location="${cmd.dir}/lib/commons-logging-1.0.4.jar"/>
<pathelement location="${cmd.dir}/lib/commons-codec-1.3.jar"/>
</classpath>
</taskdef>
</target>


<target name="init-sencha-cmd" depends="init-antcontrib">
<taskdef resource="com/sencha/ant/antlib.xml" classpath="${cmd.dir}/sencha.jar"/>
</target>

<target name="build" depends="init-sencha-cmd">
<property name="build.dir" location="${basedir}"/>
<property name="classpath.excludes"
value="auth2/Auth.js,scroller/Infinite.js,locale,platform/src"/>
<!--
Produce base concatenation for standard distribution files
-->
<x-sencha-command>
<![CDATA[
compile
--ignore=${classpath.excludes}
--include-preprocessor-tags=true
--options=debug:true,product:touch,minVersion:3,logger:yes,charts:yes
exclude
-namespace=Ext.device
and
exclude
-file=src/ux
and
concatenate
--output-file=${build.dir}/sencha-touch-all-debug.js
and
union
--tag=core
and
concatenate
--output-file=${build.dir}/sencha-touch-debug.js
and
include
+all
and
exclude
--tag=core
and
metadata
+append
+alternates
--base-path=${build.dir}
--output-file=${build.dir}/sencha-touch-debug.js
and
metadata
+append
+alias
--base-path=${build.dir}
--output-file=${build.dir}/sencha-touch-debug.js
and
--options=debug:false,logger:no
union
+all
and
exclude
-namespace=Ext.device
and
exclude
-file=src/ux
and
concatenate
+yui
--output-file=${build.dir}/sencha-touch-all.js
and
--options=debug:true,minVersion:2,logger:yes
concatenate
--output-file=${build.dir}/builds/sencha-touch-all-compat.js
]]>
</x-sencha-command>

<loadfile property="header.text" srcfile="${build.dir}/file-header.txt"/>
<property name="header.comment" value="${header.text}"/>

<!--
Apply yui compressor
-->
<x-compress-js
srcfile="${build.dir}/sencha-touch-debug.js"
outfile="${build.dir}/sencha-touch.js"/>

<!--
Add license headers
-->

<for param="file">
<path>
<fileset dir="${build.dir}" includes="*.js"/>
<fileset dir="${build.dir}/builds" includes="*.js"/>
</path>
<sequential>
<move file="@{file}" tofile="@{file}.tmp"/>
<concat destfile="@{file}">
<header>${header.comment}</header>
<fileset file="@{file}.tmp"/>
</concat>
<delete file="@{file}.tmp"/>
</sequential>
</for>
</target>

<target name="build-examples" depends="init-sencha-cmd">
<local name="example.workspace.build.dir"/>
<property name="example.workspace.build.dir"
value="${basedir}/built-examples"/>
<delete dir="${example.workspace.build.dir}"/>
<for param="example">
<dirset dir="${basedir}/examples" includes="*"/>
<sequential>
<local name="example.name"/>
<local name="example.build.dir"/>
<basename file="@{example}" property="example.name"/>
<property name="example.build.dir"
value="${example.workspace.build.dir}/${example.name}"/>
<if>
<and>
<available file="@{example}/.sencha/app/sencha.cfg"/>
<available file="@{example}/build.xml"/>
</and>
<then>
<x-sencha-command dir="@{example}" inheritall="false">
<property name="app.build.dir" value="${example.build.dir}"/>
<property name="build.dir" value="${example.build.dir}/production"/>
<property name="skip.sass" value="1"/>
app
build
</x-sencha-command>
<delete dir="@{example}/archive"/>
<move todir="${example.build.dir}">
<fileset dir="${example.build.dir}/production" includes="**/*"/>
</move>
<delete dir="${example.build.dir}/production"/>
</then>
<else>
<copy todir="${example.build.dir}">
<fileset dir="@{example}" includes="**/*"/>
</copy>
</else>
</if>
</sequential>
</for>
<copy todir="${example.workspace.build.dir}">
<fileset dir="${basedir}/examples" includes="*"/>
</copy>
</target>



</project>
13 changes: 13 additions & 0 deletions touch/cmd/sencha.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This is the SDK version. By defining this property, we are declaring this
# folder to be an SDK distribution.
framework.name=touch
framework.version=2.3.0
framework.classpath=${framework.dir}/src

#------------------------------------------------------

# This is the minimum required Sencha Cmd version:
framework.cmd.minver=3.1.0.53

# This is the current version of the Sencha Cmd at the time of this SDK release:
framework.cmd.version=4.0.1.45
20 changes: 20 additions & 0 deletions touch/file-header.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
This file is part of Sencha Touch 2.3

Copyright (c) 2011-2013 Sencha Inc

Contact: http://www.sencha.com/contact

GNU General Public License Usage
This file may be used under the terms of the GNU General Public License version 3.0 as
published by the Free Software Foundation and appearing in the file LICENSE included in the
packaging of this file.

Please review the following information to ensure the GNU General Public License version 3.0
requirements will be met: http://www.gnu.org/copyleft/gpl.html.

If you are unsure which license is appropriate for your use, please contact the sales department
at http://www.sencha.com/contact.

Build date: 2013-11-08 13:58:42 (d989f4377b0a56f9f540fd415741d1f2db1c7977)
*/
68 changes: 68 additions & 0 deletions touch/license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
Sencha Touch & Sencha Touch Charts - JavaScript Libraries
Copyright (c) 2010-2013, Sencha, Inc.
All rights reserved.
[email protected]

http://www.sencha.com/products/touch/license.php


Open Source License
------------------------------------------------------------------------------------------
This version of Sencha Touch and Sencha Touch Charts is licensed under the terms of the Open
Source GPL 3.0 license.

http://www.gnu.org/licenses/gpl.html

There are several FLOSS exceptions available for use with this release for
open source applications that are distributed under a license other than the GPL.

* Open Source License Exception for Applications

http://www.sencha.com/products/floss-exception.php

* Open Source License Exception for Development

http://www.sencha.com/products/ux-exception.php


Alternate Licensing for Sencha Touch
------------------------------------------------------------------------------------------
Commercial and OEM Licenses are available for an alternate download of Sencha Touch.
This is the appropriate option if you are creating proprietary applications and you are
not prepared to distribute and share the source code of your application under the
GPL v3 license. Please visit http://www.sencha.com/store/touch/license.php for more details.


Alternate Licensing for Sencha Touch Charts
------------------------------------------------------------------------------------------
Commercial and OEM Licenses are available for an alternate download of Sencha Touch Charts.
This is the appropriate option if you are creating proprietary applications and you are
not prepared to distribute and share the source code of your application under the
GPL v3 license.

Sencha Touch Charts is available commercially only as a part of Sencha Complete or Sencha
Complete Team. Please visit http://www.sencha.com/products/complete/license or
http://www.sencha.com/products/complete-team/license for more details.


Third Party Content
------------------------------------------------------------------------------------------
The following third party software is distributed with Sencha Touch and is
provided under other licenses and/or has source available from other locations.

Library: JSON parser
License: Public Domain
Location: http://www.JSON.org/js.html

Library: flexible-js-formatting - date parsing and formatting
License: MIT
Location: http://code.google.com/p/flexible-js-formatting/

Library: Jasmine Š unit testing
License: MIT
Location: https://github.com/pivotal/jasmine


--

THIS SOFTWARE IS DISTRIBUTED "AS-IS" WITHOUT ANY WARRANTIES, CONDITIONS AND REPRESENTATIONS WHETHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, MERCHANTABLE QUALITY, FITNESS FOR A PARTICULAR PURPOSE, DURABILITY, NON-INFRINGEMENT, PERFORMANCE AND THOSE ARISING BY STATUTE OR FROM CUSTOM OR USAGE OF TRADE OR COURSE OF DEALING.
Loading

0 comments on commit db081cd

Please sign in to comment.