Include missing libraries for the bootstrap demo

abpframework · Jul 4, 2018 · fddcbd1 · fddcbd1
1 parent 80b1d7e
commit fddcbd1
Show file tree

Hide file tree

Showing 139 changed files with 3,274 additions and 337 deletions.
diff --git a/...olo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj b/...olo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj
@@ -12,6 +12,8 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
+    <MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/abp.resourcemapping.js b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/abp.resourcemapping.js
@@ -1,7 +1,4 @@
 module.exports = {
-    imports: [
-        "node_modules/@abp/aspnetcore.mvc.ui.theme.shared/abp.resourcemapping.js"
-    ],
     aliases: { //TODO: Make some aliases default: node_modules, libs
         "@node_modules": "./node_modules",
         "@libs": "./wwwroot/libs"

diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/gulpfile.js b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/gulpfile.js
@@ -4,7 +4,7 @@ var gulp = require("gulp"),
     path = require('path'),
     copyResources = require('./node_modules/@abp/aspnetcore.mvc.ui/gulp/copy-resources.js');
 
-copyResources.init(path.resolve('./abp.resourcemapping.js'));
+copyResources.init(path.resolve('./'));
 
 gulp.task('default', [copyResources.taskName], function () {
 

diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
@@ -3,7 +3,7 @@
   "name": "asp.net",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "^0.2.3"
+    "@abp/aspnetcore.mvc.ui.theme.shared": "^0.3.5"
   },
   "devDependencies": {
   }

diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js
@@ -1,5 +1,5 @@
 var abp = abp || {};
-(function ($) {
+(function () {
 
     /* Application paths *****************************************/
 
@@ -187,57 +187,39 @@ var abp = abp || {};
 
     abp.message = abp.message || {};
 
-    var showMessage = function (message, title) {
+    abp.message._showMessage = function (message, title) {
         alert((title || '') + ' ' + message);
-
-        if (!$) {
-            abp.log.warn('abp.message can not return promise since jQuery is not defined!');
-            return null;
-        }
-
-        return $.Deferred(function ($dfd) {
-            $dfd.resolve();
-        });
     };
 
     abp.message.info = function (message, title) {
         abp.log.warn('abp.message.info is not implemented!');
-        return showMessage(message, title);
+        return abp.message._showMessage(message, title);
     };
 
     abp.message.success = function (message, title) {
         abp.log.warn('abp.message.success is not implemented!');
-        return showMessage(message, title);
+        return abp.message._showMessage(message, title);
     };
 
     abp.message.warn = function (message, title) {
         abp.log.warn('abp.message.warn is not implemented!');
-        return showMessage(message, title);
+        return abp.message._showMessage(message, title);
     };
 
     abp.message.error = function (message, title) {
         abp.log.warn('abp.message.error is not implemented!');
-        return showMessage(message, title);
+        return abp.message._showMessage(message, title);
     };
 
     abp.message.confirm = function (message, titleOrCallback, callback) {
-        abp.log.warn('abp.message.confirm is not implemented!');
+        abp.log.warn('abp.message.confirm is not properly implemented!');
 
         if (titleOrCallback && !(typeof titleOrCallback == 'string')) {
             callback = titleOrCallback;
         }
 
         var result = confirm(message);
         callback && callback(result);
-
-        if (!$) {
-            abp.log.warn('abp.message can not return promise since jQuery is not defined!');
-            return null;
-        }
-
-        return $.Deferred(function ($dfd) {
-            $dfd.resolve(result);
-        });
     };
 
     /* UI *******************************************************/
@@ -422,12 +404,6 @@ var abp = abp || {};
     };
 
     abp.utils.isFunction = function (obj) {
-        if ($) {
-            //Prefer to use jQuery if possible
-            return $.isFunction(obj);
-        }
-
-        //alternative for $.isFunction
         return !!(obj && obj.constructor && obj.call && obj.apply);
     };
 

diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/jquery/abp.dom.js b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/jquery/abp.dom.js