version 1.2.0

.sencha/package/build.properties

@@ -7,3 +7,4 @@
 # this file.
 # =============================================================================
 
+skip.sass=1

examples/bundleApp/bootstrap.css

@@ -5,5 +5,5 @@
  * to the most recently built CSS file for the application to allow index.html
  * in the development directory to load properly (i.e., "dev mode").
  */
-@import '../../../../build/development/bundleApp/resources/bundleApp-all.css';
+@import '../../../../build/production/bundleApp/resources/bundleApp-all.css';
 

examples/demo-classic-vm/bootstrap.css

@@ -5,5 +5,5 @@
  * to the most recently built CSS file for the application to allow index.html
  * in the development directory to load properly (i.e., "dev mode").
  */
-@import '../../../../build/development/demo2/resources/demo2-all.css';
+@import '../../../../build/production/demo2/resources/demo2-all.css';
 

examples/demo1/bootstrap.css

@@ -5,5 +5,5 @@
  * to the most recently built CSS file for the application to allow index.html
  * in the development directory to load properly (i.e., "dev mode").
  */
-@import '../../../../build/development/demo1/classic/resources/demo1-all.css';
+@import '../../../../build/production/demo1/modern/resources/demo1-all.css';
 

package.json

@@ -15,7 +15,7 @@
  ],
  "summary": "Bundle implementation for ExtJS",
  "detailedDescription": "Use bundle files (.properties) or json to get internationalised messages",
- "version": "1.1.0",
+ "version": "1.2.0",
  "compatVersion": "1.0.0",
  "format": "1",
  "slicer": {

sass/example/bootstrap.js

@@ -526,9 +526,27 @@ Ext.Boot = Ext.Boot || (function (emptyFn) {
 
  init: function () {
  var scriptEls = doc.getElementsByTagName('script'),
+ script = scriptEls[0],
  len = scriptEls.length,
  re = /\/ext(\-[a-z\-]+)?\.js$/,
- entry, script, src, state, baseUrl, key, n, origin;
+ entry, src, state, baseUrl, key, n, origin;
+
+ // No check for script definedness because there always should be at least one
+ Boot.hasReadyState = ("readyState" in script);
+ Boot.hasAsync = ("async" in script);
+ Boot.hasDefer = ("defer" in script);
+ Boot.hasOnLoad = ("onload" in script);
+
+ // Feature detecting IE
+ Boot.isIE8 = Boot.hasReadyState && !Boot.hasAsync && Boot.hasDefer && !Boot.hasOnLoad;
+ Boot.isIE9 = Boot.hasReadyState && !Boot.hasAsync && Boot.hasDefer && Boot.hasOnLoad;
+ Boot.isIE10p = Boot.hasReadyState && Boot.hasAsync && Boot.hasDefer && Boot.hasOnLoad;
+
+ Boot.isIE10 = (new Function('/*@cc_on return @_jscript_version @*/')()) === 10;
+ Boot.isIE10m = Boot.isIE10 || Boot.isIE9 || Boot.isIE8;
+
+ // IE11 does not support conditional compilation so we detect it by exclusion
+ Boot.isIE11 = Boot.isIE10p && !Boot.isIE10;
 
  // Since we are loading after other scripts, and we needed to gather them
  // anyway, we track them in _scripts so we don't have to ask for them all
@@ -541,12 +559,8 @@ Ext.Boot = Ext.Boot || (function (emptyFn) {
  state = script.readyState || null;
 
  // If we find a script file called "ext-*.js", then the base path is that file's base path.
- if (!baseUrl) {
- if (re.test(src)) {
- Boot.hasReadyState = ("readyState" in script);
- Boot.hasAsync = ("async" in script) || !Boot.hasReadyState;
- baseUrl = src;
- }
+ if (!baseUrl && re.test(src)) {
+ baseUrl = src;
  }
 
  if (!Boot.scripts[key = Boot.canonicalUrl(src)]) {
@@ -564,8 +578,6 @@ Ext.Boot = Ext.Boot || (function (emptyFn) {
  if (!baseUrl) {
  script = scriptEls[scriptEls.length - 1];
  baseUrl = script.src;
- Boot.hasReadyState = ('readyState' in script);
- Boot.hasAsync = ("async" in script) || !Boot.hasReadyState;
  }
 
  Boot.baseUrl = baseUrl.substring(0, baseUrl.lastIndexOf('/') + 1);
@@ -1341,27 +1353,36 @@ Ext.Boot = Ext.Boot || (function (emptyFn) {
 
  createLoadElement: function(callback) {
  var me = this,
- el = me.getElement(),
- readyStateChange = function(){
+ el = me.getElement();
+
+ me.preserve = true;
+
+ el.onerror = function() {
+ me.error = true;
+
+ if (callback) {
+ callback();
+ callback = null;
+ }
+ };
+
+ if (Boot.isIE10m) {
+ el.onreadystatechange = function() {
  if (this.readyState === 'loaded' || this.readyState === 'complete') {
- if(callback) {
+ if (callback) {
  callback();
+ callback = this.onreadystatechange = this.onerror = null;
  }
  }
- },
- errorFn = function() {
- me.error = true;
- if(callback) {
- callback();
- }
  };
- me.preserve = true;
- el.onerror = errorFn;
- if(Boot.hasReadyState) {
- el.onreadystatechange = readyStateChange;
- } else {
- el.onload = callback;
  }
+ else {
+ el.onload = function() {
+ callback();
+ callback = this.onload = this.onerror = null;
+ };
+ }
+
  // IE starts loading here
  el[me.prop] = me.getLoadUrl();
  },
@@ -1485,8 +1506,11 @@ Ext.Boot = Ext.Boot || (function (emptyFn) {
  // for async modes, we have some options
  if (!sync) {
  // if cross domain, just inject the script tag and let the onload
- // events drive the progression
- if(me.isCrossDomain()) {
+ // events drive the progression.
+ // IE10 also needs sequential loading because of a bug that makes it
+ // fire readystate event prematurely:
+ // https://connect.microsoft.com/IE/feedback/details/729164/ie10-dynamic-script-element-fires-loaded-readystate-prematurely
+ if (Boot.isIE10 || me.isCrossDomain()) {
  return me.loadCrossDomain();
  }
  // for IE, use the readyStateChange allows us to load scripts in parallel
@@ -2056,18 +2080,17 @@ Ext.Microloader = Ext.Microloader || (function () {
 
  // Manifest is not in local storage. Fetch it from the server
  } else {
- Boot.fetch(Microloader.applyCacheBuster(url), function (result) {
- manifest = new Manifest({
- url: url,
- content: result.content
- });
 
- 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 {
+ Manifest.url = url;
+ Boot.fetch(Microloader.applyCacheBuster(url), function(result) {
+ Microloader.setManifest(result.content);
+ });
+ }
  }
 
  // Embedded Manifest into JS file
@@ -2079,6 +2102,22 @@ 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
  */
@@ -2506,7 +2545,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);
  }
  },