Skip to content

Commit

Permalink
Merge pull request #2 from JarvusInnovations/master
Browse files Browse the repository at this point in the history
Add Ext JS 6.2.0.981
  • Loading branch information
bjornharrtell authored Dec 5, 2016
2 parents bb1821f + 117aa3f commit f0bce4c
Show file tree
Hide file tree
Showing 15,885 changed files with 1,368,572 additions and 1,151,378 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
464 changes: 260 additions & 204 deletions .sencha/package/Boot.js

Large diffs are not rendered by default.

51 changes: 33 additions & 18 deletions .sencha/package/Microloader.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ var Ext = Ext || window['Ext'] || {};

//<editor-fold desc="Microloader">
/**
* @Class Ext.Microloader
* @class Ext.Microloader
* @private
* @singleton
*/
Ext.Microloader = Ext.Microloader || (function () {
Expand All @@ -24,6 +25,7 @@ Ext.Microloader = Ext.Microloader || (function () {
_privatePrefix = '_ext:' + location.pathname,

/**
* @method getStorageKey
* The Following combination is used to create isolated local storage keys
* '_ext' is used to scope all the local storage keys that we internally by Ext
* 'location.pathname' is used to force each assets to cache by an absolute URL (/build/MyApp) (dev vs prod)
Expand Down Expand Up @@ -72,7 +74,7 @@ Ext.Microloader = Ext.Microloader || (function () {
}
},
/**
* private
* @private
*/
retrieveAsset: function (key) {
try {
Expand Down Expand Up @@ -271,7 +273,7 @@ Ext.Microloader = Ext.Microloader || (function () {

/**
* Microloader
* @type {Array}
* @type {Array}
* @private
*/
var _listeners = [],
Expand Down Expand Up @@ -340,21 +342,19 @@ Ext.Microloader = Ext.Microloader || (function () {

// Manifest is not in local storage. Fetch it from the server
} else {
Boot.fetch(Microloader.applyCacheBuster(url), function (result) {
//<debug>
_debug("Manifest file was not found in Local Storage, loading: " + url);
//</debug>
manifest = new Manifest({
url: url,
content: result.content
});
//<debug>
_debug("Manifest file was not found in Local Storage, loading: " + url);
//</debug>

manifest.cache();
if (postProcessor) {
postProcessor(manifest);
}
Microloader.load(manifest);
});
if (location.href.indexOf('file:/') === 0) {
Manifest.url = Microloader.applyCacheBuster(url + 'p');
Boot.load(Manifest.url);
}
else {
Boot.fetch(Microloader.applyCacheBuster(url), function(result) {
Microloader.setManifest(result.content);
});
}
}

// Embedded Manifest into JS file
Expand All @@ -371,6 +371,21 @@ Ext.Microloader = Ext.Microloader || (function () {

/**
*
* @param cfg
*/
setManifest: function(cfg) {
var manifest = new Manifest({
url: Manifest.url,
content: cfg
});
manifest.cache();
if (postProcessor) {
postProcessor(manifest);
}
Microloader.load(manifest);
},

/**
* @param {Manifest} manifest
*/
load: function (manifest) {
Expand Down Expand Up @@ -903,7 +918,7 @@ Ext.Microloader = Ext.Microloader || (function () {
// as we are still very early in the lifecycle
Ext.defer(function() {
Ext.GlobalEvents.fireEvent('appupdate', Microloader.appUpdate);
}, 100);
}, 1000);
}
},

Expand Down
31 changes: 29 additions & 2 deletions .sencha/package/build-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ this file in most cases.
-before-init-defaults,
-init-defaults,
-after-init-defaults,
-init-compiler,
-init-web-server"/>
-init-compiler"/>

<!--
===============================================================
Expand Down Expand Up @@ -310,6 +309,34 @@ this file in most cases.
</x-ant-call>
</target>

<!--
===============================================================
Build Dependencies
uses the compiler to build metadata files for all detected
file-to-file dependencies
===============================================================
-->
<target name="build-dependencies" depends="init,-init-compile-js">
<x-compile refid="${compiler.ref.id}">
<![CDATA[
include
-all
and
meta
-infoType=Dependencies
-basePath=${build.dir}
-tpl={0}
-out=${build.dir}/dependencies.json
and
meta
-infoType=AppManifest
-basePath=${build.dir}
-tpl={0}
-out=${build.dir}/bootsequence.json
]]>
</x-compile>
</target>

<!--
===============================================================
Help - properties
Expand Down
16 changes: 8 additions & 8 deletions .sencha/package/codegen.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"pkgName": "ext",
"pkgType": "framework",
"senchadir": ".sencha",
"touchRelPath": "../touch"
"touchRelPath": "../${touch.dir}"
}
},
".sencha/package/build.properties": {
Expand All @@ -51,7 +51,7 @@
"pkgName": "ext",
"pkgType": "framework",
"senchadir": ".sencha",
"touchRelPath": "../touch"
"touchRelPath": "../${touch.dir}"
}
},
"package.json": {
Expand All @@ -73,7 +73,7 @@
"pkgName": "ext",
"pkgType": "framework",
"senchadir": ".sencha",
"touchRelPath": "../touch"
"touchRelPath": "../${touch.dir}"
}
},
"sass/example/custom.js": {
Expand All @@ -84,7 +84,7 @@
"pkgName": "ext",
"pkgType": "framework",
"senchadir": ".sencha",
"touchRelPath": "../touch"
"touchRelPath": "../${touch.dir}"
}
},
"sass/etc/all.scss": {
Expand All @@ -95,7 +95,7 @@
"pkgName": "ext",
"pkgType": "framework",
"senchadir": ".sencha",
"touchRelPath": "../touch"
"touchRelPath": "../${touch.dir}"
}
},
"sass/config.rb": {
Expand All @@ -106,7 +106,7 @@
"pkgName": "ext",
"pkgType": "framework",
"senchadir": ".sencha",
"touchRelPath": "../touch"
"touchRelPath": "../${touch.dir}"
}
},
".sencha/package/sencha.cfg": {
Expand All @@ -117,7 +117,7 @@
"pkgName": "ext",
"pkgType": "framework",
"senchadir": ".sencha",
"touchRelPath": "../touch"
"touchRelPath": "../${touch.dir}"
}
},
"sass/example/sass-page.html": {
Expand All @@ -139,7 +139,7 @@
"pkgName": "ext",
"pkgType": "framework",
"senchadir": ".sencha",
"touchRelPath": "../touch"
"touchRelPath": "../${touch.dir}"
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion .sencha/package/init-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
<equals arg1="theme" arg2="${package.type}"/>
</not>
<equals arg1="touch" arg2="${framework.name}"/>
<equals arg1="modern" arg2="${package.toolkit}"/>
</or>
<then>
<property name="skip.slice" value="1"/>
Expand Down Expand Up @@ -284,7 +285,7 @@
</x-compile>
</target>

<target name="-init-web-server">
<target name="-init-web-server" unless="skip.web.start">
<x-server port="${build.web.port}"
portPropertyName="build.web.port"
defaultSassFile="${package.example.scss}"
Expand Down
12 changes: 7 additions & 5 deletions .sencha/package/sass-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,13 @@

<x-echo>Building @{cssfile} to ${css.output.name}</x-echo>

<x-sass-build input="@{cssfile}"
output="${css.output.name}"
refId="package.web.server"
split="${build.css.selector.limit}"
compress="@{compress}"/>
<x-sencha-command>
fashion
-compress=@{compress}
-split=${build.css.selector.limit}
@{cssfile}
${css.output.name}
</x-sencha-command>

</sequential>
</for>
Expand Down
2 changes: 1 addition & 1 deletion .sencha/package/sencha.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ package.subpkgs.dir=${package.dir}
# Custom Properties - Place customizations below this line to avoid merge
# conflicts with newer versions

package.cmd.version=6.0.1.67
package.cmd.version=6.2.0.103

skip.examples=1
63 changes: 11 additions & 52 deletions .sencha/package/slice-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,6 @@
<target name="-load-sass-page"
depends="-generate-slicer-bootstrap,
-generate-slicer-manifest">
<x-run-if-true value="${package.sass.fashion}">
<if>
<x-is-false value="${package.sass.rhino}"/>
<then>
<x-get-relative-path from="${build.web.root}"
to="${package.example.fashion.html}"
property="package.example.fashion.html.relative"/>
<property name="example.page.url"
value="http://localhost:${build.web.port}/${package.example.fashion.html.relative}"/>
<x-sass-page page="${package.example.fashion.html}"
url="${example.page.url}"
refId="package.web.server"/>
</then>
</if>
</x-run-if-true>
</target>

<!--
Expand Down Expand Up @@ -105,27 +90,25 @@
tofile="${package.example.build.dir}"/>
</then>
<else>
<x-sass-build input="${package.example.build.dir}"
output="${package.example.build.dir}"
refId="package.web.server"/>
<x-sencha-command>
fashion
-compress=false
${package.example.build.dir}
${package.example.build.dir}
</x-sencha-command>
</else>
</if>
</then>
</if>
</target>

<target name="-generate-slicer-manifest" depends="-compass-compile-slicer-css" if="framework.isV5">
<condition property="remove.slicer.css.bootstrap.entries" value="true">
<and>
<x-is-true value="${package.sass.fashion}"/>
<x-is-false value="${package.sass.rhino}"/>
</and>
</condition>
<property name="remove.slicer.css.bootstrap.entries" value="false"/>

<x-compile refid="${compiler.ref.id}">
<![CDATA[
slicer-manifest
-jsonp=Ext.Microloader.setManifest
-removeBootstrapCssEntries=${remove.slicer.css.bootstrap.entries}
-cssFile=${package.example.css}
-basePath=${bootstrap.base.path}
Expand Down Expand Up @@ -193,39 +176,16 @@ Ext.Boot.loadSync([

<target name="-capture-theme-image"
depends="-generate-slicer-bootstrap,-generate-slicer-manifest,-update-slicer-css">
<if>
<or>
<x-is-false value="${package.sass.fashion}"/>
<x-is-true value="${package.sass.rhino}"/>
</or>
<then>
<echo>Capture theme image to ${build.dir}/theme-capture.png</echo>
<x-sencha-command dir="${package.dir}">
<![CDATA[
<echo>Capture theme image to ${build.dir}/theme-capture.png</echo>
<x-sencha-command dir="${package.dir}">
<![CDATA[
theme
capture
-page=${package.example.theme.html}
-image=${build.capture.png}
-manifest=${build.capture.json}
]]>
</x-sencha-command>
</then>
</if>
</target>

<target name="-capture-sass-page-image">
<if>
<and>
<x-is-true value="${package.sass.fashion}"/>
<x-is-false value="${package.sass.rhino}"/>
</and>
<then>
<echo>Capture theme image to ${build.capture.png}</echo>
<x-capture-slicer-data manifestPath="${build.capture.json}"
imagePath="${build.capture.png}"
refId="package.web.server"/>
</then>
</if>
</x-sencha-command>
</target>

<target name="-slice-theme-images" depends="-capture-theme-image">
Expand All @@ -246,7 +206,6 @@ Ext.Boot.loadSync([
depends="-load-sass-page,
-update-slicer-css,
-fashion-compile-slicer-css,
-capture-sass-page-image,
-slice-theme-images"/>

<target name="-fashion-slice-images" depends="-slice-sass-page"></target>
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Ext JS 6.0.1.250 - JavaScript Library
Copyright (c) 2006-2015, Sencha Inc.
Ext JS 6.2.0.981 - JavaScript Library
Copyright (c) 2006-2016, Sencha Inc.
All rights reserved.
[email protected]

Expand Down
12 changes: 12 additions & 0 deletions build/classic/locale/locale-de-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,18 @@ Ext.define("Ext.locale.de.window.MessageBox", {
}
});

Ext.define("Ext.locale.de.view.MultiSelectorSearch", {
override: "Ext.view.MultiSelectorSearch" ,
searchText: "Suche..."
});

Ext.define("Ext.locale.de.view.MultiSelector", {
override: "Ext.view.MultiSelector",
emptyText: "Nichts ausgewählt",
removeRowTip: "Dieses Element entfernen",
addToolText: "Suche Elemente zum Hinzufügen"
});

// This is needed until we can refactor all of the locales into individual files
Ext.define("Ext.locale.de.Component", {
override: "Ext.Component"
Expand Down
Loading

0 comments on commit f0bce4c

Please sign in to comment.