Bläddra i källkod

Added app.min.js

almasaeed2010 10 år sedan
förälder
incheckning
2a35eafb8b

+ 17 - 10
Gruntfile.js

@@ -1,24 +1,22 @@
 'use strict';
-
 module.exports = function (grunt) {
   // load all grunt tasks
   grunt.loadNpmTasks('grunt-contrib-less');
   grunt.loadNpmTasks('grunt-contrib-watch');
-
+  grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.initConfig({
     watch: {
       // if any .less file changes in directory "build/less/" run the "less"-task.
-      files: ["build/less/*.less", "build/less/skins/*.less"],
-      tasks: ["less"]
+      files: ["build/less/*.less", "build/less/skins/*.less", "dist/js/app.min.js"],
+      tasks: ["less", "uglify"]
     },
     // "less"-task configuration
+    //this task will compile all less files upon saving to create both AdminLTE.css and AdminLTE.min.css
     less: {
       //Development not compressed
       development: {
         options: {
-          // Specifies directories to scan for @import directives when parsing. 
-          // Default value is the directory of the source, which is probably what you want.
-          paths: ["dist/css/"],
+          //Wether to compress or not
           compress: false
         },
         files: {
@@ -29,9 +27,7 @@ module.exports = function (grunt) {
       //production compresses version
       production: {
         options: {
-          // Specifies directories to scan for @import directives when parsing. 
-          // Default value is the directory of the source, which is probably what you want.
-          paths: ["dist/css/"],
+          //Wether to compress or not          
           compress: true
         },
         files: {
@@ -39,6 +35,17 @@ module.exports = function (grunt) {
           "dist/css/AdminLTE.min.css": "build/less/AdminLTE.less"
         }
       }
+    },
+    //Uglify task info
+    uglify: {
+      options: {
+        mangle: true
+      },
+      my_target: {
+        files: {
+          'dist/js/app.min.js': ['dist/js/app.js']
+        }
+      }
     }
   });
   // the default task (running "grunt" in console) is "watch"

+ 1 - 1
build/less/miscellaneous.less

@@ -133,7 +133,7 @@
   background-color: darken(@yellow , 6%)!important;
 }
 .bg-aqua-active {
-  background-color: darken(@aqua , 10%)!important;
+  background-color: darken(@aqua , 6%)!important;
 }
 .bg-blue-active {
   background-color: darken(@blue , 10%)!important;

+ 1 - 1
dist/css/AdminLTE.css

@@ -4980,7 +4980,7 @@ fieldset[disabled] .btn-vk.active {
 .bg-aqua-active,
 .modal-info .modal-header,
 .modal-info .modal-footer {
-  background-color: #0097bc !important;
+  background-color: #00a7d0 !important;
 }
 .bg-blue-active {
   background-color: #005384 !important;

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/css/AdminLTE.min.css


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/app.min.js


+ 1 - 1
documentation/index.html

@@ -376,7 +376,7 @@ AdminLTE/
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js" type="text/javascript"></script>
 
     <!-- AdminLTE App -->
-    <script src="../dist/js/app.js" type="text/javascript"></script>
+    <script src="../dist/js/app.min.js" type="text/javascript"></script>
     <!-- SlimScroll 1.3.0 -->
     <script src="../plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
     <script src="https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js"></script>

+ 1 - 1
index.html

@@ -899,7 +899,7 @@
     <script src="plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
 
     <!-- AdminLTE App -->
-    <script src="dist/js/app.js" type="text/javascript"></script>
+    <script src="dist/js/app.min.js" type="text/javascript"></script>
 
     <!-- AdminLTE dashboard demo (This is only for demo purposes) -->
     <script src="dist/js/pages/dashboard.js" type="text/javascript"></script>

+ 1 - 1
index2.html

@@ -1099,7 +1099,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js" type="text/javascript"></script>
 
     <!-- AdminLTE App -->
-    <script src="dist/js/app.js" type="text/javascript"></script>
+    <script src="dist/js/app.min.js" type="text/javascript"></script>
     <!-- Sparkline -->
     <script src="plugins/sparkline/jquery.sparkline.min.js" type="text/javascript"></script>
     <!-- jvectormap -->

+ 3 - 2
package.json

@@ -4,6 +4,7 @@
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-contrib-less": "~0.12.0",
-    "grunt-contrib-watch": "~0.6.1"
+    "grunt-contrib-watch": "~0.6.1",
+    "grunt-contrib-uglify": "~0.7.0"
   }
-}
+}

+ 1 - 1
pages/UI/buttons.html

@@ -1309,7 +1309,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
   </body>

+ 1 - 1
pages/UI/colors.html

@@ -522,7 +522,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
   </body>

+ 1 - 1
pages/UI/general.html

@@ -1033,7 +1033,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
   </body>

+ 1 - 1
pages/UI/icons.html

@@ -2209,7 +2209,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
   </body>

+ 1 - 1
pages/UI/modals.html

@@ -580,7 +580,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
   </body>

+ 1 - 1
pages/UI/sliders.html

@@ -522,7 +522,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
     <!-- Ion Slider -->

+ 1 - 1
pages/UI/timeline.html

@@ -597,7 +597,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
   </body>

+ 1 - 1
pages/calendar.html

@@ -518,7 +518,7 @@
     <!-- Slimscroll -->
     <script src="../plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../dist/js/app.js" type="text/javascript"></script>
+    <script src="../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../dist/js/demo.js" type="text/javascript"></script>
     <!-- fullCalendar 2.2.5 -->

+ 1 - 1
pages/charts/flot.html

@@ -520,7 +520,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
     <!-- FLOT CHARTS -->

+ 1 - 1
pages/charts/inline.html

@@ -709,7 +709,7 @@
     <!-- SlimScroll 1.3.0 -->
     <script src="../../plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
     <!-- jQuery Knob -->

+ 1 - 1
pages/charts/morris.html

@@ -502,7 +502,7 @@
     <script src="../../plugins/morris/morris.min.js" type="text/javascript"></script>
 
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
     <!-- page script -->

+ 1 - 1
pages/examples/404.html

@@ -431,7 +431,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
   </body>

+ 1 - 1
pages/examples/500.html

@@ -432,7 +432,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
   </body>

+ 1 - 1
pages/examples/blank.html

@@ -364,7 +364,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
   </body>

+ 1 - 1
pages/examples/invoice-print.html

@@ -148,6 +148,6 @@
       </section><!-- /.content -->
     </div><!-- ./wrapper -->
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
   </body>
 </html>

+ 1 - 1
pages/examples/invoice.html

@@ -586,7 +586,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
   </body>

+ 1 - 1
pages/forms/advanced.html

@@ -720,7 +720,7 @@
     <!-- iCheck 1.0.1 -->
     <script src="../../plugins/iCheck/icheck.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
     <!-- Page script -->

+ 1 - 1
pages/forms/editors.html

@@ -488,7 +488,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
     <!-- CK Editor -->

+ 1 - 1
pages/forms/general.html

@@ -747,7 +747,7 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
   </body>

+ 1 - 1
pages/layout/top-nav.html

@@ -112,7 +112,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js" type="text/javascript"></script>
 
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
   </body>

+ 1 - 1
pages/mailbox.html

@@ -655,7 +655,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <script src="../plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../dist/js/app.js" type="text/javascript"></script>    
+    <script src="../dist/js/app.min.js" type="text/javascript"></script>    
     <!-- Bootstrap WYSIHTML5 -->
     <script src="../plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js" type="text/javascript"></script>
     <!-- iCheck -->

+ 1 - 1
pages/tables/data.html

@@ -1322,7 +1322,7 @@
     <script src="../../plugins/datatables/dataTables.bootstrap.js" type="text/javascript"></script>
     <script src="../../plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
     <!-- page script -->

+ 1 - 1
pages/tables/simple.html

@@ -750,7 +750,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <script src="../../plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../../dist/js/app.js" type="text/javascript"></script>
+    <script src="../../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../../dist/js/demo.js" type="text/javascript"></script>
   </body>

+ 1 - 1
pages/widgets.html

@@ -1063,7 +1063,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <script src="../plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
     <!-- AdminLTE App -->
-    <script src="../dist/js/app.js" type="text/javascript"></script>
+    <script src="../dist/js/app.min.js" type="text/javascript"></script>
     <!-- AdminLTE for demo purposes -->
     <script src="../dist/js/demo.js" type="text/javascript"></script>
   </body>

Vissa filer visades inte eftersom för många filer har ändrats