Merge branch 'beta' into HK

js/Desktop/DeskTop.js

@@ -3707,8 +3707,8 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _x010503TeacherDeskIconInfo[i].Name }, _iconcontent);
             }
         } else if ((_type == 1 || _type == 4) && _org == "ec84034b-8ea4-4d27-9cba-1adcb4720bb3") {
-            for (i = 0; i < _SPROUTLabStudentDeskIconInfo.length; i++) {
-                if(_role === 0 && _SPROUTLabStudentDeskIconInfo[i].Url == 'testTeacher'){
+            for (i = 0; i < _SPROUTLabTeacherDeskIconInfo.length; i++) {
+                if(_role === 0 && _SPROUTLabTeacherDeskIconInfo[i].Url == 'testTeacher'){
                     continue
                 }
                 _content = $$("div", {
@@ -3716,15 +3716,15 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                     "onmousedown": U.UF.C.closure(function (obj) {
                         //防止拖动图标即打开了桌面应用
                         U.MD.D.click(this, obj);
-                    }, [_SPROUTLabStudentDeskIconInfo[i]]),
+                    }, [_SPROUTLabTeacherDeskIconInfo[i]]),
                     "onclick": U.UF.C.closure(function (obj) {
                         //防止拖动图标即打开了桌面应用
                         U.MD.D.click(this, obj);
-                    }, [_SPROUTLabStudentDeskIconInfo[i]])
+                    }, [_SPROUTLabTeacherDeskIconInfo[i]])
                 }, _frag); // 
                 _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
-                $$("div", { className: "U_MD_D_KOS U_Img", "style": _SPROUTLabStudentDeskIconInfo[i].style }, _iconcontent);
-                $$("div", { className: "U_MD_D_KOX", "innerHTML": _SPROUTLabStudentDeskIconInfo[i].Name }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _SPROUTLabTeacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _SPROUTLabTeacherDeskIconInfo[i].Name }, _iconcontent);
             }
         } else if ((_type == 1 || _type == 4) && _oid == "9b46a3c9-7657-11ef-9b30-005056b86db5") {
             for (i = 0; i < _x010608TeacherDeskIconInfo.length; i++) {