Skip to content

Commit 03469b9

Browse files
ismcagdasismcagdas
committed
fixed #115 upgraded to sweetalert v2.0.8
1 parent 46e610a commit 03469b9

File tree

230 files changed

+856
-22724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+856
-22724
lines changed

‎src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj‎

Lines changed: 31 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,9 @@
485485
<Content Include="Content\themes\base\tooltip.css" />
486486
<Content Include="css\materialize.css" />
487487
<Content Include="css\style.css" />
488-
<Content Include="css\style.min.css" />
488+
<Content Include="css\style.min.css">
489+
<DependentUpon>style.css</DependentUpon>
490+
</Content>
489491
<Content Include="css\themes\all-themes.css" />
490492
<Content Include="css\themes\all-themes.min.css" />
491493
<Content Include="css\themes\theme-amber.css" />
@@ -2229,47 +2231,7 @@
22292231
<Content Include="lib\spin.js\jquery.spin.js" />
22302232
<Content Include="lib\spin.js\spin.js" />
22312233
<Content Include="lib\spin.js\spin.min.js" />
2232-
<Content Include="lib\sweetalert\.gitignore" />
2233-
<Content Include="lib\sweetalert\dev\gulpfile-wrap-template.js" />
2234-
<Content Include="lib\sweetalert\dev\ie9.css" />
2235-
<Content Include="lib\sweetalert\dev\loader-animation.css" />
2236-
<Content Include="lib\sweetalert\dev\modules\default-params.js" />
2237-
<Content Include="lib\sweetalert\dev\modules\handle-click.js" />
2238-
<Content Include="lib\sweetalert\dev\modules\handle-dom.js" />
2239-
<Content Include="lib\sweetalert\dev\modules\handle-key.js" />
2240-
<Content Include="lib\sweetalert\dev\modules\handle-swal-dom.js" />
2241-
<Content Include="lib\sweetalert\dev\modules\injected-html.js" />
2242-
<Content Include="lib\sweetalert\dev\modules\set-params.js" />
2243-
<Content Include="lib\sweetalert\dev\modules\utils.js" />
2244-
<Content Include="lib\sweetalert\dev\sweetalert.es6.js" />
2245-
<Content Include="lib\sweetalert\dist\sweetalert-dev.js" />
2246-
<Content Include="lib\sweetalert\dist\sweetalert.css" />
22472234
<Content Include="lib\sweetalert\dist\sweetalert.min.js" />
2248-
<Content Include="lib\sweetalert\example\example.css" />
2249-
<Content Include="lib\sweetalert\example\images\logo_big%402x.png" />
2250-
<Content Include="lib\sweetalert\example\images\logo_big.png" />
2251-
<Content Include="lib\sweetalert\example\images\logo_small%402x.png" />
2252-
<Content Include="lib\sweetalert\example\images\logo_small.png" />
2253-
<Content Include="lib\sweetalert\example\images\thumbs-up.jpg" />
2254-
<Content Include="lib\sweetalert\example\images\vs_icon%402x.png" />
2255-
<Content Include="lib\sweetalert\example\images\vs_icon.png" />
2256-
<Content Include="lib\sweetalert\gulpfile.js" />
2257-
<Content Include="lib\sweetalert\index.html" />
2258-
<Content Include="lib\sweetalert\lib\modules\default-params.js" />
2259-
<Content Include="lib\sweetalert\lib\modules\handle-click.js" />
2260-
<Content Include="lib\sweetalert\lib\modules\handle-dom.js" />
2261-
<Content Include="lib\sweetalert\lib\modules\handle-key.js" />
2262-
<Content Include="lib\sweetalert\lib\modules\handle-swal-dom.js" />
2263-
<Content Include="lib\sweetalert\lib\modules\injected-html.js" />
2264-
<Content Include="lib\sweetalert\lib\modules\set-params.js" />
2265-
<Content Include="lib\sweetalert\lib\modules\utils.js" />
2266-
<Content Include="lib\sweetalert\lib\sweetalert.js" />
2267-
<Content Include="lib\sweetalert\sweetalert.gif" />
2268-
<Content Include="lib\sweetalert\test\index.html" />
2269-
<Content Include="lib\sweetalert\test\tests.js" />
2270-
<Content Include="lib\sweetalert\themes\facebook\facebook.css" />
2271-
<Content Include="lib\sweetalert\themes\google\google.css" />
2272-
<Content Include="lib\sweetalert\themes\twitter\twitter.css" />
22732235
<Content Include="lib\toastr\toastr.css" />
22742236
<Content Include="lib\toastr\toastr.js" />
22752237
<Content Include="lib\toastr\toastr.min.css" />
@@ -2716,20 +2678,8 @@
27162678
<Content Include="lib\spin.js\bower.json" />
27172679
<Content Include="lib\spin.js\LICENSE.md" />
27182680
<Content Include="lib\spin.js\README.md" />
2719-
<Content Include="lib\sweetalert\.bower.json" />
2720-
<Content Include="lib\sweetalert\.editorconfig" />
2721-
<Content Include="lib\sweetalert\.jshintrc" />
2722-
<Content Include="lib\sweetalert\.travis.yml" />
2723-
<Content Include="lib\sweetalert\bower.json" />
2724-
<Content Include="lib\sweetalert\dev\sweetalert.scss" />
2725-
<Content Include="lib\sweetalert\example\example.scss" />
2726-
<Content Include="lib\sweetalert\example\images\te-logo-small.svg" />
2727-
<Content Include="lib\sweetalert\LICENSE" />
27282681
<Content Include="lib\sweetalert\package.json" />
27292682
<Content Include="lib\sweetalert\README.md" />
2730-
<Content Include="lib\sweetalert\themes\facebook\facebook.scss" />
2731-
<Content Include="lib\sweetalert\themes\google\google.scss" />
2732-
<Content Include="lib\sweetalert\themes\twitter\twitter.scss" />
27332683
<Content Include="lib\toastr\.bower.json" />
27342684
<Content Include="lib\toastr\bower.json" />
27352685
<Content Include="lib\toastr\README.md" />
@@ -2751,6 +2701,7 @@
27512701
<Content Include="Abp\Framework\styles\abp.mixings.css.map" />
27522702
<Content Include="Abp\Framework\styles\abp.less" />
27532703
<Content Include="Abp\Framework\styles\abp.css.map" />
2704+
<None Include="bundleconfig.json" />
27542705
<None Include="compilerconfig.json" />
27552706
<None Include="compilerconfig.json.defaults">
27562707
<DependentUpon>compilerconfig.json</DependentUpon>
@@ -2768,6 +2719,7 @@
27682719
<Content Include="Content\bootstrap.css.map" />
27692720
<Content Include="Content\bootstrap-theme.min.css.map" />
27702721
<Content Include="Content\bootstrap-theme.css.map" />
2722+
<Content Include="lib\sweetalert\LICENSE.md" />
27712723
<None Include="Scripts\jquery-2.1.4.intellisense.js" />
27722724
<None Include="Scripts\jquery-3.2.1.intellisense.js" />
27732725
<Content Include="Scripts\bootstrap.js" />
@@ -3023,6 +2975,32 @@
30232975
<ItemGroup>
30242976
<Service Include="{4A0DDDB5-7A95-4FBF-97CC-616D07737A77}" />
30252977
</ItemGroup>
2978+
<ItemGroup>
2979+
<TypeScriptCompile Include="lib\sweetalert\typings\core.d.ts" />
2980+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\actions.d.ts" />
2981+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\class-list\index.d.ts" />
2982+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\event-listeners.d.ts" />
2983+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\buttons.d.ts" />
2984+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\content.d.ts" />
2985+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\icon.d.ts" />
2986+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\index.d.ts" />
2987+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\modal.d.ts" />
2988+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\overlay.d.ts" />
2989+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\init\text.d.ts" />
2990+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\markup\buttons.d.ts" />
2991+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\markup\content.d.ts" />
2992+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\markup\icons.d.ts" />
2993+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\markup\index.d.ts" />
2994+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\markup\modal.d.ts" />
2995+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\markup\overlay.d.ts" />
2996+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\options\buttons.d.ts" />
2997+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\options\content.d.ts" />
2998+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\options\deprecations.d.ts" />
2999+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\options\index.d.ts" />
3000+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\state.d.ts" />
3001+
<TypeScriptCompile Include="lib\sweetalert\typings\modules\utils.d.ts" />
3002+
<TypeScriptCompile Include="lib\sweetalert\typings\sweetalert.d.ts" />
3003+
</ItemGroup>
30263004
<PropertyGroup>
30273005
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
30283006
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

