wangxl vor 9 Jahren
Ursprung
Commit
94e369733a

+ 0 - 3
display-client/.classpath

@ -4,10 +4,7 @@
4 4
	<classpathentry kind="src" path="src"/>
5 5
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
6 6
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
7
	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/wade-mobile"/>
8
	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/wade-mobile-data"/>
9 7
	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/wade-mobile-func"/>
10
	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/wade-mobile-im"/>
11 8
	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/wade-mobile-ui"/>
12 9
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
13 10
	<classpathentry kind="output" path="bin/classes"/>

+ 3 - 0
display-client/lint.xml

@ -0,0 +1,3 @@
1
<?xml version="1.0" encoding="UTF-8"?>
2
<lint>
3
</lint>

+ 2 - 2
display-client/project.properties

@ -12,6 +12,6 @@
12 12
13 13
# Project target.
14 14
target=android-15
15
android.library.reference.1=../wade-mobile-lib
16
android.library.reference.2=../../android/wade-mobile-com
15
android.library.reference.1=..\\wade-mobile-lib
16
android.library.reference.2=../wade-mobile-common
17 17
proguard.config=proguard-project.txt

+ 1 - 1
display-server/web/res/js/require-config.js

@ -16,7 +16,7 @@ require.config({
16 16
		'iScroll5' : 'base/iscroll5',
17 17
		'hammer' : 'base/hammer',
18 18
		'o' : 'frame/o',
19
		'oEvent' : 'frame/o-event',
19
		//'oEvent' : 'frame/o-event',
20 20
		'oInput' : 'frame/o-input',
21 21
		'tap' : 'frame/tap',
22 22
		'browserTool' : 'mobile/browser-toolkit',

+ 10 - 1
display-server/web/res/js/ui/wm-popup.js

@ -1,8 +1,9 @@
1
define(["module","oEvent"],function(module,oEvent){
1
define(["module","tap"],function(module,tap){
2 2
	function createNew(popupDom) {
3 3
		var popup = typeof popupDom == 'object' ? popupDom : document.getElementById(popupDom);
4 4
		for (var i = 1; i < arguments.length; i++) {
5 5
			var o = typeof arguments[i] == 'object' ? arguments[i] : document.getElementById(arguments[i]);
6
			/*
6 7
			oEvent.tap(o,(function(popup){
7 8
				if(popup.className == "c_popup") {
8 9
					popup.className = "c_popup c_popup-view";
@ -10,6 +11,14 @@ define(["module","oEvent"],function(module,oEvent){
10 11
					popup.className = "c_popup";
11 12
				}
12 13
			}),popup)
14
			*/
15
			$(o).tap(function(popup){
16
				if(popup.className == "c_popup") {
17
					popup.className = "c_popup c_popup-view";
18
				} else {
19
					popup.className = "c_popup";
20
				}
21
			});
13 22
		}
14 23
		return popup;
15 24
	}