Browse Source

remove oEvent

wangxl 9 years ago
parent
commit
94e369733a

+ 0 - 3
display-client/.classpath

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

+ 3 - 0
display-client/lint.xml

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

+ 2 - 2
display-client/project.properties

12
12
13
# Project target.
13
# Project target.
14
target=android-15
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
proguard.config=proguard-project.txt
17
proguard.config=proguard-project.txt

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

16
		'iScroll5' : 'base/iscroll5',
16
		'iScroll5' : 'base/iscroll5',
17
		'hammer' : 'base/hammer',
17
		'hammer' : 'base/hammer',
18
		'o' : 'frame/o',
18
		'o' : 'frame/o',
19
		'oEvent' : 'frame/o-event',
19
		//'oEvent' : 'frame/o-event',
20
		'oInput' : 'frame/o-input',
20
		'oInput' : 'frame/o-input',
21
		'tap' : 'frame/tap',
21
		'tap' : 'frame/tap',
22
		'browserTool' : 'mobile/browser-toolkit',
22
		'browserTool' : 'mobile/browser-toolkit',

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

1
define(["module","oEvent"],function(module,oEvent){
1
define(["module","tap"],function(module,tap){
2
	function createNew(popupDom) {
2
	function createNew(popupDom) {
3
		var popup = typeof popupDom == 'object' ? popupDom : document.getElementById(popupDom);
3
		var popup = typeof popupDom == 'object' ? popupDom : document.getElementById(popupDom);
4
		for (var i = 1; i < arguments.length; i++) {
4
		for (var i = 1; i < arguments.length; i++) {
5
			var o = typeof arguments[i] == 'object' ? arguments[i] : document.getElementById(arguments[i]);
5
			var o = typeof arguments[i] == 'object' ? arguments[i] : document.getElementById(arguments[i]);
6
			/*
6
			oEvent.tap(o,(function(popup){
7
			oEvent.tap(o,(function(popup){
7
				if(popup.className == "c_popup") {
8
				if(popup.className == "c_popup") {
8
					popup.className = "c_popup c_popup-view";
9
					popup.className = "c_popup c_popup-view";
10
					popup.className = "c_popup";
11
					popup.className = "c_popup";
11
				}
12
				}
12
			}),popup)
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
		return popup;
23
		return popup;
15
	}
24
	}