‎src/AbpCompanyName.AbpProjectName.WebMpa/App_Start/BundleConfig.cs‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public static void RegisterBundles(BundleCollection bundles)
1414
.Include("~/fonts/material-icons/materialicons.css", new CssRewriteUrlTransform())
1515
.Include("~/lib/bootstrap/dist/css/bootstrap.css", new CssRewriteUrlTransform())
1616
.Include("~/lib/toastr/toastr.css", new CssRewriteUrlTransform())
17-
.Include("~/lib/sweetalert/dist/sweetalert.css", new CssRewriteUrlTransform())
1817
.Include("~/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css", new CssRewriteUrlTransform())
1918
.Include("~/lib/font-awesome/css/font-awesome.css", new CssRewriteUrlTransform())
2019
.Include("~/lib/Waves/dist/waves.css", new CssRewriteUrlTransform())
@@ -34,16 +33,16 @@ public static void RegisterBundles(BundleCollection bundles)
3433
"~/lib/jquery-validation/dist/jquery.validate.js",
3534
"~/lib/blockUI/jquery.blockUI.js",
3635
"~/lib/toastr/toastr.js",
37-
"~/lib/sweetalert/dist/sweetalert-dev.js",
36+
"~/lib/sweetalert/dist/sweetalert.min.js",
3837
"~/lib/spin.js/spin.js",
3938
"~/lib/spin.js/jquery.spin.js",
4039
"~/lib/Waves/dist/waves.js",
41-
"~/lib/abp-web-resources/Abp/Framework/scripts/abp.js",
42-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
43-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
44-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
45-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js",
46-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
40+
"~/Abp/Framework/scripts/abp.js",
41+
"~/Abp/Framework/scripts/libs/abp.jquery.js",
42+
"~/Abp/Framework/scripts/libs/abp.toastr.js",
43+
"~/Abp/Framework/scripts/libs/abp.blockUI.js",
44+
"~/Abp/Framework/scripts/libs/abp.spin.js",
45+
"~/Abp/Framework/scripts/libs/abp.sweet-alert.js",
4746
"~/js/admin.js",
4847
"~/js/main.js"
4948
)
@@ -59,7 +58,6 @@ public static void RegisterBundles(BundleCollection bundles)
5958
.Include("~/lib/bootstrap/dist/css/bootstrap.css", new CssRewriteUrlTransform())
6059
.Include("~/lib/bootstrap-select/dist/css/bootstrap-select.css", new CssRewriteUrlTransform())
6160
.Include("~/lib/toastr/toastr.css", new CssRewriteUrlTransform())
62-
.Include("~/lib/sweetalert/dist/sweetalert.css", new CssRewriteUrlTransform())
6361
.Include("~/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css", new CssRewriteUrlTransform())
6462
.Include("~/lib/font-awesome/css/font-awesome.css", new CssRewriteUrlTransform())
6563
.Include("~/lib/Waves/dist/waves.css", new CssRewriteUrlTransform())
@@ -81,19 +79,19 @@ public static void RegisterBundles(BundleCollection bundles)
8179
"~/lib/jquery-validation/dist/jquery.validate.js",
8280
"~/lib/blockUI/jquery.blockUI.js",
8381
"~/lib/toastr/toastr.js",
84-
"~/lib/sweetalert/dist/sweetalert-dev.js",
82+
"~/lib/sweetalert/dist/sweetalert.min.js",
8583
"~/lib/spin.js/spin.js",
8684
"~/lib/spin.js/jquery.spin.js",
8785
"~/lib/bootstrap-select/dist/js/bootstrap-select.js",
8886
"~/lib/jquery-slimscroll/jquery.slimscroll.js",
8987
"~/lib/Waves/dist/waves.js",
9088
"~/lib/push.js/push.js",
91-
"~/lib/abp-web-resources/Abp/Framework/scripts/abp.js",
92-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
93-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
94-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
95-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js",
96-
"~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
89+
"~/Abp/Framework/scripts/abp.js",
90+
"~/Abp/Framework/scripts/libs/abp.jquery.js",
91+
"~/Abp/Framework/scripts/libs/abp.toastr.js",
92+
"~/Abp/Framework/scripts/libs/abp.blockUI.js",
93+
"~/Abp/Framework/scripts/libs/abp.spin.js",
94+
"~/Abp/Framework/scripts/libs/abp.sweet-alert.js",
9795
"~/js/admin.js",
9896
"~/js/main.js",
9997
"~/Views/Shared/_Layout.js",

‎src/AbpCompanyName.AbpProjectName.WebMpa/bundleconfig.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[
2+
{
3+
"outputFileName": "css/style.min.css",
4+
"inputFiles": [
5+
"css/style.css"
6+
]
7+
}
8+
]

‎src/AbpCompanyName.AbpProjectName.WebMpa/css/style.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8026,3 +8026,6 @@ html.ie11 .dropdown-menu ul.menu li a {
80268026
html.ie11 .bs-searchbox .form-control {
80278027
width: 90%; }
80288028

8029+
.swal-footer {
8030+
text-align: center;
8031+
}

‎src/AbpCompanyName.AbpProjectName.WebMpa/css/style.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/AbpCompanyName.AbpProjectName.WebMpa/lib/abp-web-resources/.bower.json‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)