Commit 0b965ef1 authored by Maxime Chazalviel's avatar Maxime Chazalviel

Merge branch 'master' into feature/flux

# Conflicts:
#	resources/lib/functions/GraphNetwork.js
#	resources/lib/functions/GraphUtils.js
parents 2ef02e31 73c65a3f

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -3,11 +3,11 @@
* The application's namespace.
*/
"name": "metExploreViz",
/**
* The version of the application.
*/
"version": "2.6.5",
"version": "2.6.13",
/**
* The relative path to the application's markup file (html, jsp, asp, etc.).
......@@ -41,22 +41,22 @@
* The Sencha Framework for this application: "ext" or "touch".
*/
"framework": "ext",
/**
* The toolkit to use. Select either "classic" or "modern".
*/
"toolkit": "classic",
/**
* The name of the theme for this application.
*/
"theme": "theme-triton",
/**
* The list of required packages (with optional versions; default is "latest").
*
......@@ -103,9 +103,9 @@
* "save": "sass/save.scss"
*
*/
// "save": "sass/save.scss",
/**
* Comma-separated list of files or folders containing extra Sass. These
* files are automatically included in the Sass compilation. By default this
......@@ -342,18 +342,18 @@
"bundle": true
},
{
"path": "resources/lib/functions/GraphPanel.js",
"path": "resources/lib/functions/GraphPanel.js",
"bundle": true
},
{
"path": "resources/lib/functions/GraphPath.js",
"path": "resources/lib/functions/GraphPath.js",
"bundle": true
},
{
"path": "resources/lib/functions/GraphStyleEdition.js",
"bundle": true
}
],
],
......@@ -430,21 +430,21 @@
* are supported.
*
*/
"loader": {
// This property controls how the loader manages caching for requests:
//
// - true: allows requests to receive cached responses
// - false: disable cached responses by adding a random "cache buster"
// - other: a string (such as the build.timestamp shown here) to allow
// requests to be cached for this build.
//
"cache": false,
// When "cache" is not true, this value is the request parameter used
// to control caching.
//
"cacheParam": "_dc"
},
"loader": {
// This property controls how the loader manages caching for requests:
//
// - true: allows requests to receive cached responses
// - false: disable cached responses by adding a random "cache buster"
// - other: a string (such as the build.timestamp shown here) to allow
// requests to be cached for this build.
//
"cache": false,
// When "cache" is not true, this value is the request parameter used
// to control caching.
//
"cacheParam": "_dc"
},
/**
* Settings specific to production builds.
......@@ -466,13 +466,13 @@
"type": "yui"
}
},
/**
* Settings specific to testing builds.
*/
"testing": {
},
/**
* Settings specific to development builds.
*/
......@@ -515,7 +515,7 @@
*/
"bootstrap": {
"base": "${app.dir}",
"microloader": "bootstrap.js",
"css": "bootstrap.css"
},
......@@ -560,7 +560,7 @@
* }
*
*/
"output": {
"base": "${workspace.build.dir}/${build.environment}/${app.name}",
"appCache": {
......@@ -572,8 +572,8 @@
"enable": true
}
},
/**
* Controls for localStorage caching
* "cache": {
......@@ -589,11 +589,12 @@
* "deltas": "deltas"
* }
*/
"cache": {
"enable": false
"enable": false,
"deltas": true
},
/**
* Used to automatically generate cache.manifest (HTML 5 application cache manifest)
......@@ -648,9 +649,9 @@
* generated inside this directory must be kept intact for proper generation of
* deltas between updates.
*/
"archivePath": "archive",
/**
......@@ -695,7 +696,7 @@
* }
*
*/
/**
* Uniquely generated id for this application, used as prefix for localStorage keys.
......
......@@ -37,7 +37,7 @@ Ext.define('metExploreViz.view.form.drawingStyleForm.DrawingStyleForm', {
// text: 'Charge',
html:" <h2>Charge</h2> Attracts (+) or repels (-) nodes to/from each other.\n",
// style: " font-size:20px;",
margin:'5 5 5 5',
margin:'5 5 5 5'
},
{
xtype: 'slider',
......@@ -120,7 +120,7 @@ Ext.define('metExploreViz.view.form.drawingStyleForm.DrawingStyleForm', {
xtype: 'label',
forId: 'myFieldId',
html:" <h2>Collide<