From c17765dfc1527b32dc7454b445b4fe260b47a363 Mon Sep 17 00:00:00 2001 From: Rafael Xavier de Souza Date: Mon, 18 Jan 2016 16:10:14 -0200 Subject: [PATCH] Config: Allow different jQuery UI version to be specified for ThemeRoller page --- config.json | 4 ++++ frontend.js | 4 +++- template/themeroller/index.html | 4 ++-- template/themeroller/wrap.html | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config.json b/config.json index 0e70467d..b5d0d815 100644 --- a/config.json +++ b/config.json @@ -1,4 +1,8 @@ { + "themeroller": { + "jquery": "1.7", + "jqueryUi": "1.12.0-beta.1" + }, "jqueryUi": [ { "version": "1.12.0-beta.1", diff --git a/frontend.js b/frontend.js index 0511eef9..334e9d50 100644 --- a/frontend.js +++ b/frontend.js @@ -35,7 +35,9 @@ Frontend.defaults = { host: "", resources: { jqueryVersion: config.jquery, - jqueryuiVersion: JqueryUi.getStable().pkg.version + jqueryuiVersion: JqueryUi.getStable().pkg.version, + jqueryVersionForThemeRoller: config.themeroller.jquery, + jqueryuiVersionForThemeroller: config.themeroller.jqueryUi } }; diff --git a/template/themeroller/index.html b/template/themeroller/index.html index 32a559b1..56caa3f8 100644 --- a/template/themeroller/index.html +++ b/template/themeroller/index.html @@ -1,4 +1,4 @@ - + {{#if production}} @@ -16,7 +16,7 @@ - + {{#if production}} {{else}} diff --git a/template/themeroller/wrap.html b/template/themeroller/wrap.html index 714b0e02..8ba25aa0 100644 --- a/template/themeroller/wrap.html +++ b/template/themeroller/wrap.html @@ -2,7 +2,7 @@ - + // add js to html element for css selectors // usually handled by WordPress theme