up

Author: csonlai

web/js/controller_setting/controller_setting.js

@@ -453,6 +453,9 @@ define(['tmpl','util','controller','transition','main_show','win_manager'],funct
 				}
 			}		
 		},
+		addControllerLocalData:function(controllerData){
+			this.allControllerData.push(controllerData);
+		},
 
 		render:function(){
 			if(!this.element){

web/js/index/index.js

@@ -257,7 +257,7 @@ define(['tmpl','pages','stages','framesbar','transition','csseditor','preset_ani
 			if(window.currentMode == 'scene'){
 
 				var localPagesData = Page.getData();
-
+			
 				var localData = {
 					id: currentWorkId,
 					name:this.workTitleText.val(), 
@@ -288,6 +288,7 @@ define(['tmpl','pages','stages','framesbar','transition','csseditor','preset_ani
 			if(currentSceneData){
 				currentSceneData.id = workId;
 			}
+
 			currentWorkId = workId;
 			cssEditor.setWorkId(currentWorkId);
 	        Stage.setWorkId(currentWorkId);
@@ -839,6 +840,7 @@ define(['tmpl','pages','stages','framesbar','transition','csseditor','preset_ani
 
 				//当前模式
 				self.changeMode('controller');
+				//self.setWorkId(null);
 				//清空数据
 				self.setData({
 					name:e.name
@@ -1039,7 +1041,7 @@ define(['tmpl','pages','stages','framesbar','transition','csseditor','preset_ani
 
 
 
-					//第一个关键帧
+					//第一个关键帧场景
 					var firstKeyFrame = framesBar.getFirstKeyFrame();
 					firstKeyFrame.select();		
 				},0);
@@ -1177,10 +1179,13 @@ define(['tmpl','pages','stages','framesbar','transition','csseditor','preset_ani
 
 			//点击新建元件
 			this.newControllerBtn.on('click',function(){
-				self.setWorkId(null);
+				
 				//先暂存场景数据
 				currentSceneData = self.getData();
 				currentSceneName = currentSceneData.name;
+
+				//self.setWorkId(null);
+
 				//展示元件设置窗口
 				ControllerSetting.BaseSetting.show();
 
@@ -1195,13 +1200,16 @@ define(['tmpl','pages','stages','framesbar','transition','csseditor','preset_ani
 
 				//获取元件编辑数据
 				var controllerEditData = self.getData();
-
+				
 				//获取元件本地数据
 				var localControllerData = ControllerSetting.List.getControllerLocalData(controllerEditData.id);
 
 				if(!localControllerData || localControllerData.name != controllerEditData.name){
 					//元件保存到后台
 					Util.createController(controllerEditData,function(data){
+						currentControllerId = data.id = controllerEditData.id;
+						data.name = controllerEditData.name;
+						ControllerSetting.List.addControllerLocalData(data);
 						alert('保存成功');
 					});			
 				}

web/js/main_page/main_page.js

@@ -144,7 +144,10 @@
 				//根据id找到该元素的初始css属性
 				var firstCssProperty = firstCssPropertyMap[spriteElementId];
 				//恢复初始css属性,让元素在翻页时，初始位置正确，为动画开始位置
-				$(spriteElement).css(firstCssProperty);
+				if(firstCssProperty){
+					$(spriteElement).css(firstCssProperty);
+				}
+				
 			});
 			stageElement.addClass('ms-no-animation');
 		},

web/js/sprite/sprite.js

@@ -197,7 +197,7 @@ define(['tmpl','util','controller'],function(tmpl,Util,Controller){
 				textContent:this.textContent,
 				isSingle:this.isSingle,
 				zIndex:this.zIndex,
-				actionEventName:this.actionEventName
+				clickActionEventName:this.clickActionEventName
 
 			});
 
@@ -279,7 +279,7 @@ define(['tmpl','util','controller'],function(tmpl,Util,Controller){
 				}
 				testWidthDiv.html(content);
 
-				visibleWidth = testWidthDiv.width() + 1;
+				visibleWidth = testWidthDiv.width() + 2;
 				visibleHeight = testWidthDiv.height();
 
 				if(this.initialSetting && this.initialSetting.width != null){

web/js/transition/transition.js

@@ -234,7 +234,7 @@
                 });
 
                 //hack android 2.3 fill-mode为forwards时不能保持最后样式状态的bug
-                if(lastCssProperties && isMobile){
+                if(lastCssProperties && isMobile && isUnderAndroid4){
                     $(transitionObj.elem).css(lastCssProperties);
                 }