Merge branch 'master' of http://192.168.1.41:3000/caipin/cld2

# Conflicts:
#	Gruntfile.js

Gruntfile.js

@@ -1,7 +1,8 @@
 module.exports = function(grunt) {
 
-    //
+    //鍒濆�鍖栭厤缃甮runt浠诲姟
     grunt.initConfig({
+<<<<<<< .mine
         //pkg: grunt.file.readJSON('package.json'),
         //uglify: {
         //    options: {
@@ -12,12 +13,35 @@ module.exports = function(grunt) {
         //        dest: 'build/<%= pkg.name %>.min.js'
         //    }
         //}
+
+
+=======
+    	
+    
+    	concat: {//浠诲姟鍚嶇О
+            js: {
+                src: ['global/js/cloud/curing.js','global/js/cloud/curingFN.js','global/js/cloud/curingHtml.js'],
+                dest: 'global/js/cloud/curing.min.js'
+            },
+//            css: {
+//                src: ['css/*.css'],
+//                dest: 'build/all.css'
+//            }
+        }
+>>>>>>> .theirs
+
+    	
     });
 
-    // 加载包含 "uglify" 任务的插件。
+<<<<<<< .mine
+    // 加载包含 "uglify" 任务的插件。
     //grunt.loadNpmTasks('grunt-contrib-uglify');
+=======
+    grunt.loadNpmTasks('grunt-contrib-concat');
+
+>>>>>>> .theirs
 
-    // 默认被执行的任务列表。
+    //娉ㄥ唽grunt榛樿�浠诲姟
     grunt.registerTask('default', []);
 
 };

views/cloud/cloudMenu.html

@@ -37,23 +37,11 @@ $(document).ready(function(){
 	refreshCloudMenu();
 })
 
-/*
-$(function() {
-    $('ul[menuActive]').delegate( 'li[do]','click', function(){
-    	var data = $(this).attr('data');
-    	$(this).addClass("active");
-    	localStorage.setItem('curingMenuActive', data);
-        
-    });
-})
-*/
 function refreshCloudMenu(){
-	
 	var protocol = window.location.protocol;
     var url = $('<a>', { href: protocol});
     var pathName=url.prop('pathname');
-   
-	//var curingMenuActive=localStorage.getItem('curingMenuActive');
+
 	$('ul[menuActive] li[do]').each(function(){
 		var data=$(this).attr('data');
 		if(data==pathName){
@@ -63,18 +51,6 @@ function refreshCloudMenu(){
 		}
 		
 	  });
-	
-	/*
-	if (isAccept==null||isAccept) {
-		checkBoxList.eq(cbi).attr("checked",'true');
-	}else{
-		checkBoxList.eq(cbi).removeAttr("checked");
-	}
-	
-	console.log(curingMenuActive);
-	*/
-	
-	
 }
 
 </script>