lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-07 16:13:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixing jQuery UI resources

Browse Source 
#6329
This commit is contained in:
Sebastien Ros
2016-02-04 13:42:04 -08:00
parent 0c6bcb52e9
commit c8ab7f187f
8 changed files with 2934 additions and 2926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Resources/Assets.json
View File

@@ -9,7 +9,7 @@
"Assets/Css/jQueryUI/jquery-ui.structure.css",
"Assets/Css/jQueryUI/jquery-ui.theme.css"
],
"output": "Styles/jqueryui-orchard.css"
"output": "Styles/jquery-ui.css"
},
{
"inputs": [

2
src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
View File

@@ -620,8 +620,6 @@
<Content Include="Styles\jquery.calendars.picker.full.min.css" />
<Content Include="Styles\jquery.timeentry.css" />
<Content Include="Styles\jquery.timeentry.min.css" />
<Content Include="Styles\jqueryui-orchard.css" />
<Content Include="Styles\jqueryui-orchard.min.css" />
<Content Include="Web.config" />
<Content Include="Scripts\Web.config" />
<Content Include="Styles\Web.config" />

878
src/Orchard.Web/Modules/Orchard.Resources/Scripts/bootstrap.js vendored
View File

File diff suppressed because one or more lines are too long

4
src/Orchard.Web/Modules/Orchard.Resources/Scripts/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

2477
src/Orchard.Web/Modules/Orchard.Resources/Styles/jquery-ui.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

0
src/Orchard.Web/Modules/Orchard.Resources/Styles/jqueryui-orchard.min.css → src/Orchard.Web/Modules/Orchard.Resources/Styles/jquery-ui.min.css vendored
View File

2477
src/Orchard.Web/Modules/Orchard.Resources/Styles/jqueryui-orchard.css
View File

File diff suppressed because one or more lines are too long

20
src/Orchard.Web/Modules/Orchard.Resources/jQuery.cs
View File

@@ -8,13 +8,23 @@ namespace Orchard.Resources {
// Full jQuery UI package.
manifest.DefineScript("jQueryUI").SetUrl("jquery-ui.min.js", "jquery-ui.js").SetVersion("1.11.4").SetDependencies("jQuery").SetCdn("//ajax.aspnetcdn.com/ajax/jquery.ui/1.11.4/jquery-ui.min.js", "//ajax.aspnetcdn.com/ajax/jquery.ui/1.11.4/jquery-ui.js", true);
manifest.DefineStyle("jQueryUI_Orchard").SetUrl("jqueryui-orchard.min.css", "jqueryui-orchard.css").SetVersion("1.11.4");
manifest.DefineScript("jQueryUI_Interaction").SetUrl("jquery-ui-interaction.min.js", "jquery-ui-interaction.js").SetVersion("1.11.4").SetDependencies("jQueryUI");
manifest.DefineScript("jQueryUI_Widgets").SetUrl("jquery-ui-widgets.min.js", "jquery-ui-widgets.js").SetVersion("1.11.4").SetDependencies("jQueryUI_Interaction");
// Subsets and styles
manifest.DefineStyle("jQueryUI").SetUrl("jquery-ui.min.css", "jquery-ui.css").SetVersion("1.11.4");
manifest.DefineStyle("jQueryUI_Orchard").SetDependencies("jQueryUI"); // Right now no customization in the styles, but the resource is still use for later
manifest.DefineScript("jQueryUI_Interaction").SetUrl("jquery-ui-interaction.min.js", "jquery-ui-interaction.js").SetVersion("1.11.4").SetDependencies("jQuery");
manifest.DefineScript("jQueryUI_Widgets").SetUrl("jquery-ui-widgets.min.js", "jquery-ui-widgets.js").SetVersion("1.11.4").SetDependencies("jQuery");
manifest.DefineScript("jQueryUI_Effects").SetUrl("jquery-ui-effects.min.js", "jquery-ui-effects.js").SetVersion("1.11.4").SetDependencies("jQuery");
// Individual jQuery UI components.
manifest.DefineScript("jQueryUI_Mouse").SetUrl("ui/mouse.min.js", "ui/mouse.js").SetVersion("1.11.4").SetDependencies("jQueryUI");
// DEPRECATED - FOR COMPATIBILITY WITH VERSIONS < 1.10
manifest.DefineScript("jQueryUI_Core").SetDependencies("jQueryUI"); // Core doesn't exist anymore
manifest.DefineScript("jQueryUI_Widget").SetDependencies("jQueryUI_Widgets"); // Subset has been renamed
manifest.DefineStyle("jQueryUI").SetUrl("jquery-ui.min.css", "jquery-ui.css").SetVersion("1.11.2");
manifest.DefineStyle("jQueryUI_Structure").SetUrl("jquery-ui.structure.min.css", "jquery-ui.structure.css").SetVersion("1.11.2");
manifest.DefineStyle("jQueryUI_Theme").SetUrl("jquery-ui.theme.min.css", "jquery-ui.theme.css").SetVersion("1.11.2");
manifest.DefineScript("jQueryUI_Mouse").SetVersion("1.11.4").SetDependencies("jQueryUI");
manifest.DefineScript("jQueryUI_Position").SetUrl("ui/position.min.js", "ui/position.js").SetVersion("1.11.4").SetDependencies("jQuery");
manifest.DefineScript("jQueryUI_Draggable").SetUrl("ui/draggable.min.js", "ui/draggable.js").SetVersion("1.11.4").SetDependencies("jQueryUI_Mouse");
manifest.DefineScript("jQueryUI_Droppable").SetUrl("ui/droppable.min.js", "ui/droppable.js").SetVersion("1.11.4").SetDependencies("jQueryUI_Draggable");