From abcc22b9d1169776e9a57b9c4f4fe782282aa4b3 Mon Sep 17 00:00:00 2001 From: xlui Date: Wed, 29 May 2019 20:32:41 +0800 Subject: [PATCH 1/3] Update project dependency and fix android client error, upgrade StompProtocolAndroid to latest version --- AndroidClient/.gitignore | 1 + .../.idea/caches/build_file_checksums.ser | Bin 537 -> 0 bytes AndroidClient/.idea/codeStyles/Project.xml | 29 - .../.idea/codeStyles/codeStyleConfig.xml | 5 - AndroidClient/.idea/gradle.xml | 18 - AndroidClient/.idea/misc.xml | 34 - AndroidClient/.idea/modules.xml | 9 - AndroidClient/.idea/runConfigurations.xml | 12 - AndroidClient/.idea/vcs.xml | 6 - AndroidClient/app/build.gradle | 19 +- .../example}/im/ExampleInstrumentedTest.java | 2 +- .../app/src/main/AndroidManifest.xml | 8 +- .../im/activities/BroadcastActivity.java | 110 + .../example/im/activities/ChatActivity.java | 144 + .../example/im/activities/GroupActivity.java | 133 + .../xlui/example}/im/conf/Const.java | 16 +- .../xlui/example}/im/util/StompUtils.java | 14 +- .../xlui/im/activities/BroadcastActivity.java | 129 - .../me/xlui/im/activities/ChatActivity.java | 164 - .../me/xlui/im/activities/GroupActivity.java | 154 - .../main/res/layout/activity_broadcast.xml | 2 +- .../app/src/main/res/layout/activity_chat.xml | 2 +- .../src/main/res/layout/activity_group.xml | 2 +- .../xlui/example}/im/ExampleUnitTest.java | 2 +- AndroidClient/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- README_zh.md | 22 +- WebSocketServer/pom.xml | 108 +- .../xlui/example}/im/ImApplication.java | 8 +- .../im/config/HandshakeInterceptor.java | 33 + .../xlui/example/im/config/WebMvcConfig.java | 15 + .../example/im/config/WebSocketConfig.java | 31 + .../xlui/example/im/message/ChatMessage.java | 18 + .../app/xlui/example/im/message/Message.java | 17 + .../app/xlui/example/im/message/Response.java | 17 + .../example/im/web/WebSocketController.java | 74 + .../xlui/im/config/HandshakeInterceptor.java | 33 - .../java/me/xlui/im/config/WebMvcConfig.java | 15 - .../me/xlui/im/config/WebSocketConfig.java | 31 - .../java/me/xlui/im/message/ChatMessage.java | 41 - .../main/java/me/xlui/im/message/Message.java | 12 - .../java/me/xlui/im/message/Response.java | 16 - .../me/xlui/im/web/WebSocketController.java | 44 - .../src/main/resources/static/jquery.js | 5209 +++++++++-------- .../xlui/example}/im/ImApplicationTests.java | 8 +- 45 files changed, 3317 insertions(+), 3456 deletions(-) delete mode 100644 AndroidClient/.idea/caches/build_file_checksums.ser delete mode 100644 AndroidClient/.idea/codeStyles/Project.xml delete mode 100644 AndroidClient/.idea/codeStyles/codeStyleConfig.xml delete mode 100644 AndroidClient/.idea/gradle.xml delete mode 100644 AndroidClient/.idea/misc.xml delete mode 100644 AndroidClient/.idea/modules.xml delete mode 100644 AndroidClient/.idea/runConfigurations.xml delete mode 100644 AndroidClient/.idea/vcs.xml rename AndroidClient/app/src/androidTest/java/{me/xlui => app/xlui/example}/im/ExampleInstrumentedTest.java (95%) create mode 100644 AndroidClient/app/src/main/java/app/xlui/example/im/activities/BroadcastActivity.java create mode 100644 AndroidClient/app/src/main/java/app/xlui/example/im/activities/ChatActivity.java create mode 100644 AndroidClient/app/src/main/java/app/xlui/example/im/activities/GroupActivity.java rename AndroidClient/app/src/main/java/{me/xlui => app/xlui/example}/im/conf/Const.java (57%) rename AndroidClient/app/src/main/java/{me/xlui => app/xlui/example}/im/util/StompUtils.java (55%) delete mode 100644 AndroidClient/app/src/main/java/me/xlui/im/activities/BroadcastActivity.java delete mode 100644 AndroidClient/app/src/main/java/me/xlui/im/activities/ChatActivity.java delete mode 100644 AndroidClient/app/src/main/java/me/xlui/im/activities/GroupActivity.java rename AndroidClient/app/src/test/java/{me/xlui => app/xlui/example}/im/ExampleUnitTest.java (92%) rename WebSocketServer/src/main/java/{me/xlui => app/xlui/example}/im/ImApplication.java (56%) create mode 100644 WebSocketServer/src/main/java/app/xlui/example/im/config/HandshakeInterceptor.java create mode 100644 WebSocketServer/src/main/java/app/xlui/example/im/config/WebMvcConfig.java create mode 100644 WebSocketServer/src/main/java/app/xlui/example/im/config/WebSocketConfig.java create mode 100644 WebSocketServer/src/main/java/app/xlui/example/im/message/ChatMessage.java create mode 100644 WebSocketServer/src/main/java/app/xlui/example/im/message/Message.java create mode 100644 WebSocketServer/src/main/java/app/xlui/example/im/message/Response.java create mode 100644 WebSocketServer/src/main/java/app/xlui/example/im/web/WebSocketController.java delete mode 100644 WebSocketServer/src/main/java/me/xlui/im/config/HandshakeInterceptor.java delete mode 100644 WebSocketServer/src/main/java/me/xlui/im/config/WebMvcConfig.java delete mode 100644 WebSocketServer/src/main/java/me/xlui/im/config/WebSocketConfig.java delete mode 100644 WebSocketServer/src/main/java/me/xlui/im/message/ChatMessage.java delete mode 100644 WebSocketServer/src/main/java/me/xlui/im/message/Message.java delete mode 100644 WebSocketServer/src/main/java/me/xlui/im/message/Response.java delete mode 100644 WebSocketServer/src/main/java/me/xlui/im/web/WebSocketController.java rename WebSocketServer/src/test/java/{me/xlui => app/xlui/example}/im/ImApplicationTests.java (77%) diff --git a/AndroidClient/.gitignore b/AndroidClient/.gitignore index 39fb081..f237317 100644 --- a/AndroidClient/.gitignore +++ b/AndroidClient/.gitignore @@ -7,3 +7,4 @@ /build /captures .externalNativeBuild +.idea/ diff --git a/AndroidClient/.idea/caches/build_file_checksums.ser b/AndroidClient/.idea/caches/build_file_checksums.ser deleted file mode 100644 index 8908cfdcde47ad9f85ed84736a50f8bd117c9030..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}Q#7BMhIJFWRF{)3GpKNESYUkZd*k^N}Jx@15Pb%E$@WK)X9uynk3i+hBTP~V*;hv&X zaGz_>zPUi>AhoC@Gqt!Bu9#s<nXmM&$aZFBTX<=pz)Y&n347noPbF-ge6U)m6&KYlh IIMr1E0QXkA{Qv*} diff --git a/AndroidClient/.idea/codeStyles/Project.xml b/AndroidClient/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/AndroidClient/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/AndroidClient/.idea/codeStyles/codeStyleConfig.xml b/AndroidClient/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a1..0000000 --- a/AndroidClient/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/AndroidClient/.idea/gradle.xml b/AndroidClient/.idea/gradle.xml deleted file mode 100644 index 7ac24c7..0000000 --- a/AndroidClient/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/AndroidClient/.idea/misc.xml b/AndroidClient/.idea/misc.xml deleted file mode 100644 index c0f68ed..0000000 --- a/AndroidClient/.idea/misc.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/AndroidClient/.idea/modules.xml b/AndroidClient/.idea/modules.xml deleted file mode 100644 index fb682ad..0000000 --- a/AndroidClient/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/AndroidClient/.idea/runConfigurations.xml b/AndroidClient/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/AndroidClient/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/AndroidClient/.idea/vcs.xml b/AndroidClient/.idea/vcs.xml deleted file mode 100644 index 6c0b863..0000000 --- a/AndroidClient/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/AndroidClient/app/build.gradle b/AndroidClient/app/build.gradle index 8133507..b47865d 100644 --- a/AndroidClient/app/build.gradle +++ b/AndroidClient/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 28 defaultConfig { - applicationId "me.xlui.im" + applicationId "app.xlui.example.im" minSdkVersion 21 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -24,12 +24,11 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' - implementation 'com.squareup.okhttp3:okhttp:3.9.1' - compile "org.java-websocket:Java-WebSocket:1.3.7" - compile "com.github.NaikSoftware:StompProtocolAndroid:1.4.4" + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + api "com.github.NaikSoftware:StompProtocolAndroid:1.6.4" + api "io.reactivex.rxjava2:rxjava:2.2.5" } diff --git a/AndroidClient/app/src/androidTest/java/me/xlui/im/ExampleInstrumentedTest.java b/AndroidClient/app/src/androidTest/java/app/xlui/example/im/ExampleInstrumentedTest.java similarity index 95% rename from AndroidClient/app/src/androidTest/java/me/xlui/im/ExampleInstrumentedTest.java rename to AndroidClient/app/src/androidTest/java/app/xlui/example/im/ExampleInstrumentedTest.java index 1061f6a..b3787fc 100644 --- a/AndroidClient/app/src/androidTest/java/me/xlui/im/ExampleInstrumentedTest.java +++ b/AndroidClient/app/src/androidTest/java/app/xlui/example/im/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package me.xlui.im; +package app.xlui.example.im; import android.content.Context; import android.support.test.InstrumentationRegistry; diff --git a/AndroidClient/app/src/main/AndroidManifest.xml b/AndroidClient/app/src/main/AndroidManifest.xml index 14ef0b1..e9107e4 100644 --- a/AndroidClient/app/src/main/AndroidManifest.xml +++ b/AndroidClient/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="app.xlui.example.im"> - + - - + + \ No newline at end of file diff --git a/AndroidClient/app/src/main/java/app/xlui/example/im/activities/BroadcastActivity.java b/AndroidClient/app/src/main/java/app/xlui/example/im/activities/BroadcastActivity.java new file mode 100644 index 0000000..b2f5911 --- /dev/null +++ b/AndroidClient/app/src/main/java/app/xlui/example/im/activities/BroadcastActivity.java @@ -0,0 +1,110 @@ +package app.xlui.example.im.activities; + +import android.annotation.SuppressLint; +import android.content.Intent; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.util.Log; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; +import android.widget.Toast; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.Arrays; + +import app.xlui.example.im.R; +import app.xlui.example.im.conf.Const; +import app.xlui.example.im.util.StompUtils; +import ua.naiksoftware.stomp.Stomp; +import ua.naiksoftware.stomp.StompClient; +import ua.naiksoftware.stomp.dto.StompCommand; +import ua.naiksoftware.stomp.dto.StompHeader; +import ua.naiksoftware.stomp.dto.StompMessage; + +public class BroadcastActivity extends AppCompatActivity { + private Button broadcast; + private Button groups; + private Button chat; + + private EditText name; + private Button send; + private TextView result; + + private void init() { + broadcast = findViewById(R.id.broadcast); + broadcast.setEnabled(false); + groups = findViewById(R.id.groups); + chat = findViewById(R.id.chat); + name = findViewById(R.id.name); + send = findViewById(R.id.send); + result = findViewById(R.id.show); + } + + @SuppressLint("CheckResult") + @SuppressWarnings("ResultOfMethodCallIgnored") + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_broadcast); + + this.init(); + + StompClient stompClient = Stomp.over(Stomp.ConnectionProvider.OKHTTP, Const.address); + // 连接服务器 + stompClient.connect(); + Toast.makeText(this, "开始连接", Toast.LENGTH_SHORT).show(); + StompUtils.lifecycle(stompClient); + + // 订阅消息 + Log.i(Const.TAG, "订阅广播"); + stompClient.topic(Const.broadcastResponse).subscribe(stompMessage -> { + JSONObject jsonObject = new JSONObject(stompMessage.getPayload()); + Log.i(Const.TAG, "Receive: " + stompMessage.getPayload()); + runOnUiThread(() -> { + try { + result.append(jsonObject.getString("response") + "\n"); + } catch (JSONException e) { + e.printStackTrace(); + } + }); + }); + + send.setOnClickListener(v -> { + JSONObject jsonObject = new JSONObject(); + try { + jsonObject.put("name", name.getText()); + } catch (JSONException e) { + e.printStackTrace(); + } + + stompClient.send(new StompMessage( + // Stomp command + StompCommand.SEND, + // Stomp Headers, Send Headers with STOMP + // the first header is necessary, and the other can be customized by ourselves + Arrays.asList( + new StompHeader(StompHeader.DESTINATION, Const.broadcast), + new StompHeader("authorization", "this is a token generated by your code!") + ), + // Stomp payload + jsonObject.toString()) + ).subscribe(); + }); + + groups.setOnClickListener(v -> { + Intent intent = new Intent(); + intent.setClass(BroadcastActivity.this, GroupActivity.class); + startActivity(intent); + this.finish(); + }); + chat.setOnClickListener(v -> { + Intent intent = new Intent(); + intent.setClass(BroadcastActivity.this, ChatActivity.class); + startActivity(intent); + this.finish(); + }); + } +} diff --git a/AndroidClient/app/src/main/java/app/xlui/example/im/activities/ChatActivity.java b/AndroidClient/app/src/main/java/app/xlui/example/im/activities/ChatActivity.java new file mode 100644 index 0000000..f1271dc --- /dev/null +++ b/AndroidClient/app/src/main/java/app/xlui/example/im/activities/ChatActivity.java @@ -0,0 +1,144 @@ +package app.xlui.example.im.activities; + +import android.annotation.SuppressLint; +import android.content.Intent; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.text.Editable; +import android.text.TextWatcher; +import android.util.Log; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; +import android.widget.Toast; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.Random; + +import app.xlui.example.im.R; +import app.xlui.example.im.conf.Const; +import app.xlui.example.im.util.StompUtils; +import ua.naiksoftware.stomp.Stomp; +import ua.naiksoftware.stomp.StompClient; + +public class ChatActivity extends AppCompatActivity { + private Button broadcast; + private Button groups; + private Button chat; + + private TextView userId; + private EditText chatUserId; + private Button submit; + private EditText chatMessage; + private Button send; + private TextView show; + + private String user_id; + private String chat_user_id; + + private void init() { + broadcast = findViewById(R.id.broadcast); + groups = findViewById(R.id.groups); + chat = findViewById(R.id.chat); + chat.setEnabled(false); + + userId = findViewById(R.id.id); + user_id = String.valueOf(new Random().nextInt(100)); + userId.setText(user_id); + + chatUserId = findViewById(R.id.chat_user_id); + submit = findViewById(R.id.submit); + submit.setEnabled(false); + + chatMessage = findViewById(R.id.chat_message); + send = findViewById(R.id.send); + send.setEnabled(false); + + show = findViewById(R.id.show); + } + + @SuppressWarnings("ResultOfMethodCallIgnored") + @SuppressLint("CheckResult") + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_chat); + + this.init(); + + StompClient stompClient = Stomp.over(Stomp.ConnectionProvider.OKHTTP, Const.address); + stompClient.connect(); + Toast.makeText(this, "开始连接", Toast.LENGTH_SHORT).show(); + StompUtils.lifecycle(stompClient); + + stompClient.topic(Const.chatResponse.replace(Const.placeholder, user_id)).subscribe(stompMessage -> { + JSONObject jsonObject = new JSONObject(stompMessage.getPayload()); + Log.i(Const.TAG, "Receive: " + jsonObject.toString()); + runOnUiThread(() -> { + try { + show.append(jsonObject.getString("response") + "\n"); + } catch (JSONException e) { + e.printStackTrace(); + } + }); + }); + + chatUserId.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) { + if (!submit.isEnabled()) + submit.setEnabled(true); + } + }); + + submit.setOnClickListener(v -> { + chat_user_id = chatUserId.getText().toString(); + if (chat_user_id.length() == 0) { + return; + } + submit.setEnabled(false); + send.setEnabled(true); + }); + + send.setOnClickListener(v -> { + JSONObject jsonObject = new JSONObject(); + try { + jsonObject.put("userID", chat_user_id); + jsonObject.put("fromUserID", userId.getText().toString()); + jsonObject.put("message", chatMessage.getText()); + } catch (JSONException e) { + e.printStackTrace(); + } + if (chat_user_id == null || chat_user_id.length() == 0) { + chat_user_id = chatUserId.getText().toString(); + } + stompClient.send(Const.chat, jsonObject.toString()).subscribe(); + }); + + broadcast.setOnClickListener(v -> { + Intent intent = new Intent(); + intent.setClass(ChatActivity.this, BroadcastActivity.class); + startActivity(intent); + this.finish(); + }); + groups.setOnClickListener(v -> { + Intent intent = new Intent(); + intent.setClass(ChatActivity.this, GroupActivity.class); + startActivity(intent); + this.finish(); + }); + } +} diff --git a/AndroidClient/app/src/main/java/app/xlui/example/im/activities/GroupActivity.java b/AndroidClient/app/src/main/java/app/xlui/example/im/activities/GroupActivity.java new file mode 100644 index 0000000..19c7d22 --- /dev/null +++ b/AndroidClient/app/src/main/java/app/xlui/example/im/activities/GroupActivity.java @@ -0,0 +1,133 @@ +package app.xlui.example.im.activities; + +import android.annotation.SuppressLint; +import android.content.Intent; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.text.Editable; +import android.text.TextWatcher; +import android.util.Log; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; +import android.widget.Toast; + +import org.json.JSONException; +import org.json.JSONObject; + +import app.xlui.example.im.R; +import app.xlui.example.im.conf.Const; +import app.xlui.example.im.util.StompUtils; +import ua.naiksoftware.stomp.Stomp; +import ua.naiksoftware.stomp.StompClient; + +public class GroupActivity extends AppCompatActivity { + private Button broadcast; + private Button groups; + private Button chat; + + private EditText groupId; + private Button submit; + private EditText name; + private Button send; + private TextView show; + + private String group_id; + + private void init() { + broadcast = findViewById(R.id.broadcast); + groups = findViewById(R.id.groups); + groups.setEnabled(false); + chat = findViewById(R.id.chat); + + groupId = findViewById(R.id.group_id); + submit = findViewById(R.id.submit); + submit.setEnabled(false); + + name = findViewById(R.id.name); + send = findViewById(R.id.send); + send.setEnabled(false); + + show = findViewById(R.id.show); + } + + @SuppressWarnings("ResultOfMethodCallIgnored") + @SuppressLint("CheckResult") + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_group); + + this.init(); + + StompClient stompClient = Stomp.over(Stomp.ConnectionProvider.OKHTTP, Const.address); + stompClient.connect(); + Toast.makeText(this, "开始连接", Toast.LENGTH_SHORT).show(); + StompUtils.lifecycle(stompClient); + + groupId.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) { + if (!submit.isEnabled()) + submit.setEnabled(true); + } + }); + + submit.setOnClickListener(v -> { + group_id = groupId.getText().toString(); + if (group_id.length() == 0) { + return; + } + stompClient.topic(Const.groupResponse.replace("placeholder", group_id)).subscribe(stompMessage -> { + JSONObject jsonObject = new JSONObject(stompMessage.getPayload()); + Log.i(Const.TAG, "Receive: " + stompMessage.getPayload()); + runOnUiThread(() -> { + try { + show.append(jsonObject.getString("response") + "\n"); + } catch (JSONException e) { + e.printStackTrace(); + } + }); + }); + submit.setEnabled(false); + send.setEnabled(true); + }); + + send.setOnClickListener(v -> { + JSONObject jsonObject = new JSONObject(); + try { + jsonObject.put("name", name.getText().toString()); + } catch (JSONException e) { + e.printStackTrace(); + } + if (group_id == null || group_id.length() == 0) { + group_id = groupId.getText().toString(); + } + stompClient.send(Const.group.replace("placeholder", group_id), jsonObject.toString()).subscribe(); + }); + + broadcast.setOnClickListener(v -> { + Intent intent = new Intent(); + intent.setClass(GroupActivity.this, BroadcastActivity.class); + startActivity(intent); + this.finish(); + }); + chat.setOnClickListener(v -> { + Intent intent = new Intent(); + intent.setClass(GroupActivity.this, ChatActivity.class); + startActivity(intent); + this.finish(); + }); + } +} diff --git a/AndroidClient/app/src/main/java/me/xlui/im/conf/Const.java b/AndroidClient/app/src/main/java/app/xlui/example/im/conf/Const.java similarity index 57% rename from AndroidClient/app/src/main/java/me/xlui/im/conf/Const.java rename to AndroidClient/app/src/main/java/app/xlui/example/im/conf/Const.java index 2c05eef..e7dbca0 100644 --- a/AndroidClient/app/src/main/java/me/xlui/im/conf/Const.java +++ b/AndroidClient/app/src/main/java/app/xlui/example/im/conf/Const.java @@ -1,21 +1,23 @@ -package me.xlui.im.conf; +package app.xlui.example.im.conf; public class Const { public static final String TAG = "xlui"; public static final String placeholder = "placeholder"; - // im 是在服务器配置中注册的节点 - // 如果使用 Android Studio 自带的 AVD，地址应该是 10.0.2.2 -// private static final String address = "ws://10.0.2.2:8080/im/websocket"; - // 如果使用 Genymotion，地址应该是 10.0.3.2 + /** + * URL 中的 {@code im} 是在服务器中配置的 endpoint， + * 如果使用 Android Studio 自带的 AVD，地址应该是 10.0.2.2； + * 如果使用 Genymotion，地址应该是 10.0.3.2 + */ + // private static final String address = "ws://10.0.2.2:8080/im/websocket"; public static final String address = "ws://10.0.3.2:8080/im/websocket"; public static final String broadcast = "/broadcast"; public static final String broadcastResponse = "/b"; -// replace placeholder with group id + // replace {@code placeholder} with group id public static final String group = "/group/" + placeholder; public static final String groupResponse = "/g/" + placeholder; public static final String chat = "/chat"; -// replace placeholder with user id + // replace {@code placeholder} with user id public static final String chatResponse = "/user/" + placeholder + "/msg"; } diff --git a/AndroidClient/app/src/main/java/me/xlui/im/util/StompUtils.java b/AndroidClient/app/src/main/java/app/xlui/example/im/util/StompUtils.java similarity index 55% rename from AndroidClient/app/src/main/java/me/xlui/im/util/StompUtils.java rename to AndroidClient/app/src/main/java/app/xlui/example/im/util/StompUtils.java index bf2f7e3..a322b4e 100644 --- a/AndroidClient/app/src/main/java/me/xlui/im/util/StompUtils.java +++ b/AndroidClient/app/src/main/java/app/xlui/example/im/util/StompUtils.java @@ -1,10 +1,10 @@ -package me.xlui.im.util; +package app.xlui.example.im.util; import android.annotation.SuppressLint; import android.util.Log; -import me.xlui.im.conf.Const; -import ua.naiksoftware.stomp.client.StompClient; +import app.xlui.example.im.conf.Const; +import ua.naiksoftware.stomp.StompClient; public class StompUtils { @SuppressLint("CheckResult") @@ -12,13 +12,15 @@ public static void lifecycle(StompClient stompClient) { stompClient.lifecycle().subscribe(lifecycleEvent -> { switch (lifecycleEvent.getType()) { case OPENED: - Log.i(Const.TAG, "Connect: stomp connection opened!"); + Log.d(Const.TAG, "Stomp connection opened"); break; + case ERROR: - Log.e(Const.TAG, "Connect: Error occured!", lifecycleEvent.getException()); + Log.e(Const.TAG, "Error", lifecycleEvent.getException()); break; + case CLOSED: - Log.i(Const.TAG, "Connect: stomp connection closed!"); + Log.d(Const.TAG, "Stomp connection closed"); break; } }); diff --git a/AndroidClient/app/src/main/java/me/xlui/im/activities/BroadcastActivity.java b/AndroidClient/app/src/main/java/me/xlui/im/activities/BroadcastActivity.java deleted file mode 100644 index ff3aeec..0000000 --- a/AndroidClient/app/src/main/java/me/xlui/im/activities/BroadcastActivity.java +++ /dev/null @@ -1,129 +0,0 @@ -package me.xlui.im.activities; - -import android.annotation.SuppressLint; -import android.content.Intent; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.util.Log; -import android.widget.Button; -import android.widget.EditText; -import android.widget.TextView; -import android.widget.Toast; - -import org.json.JSONException; -import org.json.JSONObject; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; - -import java.util.Arrays; - -import me.xlui.im.R; -import me.xlui.im.conf.Const; -import me.xlui.im.util.StompUtils; -import okhttp3.WebSocket; -import ua.naiksoftware.stomp.Stomp; -import ua.naiksoftware.stomp.StompHeader; -import ua.naiksoftware.stomp.client.StompClient; -import ua.naiksoftware.stomp.client.StompCommand; -import ua.naiksoftware.stomp.client.StompMessage; - -public class BroadcastActivity extends AppCompatActivity { - private Button broadcast; - private Button groups; - private Button chat; - - private EditText name; - private Button send; - private TextView result; - - private void init() { - broadcast = findViewById(R.id.broadcast); - broadcast.setEnabled(false); - groups = findViewById(R.id.groups); - chat = findViewById(R.id.chat); - name = findViewById(R.id.name); - send = findViewById(R.id.send); - result = findViewById(R.id.show); - } - - @SuppressLint("CheckResult") - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_broadcast); - - this.init(); - - StompClient stompClient = Stomp.over(WebSocket.class, Const.address); - // 连接服务器 - stompClient.connect(); - Toast.makeText(this, "开始连接", Toast.LENGTH_SHORT).show(); - StompUtils.lifecycle(stompClient); - - // 订阅消息 - stompClient.topic(Const.broadcastResponse).subscribe(stompMessage -> { - JSONObject jsonObject = new JSONObject(stompMessage.getPayload()); - Log.i(Const.TAG, "Receive: " + stompMessage.getPayload()); - runOnUiThread(() -> { - try { - result.append(jsonObject.getString("response") + "\n"); - } catch (JSONException e) { - e.printStackTrace(); - } - }); - }); - - send.setOnClickListener(v -> { - JSONObject jsonObject = new JSONObject(); - try { - jsonObject.put("name", name.getText()); - } catch (JSONException e) { - e.printStackTrace(); - } - String token = "this is a token generated by your code!"; - StompHeader authorizationHeader = new StompHeader("authorization", token); - stompClient.send(new StompMessage( - // Stomp command - StompCommand.SEND, - // Stomp Headers, Send Headers with STOMP - // the first header is necessary, and the other can be customized by ourselves - Arrays.asList(new StompHeader(StompHeader.DESTINATION, Const.broadcast), authorizationHeader), - // Stomp payload - jsonObject.toString())).subscribe(new Subscriber() { - @Override - public void onSubscribe(Subscription s) { - Log.i(Const.TAG, "onSubscribe: 订阅成功！"); - } - - @Override - public void onNext(Void aVoid) { - - } - - @Override - public void onError(Throwable t) { - t.printStackTrace(); - Log.e(Const.TAG, "发生错误：", t); - } - - @Override - public void onComplete() { - Log.i(Const.TAG, "onComplete: Send Complete!"); - } - }); - }); - - groups.setOnClickListener(v -> { - Intent intent = new Intent(); - intent.setClass(BroadcastActivity.this, GroupActivity.class); - startActivity(intent); - this.finish(); - }); - chat.setOnClickListener(v -> { - Intent intent = new Intent(); - intent.setClass(BroadcastActivity.this, ChatActivity.class); - startActivity(intent); - this.finish(); - }); - } -} diff --git a/AndroidClient/app/src/main/java/me/xlui/im/activities/ChatActivity.java b/AndroidClient/app/src/main/java/me/xlui/im/activities/ChatActivity.java deleted file mode 100644 index 4c545c0..0000000 --- a/AndroidClient/app/src/main/java/me/xlui/im/activities/ChatActivity.java +++ /dev/null @@ -1,164 +0,0 @@ -package me.xlui.im.activities; - -import android.content.Intent; -import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.text.Editable; -import android.text.TextWatcher; -import android.util.Log; -import android.widget.Button; -import android.widget.EditText; -import android.widget.TextView; -import android.widget.Toast; - -import org.json.JSONException; -import org.json.JSONObject; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; - -import java.util.Random; - -import me.xlui.im.R; -import me.xlui.im.conf.Const; -import me.xlui.im.util.StompUtils; -import okhttp3.WebSocket; -import ua.naiksoftware.stomp.Stomp; -import ua.naiksoftware.stomp.client.StompClient; - -public class ChatActivity extends AppCompatActivity { - private Button broadcast; - private Button groups; - private Button chat; - - private TextView userId; - private EditText chatUserId; - private Button submit; - private EditText chatMessage; - private Button send; - private TextView show; - - private String user_id; - private String chat_user_id; - - private void init() { - broadcast = findViewById(R.id.broadcast); - groups = findViewById(R.id.groups); - chat = findViewById(R.id.chat); - chat.setEnabled(false); - - userId = findViewById(R.id.id); - user_id = String.valueOf(new Random().nextInt(100)); - userId.setText(user_id); - - chatUserId = findViewById(R.id.chat_user_id); - submit = findViewById(R.id.submit); - submit.setEnabled(false); - - chatMessage = findViewById(R.id.chat_message); - send = findViewById(R.id.send); - send.setEnabled(false); - - show = findViewById(R.id.show); - } - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_chat); - - this.init(); - - StompClient stompClient = Stomp.over(WebSocket.class, Const.address); - stompClient.connect(); - Toast.makeText(this, "开始连接", Toast.LENGTH_SHORT).show(); - StompUtils.lifecycle(stompClient); - - stompClient.topic(Const.chatResponse.replace(Const.placeholder, user_id)).subscribe(stompMessage -> { - JSONObject jsonObject = new JSONObject(stompMessage.getPayload()); - Log.i(Const.TAG, "Receive: " + jsonObject.toString()); - runOnUiThread(() -> { - try { - show.append(jsonObject.getString("response") + "\n"); - } catch (JSONException e) { - e.printStackTrace(); - } - }); - }); - - chatUserId.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - - } - - @Override - public void afterTextChanged(Editable s) { - if (!submit.isEnabled()) - submit.setEnabled(true); - } - }); - - submit.setOnClickListener(v -> { - chat_user_id = chatUserId.getText().toString(); - if (chat_user_id.length() == 0) { - return; - } - submit.setEnabled(false); - send.setEnabled(true); - }); - - send.setOnClickListener(v -> { - JSONObject jsonObject = new JSONObject(); - try { - jsonObject.put("userID", chat_user_id); - jsonObject.put("fromUserID", userId.getText().toString()); - jsonObject.put("message", chatMessage.getText()); - } catch (JSONException e) { - e.printStackTrace(); - } - if (chat_user_id == null || chat_user_id.length() == 0) { - chat_user_id = chatUserId.getText().toString(); - } - stompClient.send(Const.chat, jsonObject.toString()).subscribe(new Subscriber() { - @Override - public void onSubscribe(Subscription s) { - Log.i(Const.TAG, "onSubscribe: 订阅成功！"); - } - - @Override - public void onNext(Void aVoid) { - - } - - @Override - public void onError(Throwable t) { - Log.e(Const.TAG, "发生异常！", t); - } - - @Override - public void onComplete() { - Log.i(Const.TAG, "成功发送：" + jsonObject.toString()); - } - }); - }); - - broadcast.setOnClickListener(v -> { - Intent intent = new Intent(); - intent.setClass(ChatActivity.this, BroadcastActivity.class); - startActivity(intent); - this.finish(); - }); - groups.setOnClickListener(v -> { - Intent intent = new Intent(); - intent.setClass(ChatActivity.this, GroupActivity.class); - startActivity(intent); - this.finish(); - }); - } -} diff --git a/AndroidClient/app/src/main/java/me/xlui/im/activities/GroupActivity.java b/AndroidClient/app/src/main/java/me/xlui/im/activities/GroupActivity.java deleted file mode 100644 index 2b3f0b6..0000000 --- a/AndroidClient/app/src/main/java/me/xlui/im/activities/GroupActivity.java +++ /dev/null @@ -1,154 +0,0 @@ -package me.xlui.im.activities; - -import android.content.Intent; -import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.text.Editable; -import android.text.TextWatcher; -import android.util.Log; -import android.widget.Button; -import android.widget.EditText; -import android.widget.TextView; -import android.widget.Toast; - -import org.json.JSONException; -import org.json.JSONObject; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; - -import me.xlui.im.R; -import me.xlui.im.conf.Const; -import me.xlui.im.util.StompUtils; -import okhttp3.WebSocket; -import ua.naiksoftware.stomp.Stomp; -import ua.naiksoftware.stomp.client.StompClient; - -public class GroupActivity extends AppCompatActivity { - private Button broadcast; - private Button groups; - private Button chat; - - private EditText groupId; - private Button submit; - private EditText name; - private Button send; - private TextView show; - - private String group_id; - - private void init() { - broadcast = findViewById(R.id.broadcast); - groups = findViewById(R.id.groups); - groups.setEnabled(false); - chat = findViewById(R.id.chat); - - groupId = findViewById(R.id.group_id); - submit = findViewById(R.id.submit); - submit.setEnabled(false); - - name = findViewById(R.id.name); - send = findViewById(R.id.send); - send.setEnabled(false); - - show = findViewById(R.id.show); - } - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_group); - - this.init(); - - StompClient stompClient = Stomp.over(WebSocket.class, Const.address); - stompClient.connect(); - Toast.makeText(this, "开始连接", Toast.LENGTH_SHORT).show(); - StompUtils.lifecycle(stompClient); - - groupId.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - - } - - @Override - public void afterTextChanged(Editable s) { - if (!submit.isEnabled()) - submit.setEnabled(true); - } - }); - - submit.setOnClickListener(v -> { - group_id = groupId.getText().toString(); - if (group_id.length() == 0) { - return; - } - stompClient.topic(Const.groupResponse.replace("placeholder", group_id)).subscribe(stompMessage -> { - JSONObject jsonObject = new JSONObject(stompMessage.getPayload()); - Log.i(Const.TAG, "Receive: " + stompMessage.getPayload()); - runOnUiThread(() -> { - try { - show.append(jsonObject.getString("response") + "\n"); - } catch (JSONException e) { - e.printStackTrace(); - } - }); - }); - submit.setEnabled(false); - send.setEnabled(true); - }); - - send.setOnClickListener(v -> { - JSONObject jsonObject = new JSONObject(); - try { - jsonObject.put("name", name.getText().toString()); - } catch (JSONException e) { - e.printStackTrace(); - } - if (group_id == null || group_id.length() == 0) { - group_id = groupId.getText().toString(); - } - stompClient.send(Const.group.replace("placeholder", group_id), jsonObject.toString()).subscribe(new Subscriber() { - @Override - public void onSubscribe(Subscription s) { - Log.i(Const.TAG, "订阅成功"); - } - - @Override - public void onNext(Void aVoid) { - - } - - @Override - public void onError(Throwable t) { - t.printStackTrace(); - Log.e(Const.TAG, "发生错误：", t); - } - - @Override - public void onComplete() { - Log.i(Const.TAG, "发送消息成功！"); - } - }); - }); - - broadcast.setOnClickListener(v -> { - Intent intent = new Intent(); - intent.setClass(GroupActivity.this, BroadcastActivity.class); - startActivity(intent); - this.finish(); - }); - chat.setOnClickListener(v -> { - Intent intent = new Intent(); - intent.setClass(GroupActivity.this, ChatActivity.class); - startActivity(intent); - this.finish(); - }); - } -} diff --git a/AndroidClient/app/src/main/res/layout/activity_broadcast.xml b/AndroidClient/app/src/main/res/layout/activity_broadcast.xml index 4528c9a..f765ce2 100644 --- a/AndroidClient/app/src/main/res/layout/activity_broadcast.xml +++ b/AndroidClient/app/src/main/res/layout/activity_broadcast.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:gravity="center" android:orientation="vertical" - tools:context="me.xlui.im.activities.BroadcastActivity"> + tools:context="app.xlui.example.im.activities.BroadcastActivity"> diff --git a/AndroidClient/app/src/main/res/layout/activity_chat.xml b/AndroidClient/app/src/main/res/layout/activity_chat.xml index 6e0900a..c329ccf 100644 --- a/AndroidClient/app/src/main/res/layout/activity_chat.xml +++ b/AndroidClient/app/src/main/res/layout/activity_chat.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:gravity="center" android:orientation="vertical" - tools:context="me.xlui.im.activities.ChatActivity"> + tools:context="app.xlui.example.im.activities.ChatActivity"> + tools:context="app.xlui.example.im.activities.GroupActivity"> - 4.0.0 - - me.xlui - im - 0.0.1-SNAPSHOT - jar - - im - Demo project for Spring Boot - - - org.springframework.boot - spring-boot-starter-parent - 1.5.9.RELEASE - - - - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-websocket - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + app.xlui.example + im + 0.1-SNAPSHOT + jar + + im + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 2.1.5.RELEASE + + + + + UTF-8 + UTF-8 + 11 + 11 + 11 + 1.18.8 + + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-websocket + + + + org.projectlombok + lombok + ${lombok.version} + provided + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/WebSocketServer/src/main/java/me/xlui/im/ImApplication.java b/WebSocketServer/src/main/java/app/xlui/example/im/ImApplication.java similarity index 56% rename from WebSocketServer/src/main/java/me/xlui/im/ImApplication.java rename to WebSocketServer/src/main/java/app/xlui/example/im/ImApplication.java index cf3efa6..1a1d57a 100644 --- a/WebSocketServer/src/main/java/me/xlui/im/ImApplication.java +++ b/WebSocketServer/src/main/java/app/xlui/example/im/ImApplication.java @@ -1,4 +1,4 @@ -package me.xlui.im; +package app.xlui.example.im; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -6,7 +6,7 @@ @SpringBootApplication public class ImApplication { - public static void main(String[] args) { - SpringApplication.run(ImApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(ImApplication.class, args); + } } diff --git a/WebSocketServer/src/main/java/app/xlui/example/im/config/HandshakeInterceptor.java b/WebSocketServer/src/main/java/app/xlui/example/im/config/HandshakeInterceptor.java new file mode 100644 index 0000000..ae273d4 --- /dev/null +++ b/WebSocketServer/src/main/java/app/xlui/example/im/config/HandshakeInterceptor.java @@ -0,0 +1,33 @@ +package app.xlui.example.im.config; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.server.ServerHttpRequest; +import org.springframework.http.server.ServerHttpResponse; +import org.springframework.web.socket.WebSocketHandler; +import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor; + +import java.util.Map; + +public class HandshakeInterceptor extends HttpSessionHandshakeInterceptor { + private static Logger logger = LoggerFactory.getLogger("xlui"); + + /** + * WebSocket 握手前 + *

+ * 可以设置数据到 attributes 中，并在 WebSocketHandler 的 session 中获取 + */ + @Override + public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map attributes) throws Exception { + logger.info("HandshakeInterceptor: beforeHandshake"); + logger.info("Attributes: " + attributes.toString()); + return super.beforeHandshake(request, response, wsHandler, attributes); + } + + // WebSocket 握手后 + @Override + public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Exception ex) { + logger.info("HandshakeInterceptor: afterHandshake"); + super.afterHandshake(request, response, wsHandler, ex); + } +} diff --git a/WebSocketServer/src/main/java/app/xlui/example/im/config/WebMvcConfig.java b/WebSocketServer/src/main/java/app/xlui/example/im/config/WebMvcConfig.java new file mode 100644 index 0000000..0ffc94b --- /dev/null +++ b/WebSocketServer/src/main/java/app/xlui/example/im/config/WebMvcConfig.java @@ -0,0 +1,15 @@ +package app.xlui.example.im.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; + +@Configuration +public class WebMvcConfig extends WebMvcConfigurerAdapter { + @Override + public void addViewControllers(ViewControllerRegistry registry) { + registry.addViewController("/broadcast").setViewName("/broadcast"); + registry.addViewController("/group").setViewName("/group"); + registry.addViewController("/chat").setViewName("/chat"); + } +} diff --git a/WebSocketServer/src/main/java/app/xlui/example/im/config/WebSocketConfig.java b/WebSocketServer/src/main/java/app/xlui/example/im/config/WebSocketConfig.java new file mode 100644 index 0000000..c7264cb --- /dev/null +++ b/WebSocketServer/src/main/java/app/xlui/example/im/config/WebSocketConfig.java @@ -0,0 +1,31 @@ +package app.xlui.example.im.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.messaging.simp.config.MessageBrokerRegistry; +import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer; +import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; +import org.springframework.web.socket.config.annotation.StompEndpointRegistry; + +@Configuration +// 启用 Websocket 的消息代理 +@EnableWebSocketMessageBroker +public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer { + // 注册 STOMP 协议的节点（Endpoint），并映射为指定的 URL + // 我们使用 STOMP，所以不需要再实现 WebSocketHandler。 + // 实现 WebSocketHandler 的目的是接收和处理消息，STOMP 已经为我们做了这些。 + @Override + public void registerStompEndpoints(StompEndpointRegistry stompEndpointRegistry) { + // 注册 STOMP 协议的节点，并指定使用 SockJS 协议 + stompEndpointRegistry.addEndpoint("/im").addInterceptors(new HandshakeInterceptor()).withSockJS(); + } + + // 配置使用消息代理 + @Override + public void configureMessageBroker(MessageBrokerRegistry registry) { + // 统一配置消息代理，消息代理即订阅点，客户端通过订阅消息代理点接受消息 + registry.enableSimpleBroker("/b", "/g", "/user"); + + // 配置点对点消息的前缀 + registry.setUserDestinationPrefix("/user"); + } +} diff --git a/WebSocketServer/src/main/java/app/xlui/example/im/message/ChatMessage.java b/WebSocketServer/src/main/java/app/xlui/example/im/message/ChatMessage.java new file mode 100644 index 0000000..59c045b --- /dev/null +++ b/WebSocketServer/src/main/java/app/xlui/example/im/message/ChatMessage.java @@ -0,0 +1,18 @@ +package app.xlui.example.im.message; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@NoArgsConstructor +@AllArgsConstructor +public class ChatMessage { + private int userID; + private int fromUserID; + private String message; +} diff --git a/WebSocketServer/src/main/java/app/xlui/example/im/message/Message.java b/WebSocketServer/src/main/java/app/xlui/example/im/message/Message.java new file mode 100644 index 0000000..52b7fdd --- /dev/null +++ b/WebSocketServer/src/main/java/app/xlui/example/im/message/Message.java @@ -0,0 +1,17 @@ +package app.xlui.example.im.message; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +/** + * 封装浏览器发送到服务器的消息 + */ +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class Message { + private String name; +} diff --git a/WebSocketServer/src/main/java/app/xlui/example/im/message/Response.java b/WebSocketServer/src/main/java/app/xlui/example/im/message/Response.java new file mode 100644 index 0000000..3ec7d70 --- /dev/null +++ b/WebSocketServer/src/main/java/app/xlui/example/im/message/Response.java @@ -0,0 +1,17 @@ +package app.xlui.example.im.message; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +/** + * 封装发给客户端的消息 + */ +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class Response { + private String response; +} diff --git a/WebSocketServer/src/main/java/app/xlui/example/im/web/WebSocketController.java b/WebSocketServer/src/main/java/app/xlui/example/im/web/WebSocketController.java new file mode 100644 index 0000000..aa1a0f4 --- /dev/null +++ b/WebSocketServer/src/main/java/app/xlui/example/im/web/WebSocketController.java @@ -0,0 +1,74 @@ +package app.xlui.example.im.web; + +import app.xlui.example.im.message.ChatMessage; +import app.xlui.example.im.message.Message; +import app.xlui.example.im.message.Response; +import lombok.extern.slf4j.Slf4j; +import lombok.val; +import org.springframework.messaging.handler.annotation.DestinationVariable; +import org.springframework.messaging.handler.annotation.Header; +import org.springframework.messaging.handler.annotation.MessageMapping; +import org.springframework.messaging.handler.annotation.SendTo; +import org.springframework.messaging.simp.SimpMessagingTemplate; +import org.springframework.stereotype.Controller; + +@Controller +@Slf4j +public class WebSocketController { + private static final String token = "this is a token generated by your code!"; + private final SimpMessagingTemplate simpMessagingTemplate; + + public WebSocketController(SimpMessagingTemplate simpMessagingTemplate) { + this.simpMessagingTemplate = simpMessagingTemplate; + } + + /** + * @MessageMapping 定义接收消息的端点，客户端发送 WebSocket 消息到此端点。 + * @SendTo 定义方法返回值发送的端点，订阅该端点的客户端可以收到服务器端的回复。 + * 此端点默认将收到的消息发送到所有订阅了 @SendTo 端点的客户端，相当于广播。 + * + * @param message 客户端消息 + * @param authorizationToken 自定义的请求校验 Token，后续也可以与 JWT 集成进行验证 + * @return 返回消息 + */ + // + @MessageMapping("/broadcast") + @SendTo("/b") + public Response say(Message message, @Header(value = "authorization") String authorizationToken) { + val response = new Response("Token check failed!"); + if (authorizationToken.equals(token)) { + log.info("Token check success!!!"); + response.setResponse("Welcome, " + message.getName() + "!"); + } else { + log.info(response.getResponse()); + } + return response; + } + + /** + * 通过在 @MessageMapping 中添加消息占位符来获取 url 内容，从而动态转发。 + * 消息会发送到所有订阅了 {@code /g/} 的客户端，实现效果相当于群聊 + * + * @param groupID 组ID + * @param message 发送的消息 + */ + @MessageMapping("/group/{groupID}") + public void group(@DestinationVariable int groupID, Message message) { + log.info("Receive group message: [" + groupID + " -> " + message.getName() + "]"); + Response response = new Response("Welcome to group " + groupID + ", " + message.getName() + "!"); + simpMessagingTemplate.convertAndSend("/g/" + groupID, response); + } + + /** + * 依据 {@code ChatMessage} 中的内容发送消息给特定用户，每个用户都订阅自己接受消息的端点 + * {@code /user//msg}，实现效果类似点对点聊天 + * + * @param chatMessage 聊天消息 + */ + @MessageMapping("/chat") + public void chat(ChatMessage chatMessage) { + log.info("Receive point-to-point chat message: [" + chatMessage.getFromUserID() + " -> " + chatMessage.getUserID() + ", " + chatMessage.getMessage() + "]"); + Response response = new Response("Receive message from user " + chatMessage.getFromUserID() + ": " + chatMessage.getMessage()); + simpMessagingTemplate.convertAndSendToUser(String.valueOf(chatMessage.getUserID()), "/msg", response); + } +} diff --git a/WebSocketServer/src/main/java/me/xlui/im/config/HandshakeInterceptor.java b/WebSocketServer/src/main/java/me/xlui/im/config/HandshakeInterceptor.java deleted file mode 100644 index c04c933..0000000 --- a/WebSocketServer/src/main/java/me/xlui/im/config/HandshakeInterceptor.java +++ /dev/null @@ -1,33 +0,0 @@ -package me.xlui.im.config; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.server.ServerHttpRequest; -import org.springframework.http.server.ServerHttpResponse; -import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor; - -import java.util.Map; - -public class HandshakeInterceptor extends HttpSessionHandshakeInterceptor { - private static Logger logger = LoggerFactory.getLogger("xlui"); - - /** - * WebSocket 握手前 - *

- * 可以设置数据到 attributes 中，并在 WebSocketHandler 的 session 中获取 - */ - @Override - public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map attributes) throws Exception { - logger.info("HandshakeInterceptor: beforeHandshake"); - logger.info("Attributes: " + attributes.toString()); - return super.beforeHandshake(request, response, wsHandler, attributes); - } - - // WebSocket 握手后 - @Override - public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Exception ex) { - logger.info("HandshakeInterceptor: afterHandshake"); - super.afterHandshake(request, response, wsHandler, ex); - } -} diff --git a/WebSocketServer/src/main/java/me/xlui/im/config/WebMvcConfig.java b/WebSocketServer/src/main/java/me/xlui/im/config/WebMvcConfig.java deleted file mode 100644 index 23b1d97..0000000 --- a/WebSocketServer/src/main/java/me/xlui/im/config/WebMvcConfig.java +++ /dev/null @@ -1,15 +0,0 @@ -package me.xlui.im.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; - -@Configuration -public class WebMvcConfig extends WebMvcConfigurerAdapter { - @Override - public void addViewControllers(ViewControllerRegistry registry) { - registry.addViewController("/broadcast").setViewName("/broadcast"); - registry.addViewController("/group").setViewName("/group"); - registry.addViewController("/chat").setViewName("/chat"); - } -} diff --git a/WebSocketServer/src/main/java/me/xlui/im/config/WebSocketConfig.java b/WebSocketServer/src/main/java/me/xlui/im/config/WebSocketConfig.java deleted file mode 100644 index 8639bb0..0000000 --- a/WebSocketServer/src/main/java/me/xlui/im/config/WebSocketConfig.java +++ /dev/null @@ -1,31 +0,0 @@ -package me.xlui.im.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.messaging.simp.config.MessageBrokerRegistry; -import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer; -import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; -import org.springframework.web.socket.config.annotation.StompEndpointRegistry; - -@Configuration -// 启用 Websocket 的消息代理 -@EnableWebSocketMessageBroker -public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer { - // 注册 STOMP 协议的节点（Endpoint），并映射为指定的 URL - // 我们使用 STOMP，所以不需要再实现 WebSocketHandler。 - // 实现 WebSocketHandler 的目的是接收和处理消息，STOMP 已经为我们做了这些。 - @Override - public void registerStompEndpoints(StompEndpointRegistry stompEndpointRegistry) { - // 注册 STOMP 协议的节点，并指定使用 SockJS 协议 - stompEndpointRegistry.addEndpoint("/im").addInterceptors(new HandshakeInterceptor()).withSockJS(); - } - - // 配置使用消息代理 - @Override - public void configureMessageBroker(MessageBrokerRegistry registry) { - // 统一配置消息代理，消息代理即订阅点，客户端通过订阅消息代理点接受消息 - registry.enableSimpleBroker("/b", "/g", "/user"); - - // 配置点对点消息的前缀 - registry.setUserDestinationPrefix("/user"); - } -} diff --git a/WebSocketServer/src/main/java/me/xlui/im/message/ChatMessage.java b/WebSocketServer/src/main/java/me/xlui/im/message/ChatMessage.java deleted file mode 100644 index 118bf5a..0000000 --- a/WebSocketServer/src/main/java/me/xlui/im/message/ChatMessage.java +++ /dev/null @@ -1,41 +0,0 @@ -package me.xlui.im.message; - -public class ChatMessage { - private int userID; - private int fromUserID; - private String message; - - public ChatMessage() { - super(); - } - - public ChatMessage(int userID, int fromUserID, String message) { - this.userID = userID; - this.fromUserID = fromUserID; - this.message = message; - } - - public int getUserID() { - return userID; - } - - public void setUserID(int userID) { - this.userID = userID; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public int getFromUserID() { - return fromUserID; - } - - public void setFromUserID(int fromUserID) { - this.fromUserID = fromUserID; - } -} diff --git a/WebSocketServer/src/main/java/me/xlui/im/message/Message.java b/WebSocketServer/src/main/java/me/xlui/im/message/Message.java deleted file mode 100644 index 77e94b9..0000000 --- a/WebSocketServer/src/main/java/me/xlui/im/message/Message.java +++ /dev/null @@ -1,12 +0,0 @@ -package me.xlui.im.message; - -/** - * 浏览器向服务端发送的消息应该用此类接受 - */ -public class Message { - private String name; - - public String getName() { - return name; - } -} diff --git a/WebSocketServer/src/main/java/me/xlui/im/message/Response.java b/WebSocketServer/src/main/java/me/xlui/im/message/Response.java deleted file mode 100644 index 97da996..0000000 --- a/WebSocketServer/src/main/java/me/xlui/im/message/Response.java +++ /dev/null @@ -1,16 +0,0 @@ -package me.xlui.im.message; - -/** - * 服务器向客户端发送此类消息 - */ -public class Response { - private String response; - - public Response(String response) { - this.response = response; - } - - public String getResponse() { - return response; - } -} diff --git a/WebSocketServer/src/main/java/me/xlui/im/web/WebSocketController.java b/WebSocketServer/src/main/java/me/xlui/im/web/WebSocketController.java deleted file mode 100644 index 05fe104..0000000 --- a/WebSocketServer/src/main/java/me/xlui/im/web/WebSocketController.java +++ /dev/null @@ -1,44 +0,0 @@ -package me.xlui.im.web; - -import me.xlui.im.message.ChatMessage; -import me.xlui.im.message.Message; -import me.xlui.im.message.Response; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.handler.annotation.DestinationVariable; -import org.springframework.messaging.handler.annotation.Header; -import org.springframework.messaging.handler.annotation.MessageMapping; -import org.springframework.messaging.handler.annotation.SendTo; -import org.springframework.messaging.simp.SimpMessagingTemplate; -import org.springframework.stereotype.Controller; - -@Controller -public class WebSocketController { - @Autowired - SimpMessagingTemplate simpMessagingTemplate; - private String token = "this is a token generated by your code!"; - - // 当客户端向服务器发送请求时，通过 `@MessageMapping` 映射 /broadcast 这个地址 - @MessageMapping("/broadcast") - // 当服务器有消息时，会对订阅了 @SendTo 中的路径的客户端发送消息 - @SendTo("/b") - public Response say(Message message, @Header(value = "authorization") String authorizationToken) { - if (authorizationToken.equals(token)) { - System.out.println("Token check success!!!"); - } else { - System.out.println("Token check failed!!!"); - } - return new Response("Welcome, " + message.getName() + "!"); - } - - @MessageMapping("/group/{groupID}") - public void group(@DestinationVariable int groupID, Message message) { - Response response = new Response("Welcome to group " + groupID + ", " + message.getName() + "!"); - simpMessagingTemplate.convertAndSend("/g/" + groupID, response); - } - - @MessageMapping("/chat") - public void chat(ChatMessage chatMessage) { - Response response = new Response("Receive message from user " + chatMessage.getFromUserID() + ": " + chatMessage.getMessage()); - simpMessagingTemplate.convertAndSendToUser(String.valueOf(chatMessage.getUserID()), "/msg", response); - } -} diff --git a/WebSocketServer/src/main/resources/static/jquery.js b/WebSocketServer/src/main/resources/static/jquery.js index ee652df..ecf39f1 100644 --- a/WebSocketServer/src/main/resources/static/jquery.js +++ b/WebSocketServer/src/main/resources/static/jquery.js @@ -13,18 +13,18 @@ * * Date: Thu May 12 15:04:36 2011 -0400 */ -(function( window, undefined ) { +(function (window, undefined) { // Use the correct document accordingly with window argument (sandbox) var document = window.document, navigator = window.navigator, location = window.location; - var jQuery = (function() { + var jQuery = (function () { // Define a local copy of jQuery - var jQuery = function( selector, context ) { + var jQuery = function (selector, context) { // The jQuery object is actually just the init constructor 'enhanced' - return new jQuery.fn.init( selector, context, rootjQuery ); + return new jQuery.fn.init(selector, context, rootjQuery); }, // Map over jQuery in case of overwrite @@ -90,23 +90,23 @@ jQuery.fn = jQuery.prototype = { constructor: jQuery, - init: function( selector, context, rootjQuery ) { + init: function (selector, context, rootjQuery) { var match, elem, ret, doc; // Handle $(""), $(null), or $(undefined) - if ( !selector ) { + if (!selector) { return this; } // Handle $(DOMElement) - if ( selector.nodeType ) { + if (selector.nodeType) { this.context = this[0] = selector; this.length = 1; return this; } // The body element only exists once, optimize finding it - if ( selector === "body" && !context && document.body ) { + if (selector === "body" && !context && document.body) { this.context = document; this[0] = document.body; this.selector = selector; @@ -115,55 +115,55 @@ } // Handle HTML strings - if ( typeof selector === "string" ) { + if (typeof selector === "string") { // Are we dealing with HTML string or an ID? - if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) { + if (selector.charAt(0) === "<" && selector.charAt(selector.length - 1) === ">" && selector.length >= 3) { // Assume that strings that start and end with <> are HTML and skip the regex check - match = [ null, selector, null ]; + match = [null, selector, null]; } else { - match = quickExpr.exec( selector ); + match = quickExpr.exec(selector); } // Verify a match, and that no context was specified for #id - if ( match && (match[1] || !context) ) { + if (match && (match[1] || !context)) { // HANDLE: $(html) -> $(array) - if ( match[1] ) { + if (match[1]) { context = context instanceof jQuery ? context[0] : context; doc = (context ? context.ownerDocument || context : document); // If a single string is passed in and it's a single tag // just do a createElement and skip the rest - ret = rsingleTag.exec( selector ); + ret = rsingleTag.exec(selector); - if ( ret ) { - if ( jQuery.isPlainObject( context ) ) { - selector = [ document.createElement( ret[1] ) ]; - jQuery.fn.attr.call( selector, context, true ); + if (ret) { + if (jQuery.isPlainObject(context)) { + selector = [document.createElement(ret[1])]; + jQuery.fn.attr.call(selector, context, true); } else { - selector = [ doc.createElement( ret[1] ) ]; + selector = [doc.createElement(ret[1])]; } } else { - ret = jQuery.buildFragment( [ match[1] ], [ doc ] ); + ret = jQuery.buildFragment([match[1]], [doc]); selector = (ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment).childNodes; } - return jQuery.merge( this, selector ); + return jQuery.merge(this, selector); // HANDLE: $("#id") } else { - elem = document.getElementById( match[2] ); + elem = document.getElementById(match[2]); // Check parentNode to catch when Blackberry 4.6 returns // nodes that are no longer in the document #6963 - if ( elem && elem.parentNode ) { + if (elem && elem.parentNode) { // Handle the case where IE and Opera return items // by name instead of ID - if ( elem.id !== match[2] ) { - return rootjQuery.find( selector ); + if (elem.id !== match[2]) { + return rootjQuery.find(selector); } // Otherwise, we inject the element directly into the jQuery object @@ -177,19 +177,19 @@ } // HANDLE: $(expr, $(...)) - } else if ( !context || context.jquery ) { - return (context || rootjQuery).find( selector ); + } else if (!context || context.jquery) { + return (context || rootjQuery).find(selector); // HANDLE: $(expr, context) // (which is just equivalent to: $(context).find(expr) } else { - return this.constructor( context ).find( selector ); + return this.constructor(context).find(selector); } // HANDLE: $(function) // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) { - return rootjQuery.ready( selector ); + } else if (jQuery.isFunction(selector)) { + return rootjQuery.ready(selector); } if (selector.selector !== undefined) { @@ -197,7 +197,7 @@ this.context = selector.context; } - return jQuery.makeArray( selector, this ); + return jQuery.makeArray(selector, this); }, // Start with an empty selector @@ -210,37 +210,37 @@ length: 0, // The number of elements contained in the matched element set - size: function() { + size: function () { return this.length; }, - toArray: function() { - return slice.call( this, 0 ); + toArray: function () { + return slice.call(this, 0); }, // Get the Nth element in the matched element set OR // Get the whole matched element set as a clean array - get: function( num ) { + get: function (num) { return num == null ? // Return a 'clean' array this.toArray() : // Return just the object - ( num < 0 ? this[ this.length + num ] : this[ num ] ); + (num < 0 ? this[this.length + num] : this[num]); }, // Take an array of elements and push it onto the stack // (returning the new matched element set) - pushStack: function( elems, name, selector ) { + pushStack: function (elems, name, selector) { // Build a new jQuery matched element set var ret = this.constructor(); - if ( jQuery.isArray( elems ) ) { - push.apply( ret, elems ); + if (jQuery.isArray(elems)) { + push.apply(ret, elems); } else { - jQuery.merge( ret, elems ); + jQuery.merge(ret, elems); } // Add the old object onto the stack (as a reference) @@ -248,9 +248,9 @@ ret.context = this.context; - if ( name === "find" ) { + if (name === "find") { ret.selector = this.selector + (this.selector ? " " : "") + selector; - } else if ( name ) { + } else if (name) { ret.selector = this.selector + "." + name + "(" + selector + ")"; } @@ -261,46 +261,46 @@ // Execute a callback for every element in the matched set. // (You can seed the arguments with an array of args, but this is // only used internally.) - each: function( callback, args ) { - return jQuery.each( this, callback, args ); + each: function (callback, args) { + return jQuery.each(this, callback, args); }, - ready: function( fn ) { + ready: function (fn) { // Attach the listeners jQuery.bindReady(); // Add the callback - readyList.done( fn ); + readyList.done(fn); return this; }, - eq: function( i ) { + eq: function (i) { return i === -1 ? - this.slice( i ) : - this.slice( i, +i + 1 ); + this.slice(i) : + this.slice(i, +i + 1); }, - first: function() { - return this.eq( 0 ); + first: function () { + return this.eq(0); }, - last: function() { - return this.eq( -1 ); + last: function () { + return this.eq(-1); }, - slice: function() { - return this.pushStack( slice.apply( this, arguments ), - "slice", slice.call(arguments).join(",") ); + slice: function () { + return this.pushStack(slice.apply(this, arguments), + "slice", slice.call(arguments).join(",")); }, - map: function( callback ) { - return this.pushStack( jQuery.map(this, function( elem, i ) { - return callback.call( elem, i, elem ); + map: function (callback) { + return this.pushStack(jQuery.map(this, function (elem, i) { + return callback.call(elem, i, elem); })); }, - end: function() { + end: function () { return this.prevObject || this.constructor(null); }, @@ -314,7 +314,7 @@ // Give the init function the jQuery prototype for later instantiation jQuery.fn.init.prototype = jQuery.fn; - jQuery.extend = jQuery.fn.extend = function() { + jQuery.extend = jQuery.fn.extend = function () { var options, name, src, copy, copyIsArray, clone, target = arguments[0] || {}, i = 1, @@ -322,7 +322,7 @@ deep = false; // Handle a deep copy situation - if ( typeof target === "boolean" ) { + if (typeof target === "boolean") { deep = target; target = arguments[1] || {}; // skip the boolean and the target @@ -330,32 +330,32 @@ } // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !jQuery.isFunction(target) ) { + if (typeof target !== "object" && !jQuery.isFunction(target)) { target = {}; } // extend jQuery itself if only one argument is passed - if ( length === i ) { + if (length === i) { target = this; --i; } - for ( ; i < length; i++ ) { + for (; i < length; i++) { // Only deal with non-null/undefined values - if ( (options = arguments[ i ]) != null ) { + if ((options = arguments[i]) != null) { // Extend the base object - for ( name in options ) { - src = target[ name ]; - copy = options[ name ]; + for (name in options) { + src = target[name]; + copy = options[name]; // Prevent never-ending loop - if ( target === copy ) { + if (target === copy) { continue; } // Recurse if we're merging plain objects or arrays - if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { - if ( copyIsArray ) { + if (deep && copy && (jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)))) { + if (copyIsArray) { copyIsArray = false; clone = src && jQuery.isArray(src) ? src : []; @@ -364,11 +364,11 @@ } // Never move original objects, clone them - target[ name ] = jQuery.extend( deep, clone, copy ); + target[name] = jQuery.extend(deep, clone, copy); // Don't bring in undefined values - } else if ( copy !== undefined ) { - target[ name ] = copy; + } else if (copy !== undefined) { + target[name] = copy; } } } @@ -379,12 +379,12 @@ }; jQuery.extend({ - noConflict: function( deep ) { - if ( window.$ === jQuery ) { + noConflict: function (deep) { + if (window.$ === jQuery) { window.$ = _$; } - if ( deep && window.jQuery === jQuery ) { + if (deep && window.jQuery === jQuery) { window.jQuery = _jQuery; } @@ -399,43 +399,43 @@ readyWait: 1, // Hold (or release) the ready event - holdReady: function( hold ) { - if ( hold ) { + holdReady: function (hold) { + if (hold) { jQuery.readyWait++; } else { - jQuery.ready( true ); + jQuery.ready(true); } }, // Handle when the DOM is ready - ready: function( wait ) { + ready: function (wait) { // Either a released hold or an DOMready/load event and not yet ready - if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) { + if ((wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady)) { // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( !document.body ) { - return setTimeout( jQuery.ready, 1 ); + if (!document.body) { + return setTimeout(jQuery.ready, 1); } // Remember that the DOM is ready jQuery.isReady = true; // If a normal DOM Ready event fired, decrement, and wait if need be - if ( wait !== true && --jQuery.readyWait > 0 ) { + if (wait !== true && --jQuery.readyWait > 0) { return; } // If there are functions bound, to execute - readyList.resolveWith( document, [ jQuery ] ); + readyList.resolveWith(document, [jQuery]); // Trigger any bound ready events - if ( jQuery.fn.trigger ) { - jQuery( document ).trigger( "ready" ).unbind( "ready" ); + if (jQuery.fn.trigger) { + jQuery(document).trigger("ready").unbind("ready"); } } }, - bindReady: function() { - if ( readyList ) { + bindReady: function () { + if (readyList) { return; } @@ -443,27 +443,27 @@ // Catch cases where $(document).ready() is called after the // browser event has already occurred. - if ( document.readyState === "complete" ) { + if (document.readyState === "complete") { // Handle it asynchronously to allow scripts the opportunity to delay ready - return setTimeout( jQuery.ready, 1 ); + return setTimeout(jQuery.ready, 1); } // Mozilla, Opera and webkit nightlies currently support this event - if ( document.addEventListener ) { + if (document.addEventListener) { // Use the handy event callback - document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false ); + document.addEventListener("DOMContentLoaded", DOMContentLoaded, false); // A fallback to window.onload, that will always work - window.addEventListener( "load", jQuery.ready, false ); + window.addEventListener("load", jQuery.ready, false); // If IE event model is used - } else if ( document.attachEvent ) { + } else if (document.attachEvent) { // ensure firing before onload, // maybe late but safe also for iframes - document.attachEvent( "onreadystatechange", DOMContentLoaded ); + document.attachEvent("onreadystatechange", DOMContentLoaded); // A fallback to window.onload, that will always work - window.attachEvent( "onload", jQuery.ready ); + window.attachEvent("onload", jQuery.ready); // If IE and not a frame // continually check to see if the document is ready @@ -471,9 +471,10 @@ try { toplevel = window.frameElement == null; - } catch(e) {} + } catch (e) { + } - if ( document.documentElement.doScroll && toplevel ) { + if (document.documentElement.doScroll && toplevel) { doScrollCheck(); } } @@ -482,41 +483,41 @@ // See test/unit/core.js for details concerning isFunction. // Since version 1.3, DOM methods and functions like alert // aren't supported. They return false on IE (#2968). - isFunction: function( obj ) { + isFunction: function (obj) { return jQuery.type(obj) === "function"; }, - isArray: Array.isArray || function( obj ) { + isArray: Array.isArray || function (obj) { return jQuery.type(obj) === "array"; }, // A crude way of determining if an object is a window - isWindow: function( obj ) { + isWindow: function (obj) { return obj && typeof obj === "object" && "setInterval" in obj; }, - isNaN: function( obj ) { - return obj == null || !rdigit.test( obj ) || isNaN( obj ); + isNaN: function (obj) { + return obj == null || !rdigit.test(obj) || isNaN(obj); }, - type: function( obj ) { + type: function (obj) { return obj == null ? - String( obj ) : - class2type[ toString.call(obj) ] || "object"; + String(obj) : + class2type[toString.call(obj)] || "object"; }, - isPlainObject: function( obj ) { + isPlainObject: function (obj) { // Must be an Object. // Because of IE, we also have to check the presence of the constructor property. // Make sure that DOM nodes and window objects don't pass through, as well - if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { + if (!obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow(obj)) { return false; } // Not own constructor property must be Object - if ( obj.constructor && + if (obj.constructor && !hasOwn.call(obj, "constructor") && - !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { + !hasOwn.call(obj.constructor.prototype, "isPrototypeOf")) { return false; } @@ -524,105 +525,107 @@ // if last one is own, then all properties are own. var key; - for ( key in obj ) {} + for (key in obj) { + } - return key === undefined || hasOwn.call( obj, key ); + return key === undefined || hasOwn.call(obj, key); }, - isEmptyObject: function( obj ) { - for ( var name in obj ) { + isEmptyObject: function (obj) { + for (var name in obj) { return false; } return true; }, - error: function( msg ) { + error: function (msg) { throw msg; }, - parseJSON: function( data ) { - if ( typeof data !== "string" || !data ) { + parseJSON: function (data) { + if (typeof data !== "string" || !data) { return null; } // Make sure leading/trailing whitespace is removed (IE can't handle it) - data = jQuery.trim( data ); + data = jQuery.trim(data); // Attempt to parse using the native JSON parser first - if ( window.JSON && window.JSON.parse ) { - return window.JSON.parse( data ); + if (window.JSON && window.JSON.parse) { + return window.JSON.parse(data); } // Make sure the incoming data is actual JSON // Logic borrowed from http://json.org/json2.js - if ( rvalidchars.test( data.replace( rvalidescape, "@" ) - .replace( rvalidtokens, "]" ) - .replace( rvalidbraces, "")) ) { + if (rvalidchars.test(data.replace(rvalidescape, "@") + .replace(rvalidtokens, "]") + .replace(rvalidbraces, ""))) { - return (new Function( "return " + data ))(); + return (new Function("return " + data))(); } - jQuery.error( "Invalid JSON: " + data ); + jQuery.error("Invalid JSON: " + data); }, // Cross-browser xml parsing // (xml & tmp used internally) - parseXML: function( data , xml , tmp ) { + parseXML: function (data, xml, tmp) { - if ( window.DOMParser ) { // Standard + if (window.DOMParser) { // Standard tmp = new DOMParser(); - xml = tmp.parseFromString( data , "text/xml" ); + xml = tmp.parseFromString(data, "text/xml"); } else { // IE - xml = new ActiveXObject( "Microsoft.XMLDOM" ); + xml = new ActiveXObject("Microsoft.XMLDOM"); xml.async = "false"; - xml.loadXML( data ); + xml.loadXML(data); } tmp = xml.documentElement; - if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) { - jQuery.error( "Invalid XML: " + data ); + if (!tmp || !tmp.nodeName || tmp.nodeName === "parsererror") { + jQuery.error("Invalid XML: " + data); } return xml; }, - noop: function() {}, + noop: function () { + }, // Evaluates a script in a global context // Workarounds based on findings by Jim Driscoll // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context - globalEval: function( data ) { - if ( data && rnotwhite.test( data ) ) { + globalEval: function (data) { + if (data && rnotwhite.test(data)) { // We use execScript on Internet Explorer // We use an anonymous function so that context is window // rather than jQuery in Firefox - ( window.execScript || function( data ) { - window[ "eval" ].call( window, data ); - } )( data ); + (window.execScript || function (data) { + window["eval"].call(window, data); + })(data); } }, - nodeName: function( elem, name ) { + nodeName: function (elem, name) { return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase(); }, // args is for internal usage only - each: function( object, callback, args ) { + each: function (object, callback, args) { var name, i = 0, length = object.length, - isObj = length === undefined || jQuery.isFunction( object ); + isObj = length === undefined || jQuery.isFunction(object); - if ( args ) { - if ( isObj ) { - for ( name in object ) { - if ( callback.apply( object[ name ], args ) === false ) { + if (args) { + if (isObj) { + for (name in object) { + if (callback.apply(object[name], args) === false) { break; } } } else { - for ( ; i < length; ) { - if ( callback.apply( object[ i++ ], args ) === false ) { + for (; i < length;) { + if (callback.apply(object[i++], args) === false) { break; } } @@ -630,15 +633,15 @@ // A special, fast, case for the most common use of each } else { - if ( isObj ) { - for ( name in object ) { - if ( callback.call( object[ name ], name, object[ name ] ) === false ) { + if (isObj) { + for (name in object) { + if (callback.call(object[name], name, object[name]) === false) { break; } } } else { - for ( ; i < length; ) { - if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) { + for (; i < length;) { + if (callback.call(object[i], i, object[i++]) === false) { break; } } @@ -650,48 +653,48 @@ // Use native String.trim function wherever possible trim: trim ? - function( text ) { + function (text) { return text == null ? "" : - trim.call( text ); + trim.call(text); } : // Otherwise use our own trimming functionality - function( text ) { + function (text) { return text == null ? "" : - text.toString().replace( trimLeft, "" ).replace( trimRight, "" ); + text.toString().replace(trimLeft, "").replace(trimRight, ""); }, // results is for internal usage only - makeArray: function( array, results ) { + makeArray: function (array, results) { var ret = results || []; - if ( array != null ) { + if (array != null) { // The window, strings (and functions) also have 'length' // The extra typeof function check is to prevent crashes // in Safari 2 (See: #3039) // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930 - var type = jQuery.type( array ); + var type = jQuery.type(array); - if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) { - push.call( ret, array ); + if (array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow(array)) { + push.call(ret, array); } else { - jQuery.merge( ret, array ); + jQuery.merge(ret, array); } } return ret; }, - inArray: function( elem, array ) { + inArray: function (elem, array) { - if ( indexOf ) { - return indexOf.call( array, elem ); + if (indexOf) { + return indexOf.call(array, elem); } - for ( var i = 0, length = array.length; i < length; i++ ) { - if ( array[ i ] === elem ) { + for (var i = 0, length = array.length; i < length; i++) { + if (array[i] === elem) { return i; } } @@ -699,18 +702,18 @@ return -1; }, - merge: function( first, second ) { + merge: function (first, second) { var i = first.length, j = 0; - if ( typeof second.length === "number" ) { - for ( var l = second.length; j < l; j++ ) { - first[ i++ ] = second[ j ]; + if (typeof second.length === "number") { + for (var l = second.length; j < l; j++) { + first[i++] = second[j]; } } else { - while ( second[j] !== undefined ) { - first[ i++ ] = second[ j++ ]; + while (second[j] !== undefined) { + first[i++] = second[j++]; } } @@ -719,16 +722,16 @@ return first; }, - grep: function( elems, callback, inv ) { + grep: function (elems, callback, inv) { var ret = [], retVal; inv = !!inv; // Go through the array, only saving the items // that pass the validator function - for ( var i = 0, length = elems.length; i < length; i++ ) { - retVal = !!callback( elems[ i ], i ); - if ( inv !== retVal ) { - ret.push( elems[ i ] ); + for (var i = 0, length = elems.length; i < length; i++) { + retVal = !!callback(elems[i], i); + if (inv !== retVal) { + ret.push(elems[i]); } } @@ -736,36 +739,36 @@ }, // arg is for internal usage only - map: function( elems, callback, arg ) { + map: function (elems, callback, arg) { var value, key, ret = [], i = 0, length = elems.length, // jquery objects are treated as arrays - isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ; + isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ((length > 0 && elems[0] && elems[length - 1]) || length === 0 || jQuery.isArray(elems)); // Go through the array, translating each of the items to their - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback( elems[ i ], i, arg ); + if (isArray) { + for (; i < length; i++) { + value = callback(elems[i], i, arg); - if ( value != null ) { - ret[ ret.length ] = value; + if (value != null) { + ret[ret.length] = value; } } // Go through every key on the object, } else { - for ( key in elems ) { - value = callback( elems[ key ], key, arg ); + for (key in elems) { + value = callback(elems[key], key, arg); - if ( value != null ) { - ret[ ret.length ] = value; + if (value != null) { + ret[ret.length] = value; } } } // Flatten any nested arrays - return ret.concat.apply( [], ret ); + return ret.concat.apply([], ret); }, // A global GUID counter for objects @@ -773,23 +776,23 @@ // Bind a function to a context, optionally partially applying any // arguments. - proxy: function( fn, context ) { - if ( typeof context === "string" ) { - var tmp = fn[ context ]; + proxy: function (fn, context) { + if (typeof context === "string") { + var tmp = fn[context]; context = fn; fn = tmp; } // Quick check to determine if target is callable, in the spec // this throws a TypeError, but we will just return undefined. - if ( !jQuery.isFunction( fn ) ) { + if (!jQuery.isFunction(fn)) { return undefined; } // Simulated bind - var args = slice.call( arguments, 2 ), - proxy = function() { - return fn.apply( context, args.concat( slice.call( arguments ) ) ); + var args = slice.call(arguments, 2), + proxy = function () { + return fn.apply(context, args.concat(slice.call(arguments))); }; // Set the guid of unique handler to the same of original handler, so it can be removed @@ -800,66 +803,67 @@ // Mutifunctional method to get and set values to a collection // The value/s can be optionally by executed if its a function - access: function( elems, key, value, exec, fn, pass ) { + access: function (elems, key, value, exec, fn, pass) { var length = elems.length; // Setting many attributes - if ( typeof key === "object" ) { - for ( var k in key ) { - jQuery.access( elems, k, key[k], exec, fn, value ); + if (typeof key === "object") { + for (var k in key) { + jQuery.access(elems, k, key[k], exec, fn, value); } return elems; } // Setting one attribute - if ( value !== undefined ) { + if (value !== undefined) { // Optionally, function values get executed if exec is true exec = !pass && exec && jQuery.isFunction(value); - for ( var i = 0; i < length; i++ ) { - fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); + for (var i = 0; i < length; i++) { + fn(elems[i], key, exec ? value.call(elems[i], i, fn(elems[i], key)) : value, pass); } return elems; } // Getting an attribute - return length ? fn( elems[0], key ) : undefined; + return length ? fn(elems[0], key) : undefined; }, - now: function() { + now: function () { return (new Date()).getTime(); }, // Use of jQuery.browser is frowned upon. // More details: http://docs.jquery.com/Utilities/jQuery.browser - uaMatch: function( ua ) { + uaMatch: function (ua) { ua = ua.toLowerCase(); - var match = rwebkit.exec( ua ) || - ropera.exec( ua ) || - rmsie.exec( ua ) || - ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) || + var match = rwebkit.exec(ua) || + ropera.exec(ua) || + rmsie.exec(ua) || + ua.indexOf("compatible") < 0 && rmozilla.exec(ua) || []; - return { browser: match[1] || "", version: match[2] || "0" }; + return {browser: match[1] || "", version: match[2] || "0"}; }, - sub: function() { - function jQuerySub( selector, context ) { - return new jQuerySub.fn.init( selector, context ); + sub: function () { + function jQuerySub(selector, context) { + return new jQuerySub.fn.init(selector, context); } - jQuery.extend( true, jQuerySub, this ); + + jQuery.extend(true, jQuerySub, this); jQuerySub.superclass = this; jQuerySub.fn = jQuerySub.prototype = this(); jQuerySub.fn.constructor = jQuerySub; jQuerySub.sub = this.sub; - jQuerySub.fn.init = function init( selector, context ) { - if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) { - context = jQuerySub( context ); + jQuerySub.fn.init = function init(selector, context) { + if (context && context instanceof jQuery && !(context instanceof jQuerySub)) { + context = jQuerySub(context); } - return jQuery.fn.init.call( this, selector, context, rootjQuerySub ); + return jQuery.fn.init.call(this, selector, context, rootjQuerySub); }; jQuerySub.fn.init.prototype = jQuerySub.fn; var rootjQuerySub = jQuerySub(document); @@ -870,23 +874,23 @@ }); // Populate the class2type map - jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) { - class2type[ "[object " + name + "]" ] = name.toLowerCase(); + jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function (i, name) { + class2type["[object " + name + "]"] = name.toLowerCase(); }); - browserMatch = jQuery.uaMatch( userAgent ); - if ( browserMatch.browser ) { - jQuery.browser[ browserMatch.browser ] = true; + browserMatch = jQuery.uaMatch(userAgent); + if (browserMatch.browser) { + jQuery.browser[browserMatch.browser] = true; jQuery.browser.version = browserMatch.version; } // Deprecated, use jQuery.browser.webkit instead - if ( jQuery.browser.webkit ) { + if (jQuery.browser.webkit) { jQuery.browser.safari = true; } // IE doesn't match non-breaking spaces with \s - if ( rnotwhite.test( "\xA0" ) ) { + if (rnotwhite.test("\xA0")) { trimLeft = /^[\s\xA0]+/; trimRight = /[\s\xA0]+$/; } @@ -895,17 +899,17 @@ rootjQuery = jQuery(document); // Cleanup functions for the document ready method - if ( document.addEventListener ) { - DOMContentLoaded = function() { - document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false ); + if (document.addEventListener) { + DOMContentLoaded = function () { + document.removeEventListener("DOMContentLoaded", DOMContentLoaded, false); jQuery.ready(); }; - } else if ( document.attachEvent ) { - DOMContentLoaded = function() { + } else if (document.attachEvent) { + DOMContentLoaded = function () { // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( document.readyState === "complete" ) { - document.detachEvent( "onreadystatechange", DOMContentLoaded ); + if (document.readyState === "complete") { + document.detachEvent("onreadystatechange", DOMContentLoaded); jQuery.ready(); } }; @@ -913,7 +917,7 @@ // The DOM ready check for Internet Explorer function doScrollCheck() { - if ( jQuery.isReady ) { + if (jQuery.isReady) { return; } @@ -921,8 +925,8 @@ // If IE is used, use the trick by Diego Perini // http://javascript.nwbox.com/IEContentLoaded/ document.documentElement.doScroll("left"); - } catch(e) { - setTimeout( doScrollCheck, 1 ); + } catch (e) { + setTimeout(doScrollCheck, 1); return; } @@ -937,13 +941,13 @@ var // Promise methods - promiseMethods = "done fail isResolved isRejected promise then always pipe".split( " " ), + promiseMethods = "done fail isResolved isRejected promise then always pipe".split(" "), // Static reference to slice sliceDeferred = [].slice; jQuery.extend({ // Create a simple deferred (one callbacks list) - _Deferred: function() { + _Deferred: function () { var // callbacks list callbacks = [], // stored [ context , args ] @@ -953,50 +957,49 @@ // flag to know if the deferred has been cancelled cancelled, // the deferred itself - deferred = { + deferred = { // done( f1, f2, ...) - done: function() { - if ( !cancelled ) { + done: function () { + if (!cancelled) { var args = arguments, i, length, elem, type, _fired; - if ( fired ) { + if (fired) { _fired = fired; fired = 0; } - for ( i = 0, length = args.length; i < length; i++ ) { - elem = args[ i ]; - type = jQuery.type( elem ); - if ( type === "array" ) { - deferred.done.apply( deferred, elem ); - } else if ( type === "function" ) { - callbacks.push( elem ); + for (i = 0, length = args.length; i < length; i++) { + elem = args[i]; + type = jQuery.type(elem); + if (type === "array") { + deferred.done.apply(deferred, elem); + } else if (type === "function") { + callbacks.push(elem); } } - if ( _fired ) { - deferred.resolveWith( _fired[ 0 ], _fired[ 1 ] ); + if (_fired) { + deferred.resolveWith(_fired[0], _fired[1]); } } return this; }, // resolve with given context and args - resolveWith: function( context, args ) { - if ( !cancelled && !fired && !firing ) { + resolveWith: function (context, args) { + if (!cancelled && !fired && !firing) { // make sure args are available (#8421) args = args || []; firing = 1; try { - while( callbacks[ 0 ] ) { - callbacks.shift().apply( context, args ); + while (callbacks[0]) { + callbacks.shift().apply(context, args); } - } - finally { - fired = [ context, args ]; + } finally { + fired = [context, args]; firing = 0; } } @@ -1004,18 +1007,18 @@ }, // resolve with this as context and given arguments - resolve: function() { - deferred.resolveWith( this, arguments ); + resolve: function () { + deferred.resolveWith(this, arguments); return this; }, // Has this deferred been resolved? - isResolved: function() { - return !!( firing || fired ); + isResolved: function () { + return !!(firing || fired); }, // Cancel - cancel: function() { + cancel: function () { cancelled = 1; callbacks = []; return this; @@ -1026,117 +1029,118 @@ }, // Full fledged deferred (two callbacks list) - Deferred: function( func ) { + Deferred: function (func) { var deferred = jQuery._Deferred(), failDeferred = jQuery._Deferred(), promise; // Add errorDeferred methods, then and promise - jQuery.extend( deferred, { - then: function( doneCallbacks, failCallbacks ) { - deferred.done( doneCallbacks ).fail( failCallbacks ); + jQuery.extend(deferred, { + then: function (doneCallbacks, failCallbacks) { + deferred.done(doneCallbacks).fail(failCallbacks); return this; }, - always: function() { - return deferred.done.apply( deferred, arguments ).fail.apply( this, arguments ); + always: function () { + return deferred.done.apply(deferred, arguments).fail.apply(this, arguments); }, fail: failDeferred.done, rejectWith: failDeferred.resolveWith, reject: failDeferred.resolve, isRejected: failDeferred.isResolved, - pipe: function( fnDone, fnFail ) { - return jQuery.Deferred(function( newDefer ) { - jQuery.each( { - done: [ fnDone, "resolve" ], - fail: [ fnFail, "reject" ] - }, function( handler, data ) { - var fn = data[ 0 ], - action = data[ 1 ], + pipe: function (fnDone, fnFail) { + return jQuery.Deferred(function (newDefer) { + jQuery.each({ + done: [fnDone, "resolve"], + fail: [fnFail, "reject"] + }, function (handler, data) { + var fn = data[0], + action = data[1], returned; - if ( jQuery.isFunction( fn ) ) { - deferred[ handler ](function() { - returned = fn.apply( this, arguments ); - if ( returned && jQuery.isFunction( returned.promise ) ) { - returned.promise().then( newDefer.resolve, newDefer.reject ); + if (jQuery.isFunction(fn)) { + deferred[handler](function () { + returned = fn.apply(this, arguments); + if (returned && jQuery.isFunction(returned.promise)) { + returned.promise().then(newDefer.resolve, newDefer.reject); } else { - newDefer[ action ]( returned ); + newDefer[action](returned); } }); } else { - deferred[ handler ]( newDefer[ action ] ); + deferred[handler](newDefer[action]); } }); }).promise(); }, // Get a promise for this deferred // If obj is provided, the promise aspect is added to the object - promise: function( obj ) { - if ( obj == null ) { - if ( promise ) { + promise: function (obj) { + if (obj == null) { + if (promise) { return promise; } promise = obj = {}; } var i = promiseMethods.length; - while( i-- ) { - obj[ promiseMethods[i] ] = deferred[ promiseMethods[i] ]; + while (i--) { + obj[promiseMethods[i]] = deferred[promiseMethods[i]]; } return obj; } }); // Make sure only one callback list will be used - deferred.done( failDeferred.cancel ).fail( deferred.cancel ); + deferred.done(failDeferred.cancel).fail(deferred.cancel); // Unexpose cancel delete deferred.cancel; // Call given func if any - if ( func ) { - func.call( deferred, deferred ); + if (func) { + func.call(deferred, deferred); } return deferred; }, // Deferred helper - when: function( firstParam ) { + when: function (firstParam) { var args = arguments, i = 0, length = args.length, count = length, - deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ? + deferred = length <= 1 && firstParam && jQuery.isFunction(firstParam.promise) ? firstParam : jQuery.Deferred(); - function resolveFunc( i ) { - return function( value ) { - args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value; - if ( !( --count ) ) { + + function resolveFunc(i) { + return function (value) { + args[i] = arguments.length > 1 ? sliceDeferred.call(arguments, 0) : value; + if (!(--count)) { // Strange bug in FF4: // Values changed onto the arguments object sometimes end up as undefined values // outside the $.when method. Cloning the object into a fresh array solves the issue - deferred.resolveWith( deferred, sliceDeferred.call( args, 0 ) ); + deferred.resolveWith(deferred, sliceDeferred.call(args, 0)); } }; } - if ( length > 1 ) { - for( ; i < length; i++ ) { - if ( args[ i ] && jQuery.isFunction( args[ i ].promise ) ) { - args[ i ].promise().then( resolveFunc(i), deferred.reject ); + + if (length > 1) { + for (; i < length; i++) { + if (args[i] && jQuery.isFunction(args[i].promise)) { + args[i].promise().then(resolveFunc(i), deferred.reject); } else { --count; } } - if ( !count ) { - deferred.resolveWith( deferred, args ); + if (!count) { + deferred.resolveWith(deferred, args); } - } else if ( deferred !== firstParam ) { - deferred.resolveWith( deferred, length ? [ firstParam ] : [] ); + } else if (deferred !== firstParam) { + deferred.resolveWith(deferred, length ? [firstParam] : []); } return deferred.promise(); } }); + jQuery.support = (function () { - jQuery.support = (function() { - - var div = document.createElement( "div" ), + var div = document.createElement("div"), documentElement = document.documentElement, all, a, @@ -1158,43 +1162,43 @@ div.setAttribute("className", "t"); div.innerHTML = "
a"; - all = div.getElementsByTagName( "*" ); - a = div.getElementsByTagName( "a" )[ 0 ]; + all = div.getElementsByTagName("*"); + a = div.getElementsByTagName("a")[0]; // Can't get basic test support - if ( !all || !all.length || !a ) { + if (!all || !all.length || !a) { return {}; } // First batch of supports tests - select = document.createElement( "select" ); - opt = select.appendChild( document.createElement("option") ); - input = div.getElementsByTagName( "input" )[ 0 ]; + select = document.createElement("select"); + opt = select.appendChild(document.createElement("option")); + input = div.getElementsByTagName("input")[0]; support = { // IE strips leading whitespace when .innerHTML is used - leadingWhitespace: ( div.firstChild.nodeType === 3 ), + leadingWhitespace: (div.firstChild.nodeType === 3), // Make sure that tbody elements aren't automatically inserted // IE will insert them into empty tables - tbody: !div.getElementsByTagName( "tbody" ).length, + tbody: !div.getElementsByTagName("tbody").length, // Make sure that link elements get serialized correctly by innerHTML // This requires a wrapper element in IE - htmlSerialize: !!div.getElementsByTagName( "link" ).length, + htmlSerialize: !!div.getElementsByTagName("link").length, // Get the style information from getAttribute // (IE uses .cssText instead) - style: /top/.test( a.getAttribute("style") ), + style: /top/.test(a.getAttribute("style")), // Make sure that URLs aren't manipulated // (IE normalizes it by default) - hrefNormalized: ( a.getAttribute( "href" ) === "/a" ), + hrefNormalized: (a.getAttribute("href") === "/a"), // Make sure that element opacity exists // (IE uses filter instead) // Use a regex to work around a WebKit issue. See #5145 - opacity: /^0.55$/.test( a.style.opacity ), + opacity: /^0.55$/.test(a.style.opacity), // Verify style float existence // (IE uses styleFloat instead of cssFloat) @@ -1203,7 +1207,7 @@ // Make sure that if no value is specified for a checkbox // that it defaults to "on". // (WebKit defaults to "" instead) - checkOn: ( input.value === "on" ), + checkOn: (input.value === "on"), // Make sure that a selected-by-default option has a working selected property. // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) @@ -1225,7 +1229,7 @@ // Make sure checked status is properly cloned input.checked = true; - support.noCloneChecked = input.cloneNode( true ).checked; + support.noCloneChecked = input.cloneNode(true).checked; // Make sure that the options inside disabled selects aren't marked as disabled // (WebKit marks them as disabled) @@ -1236,18 +1240,18 @@ // Fails in Internet Explorer try { delete div.test; - } catch( e ) { + } catch (e) { support.deleteExpando = false; } - if ( !div.addEventListener && div.attachEvent && div.fireEvent ) { - div.attachEvent( "onclick", function click() { + if (!div.addEventListener && div.attachEvent && div.fireEvent) { + div.attachEvent("onclick", function click() { // Cloning a node shouldn't copy over any // bound event handlers (IE does this) support.noCloneEvent = false; - div.detachEvent( "onclick", click ); + div.detachEvent("onclick", click); }); - div.cloneNode( true ).fireEvent( "onclick" ); + div.cloneNode(true).fireEvent("onclick"); } // Check if a radio maintains it's value @@ -1258,12 +1262,12 @@ support.radioValue = input.value === "t"; input.setAttribute("checked", "checked"); - div.appendChild( input ); + div.appendChild(input); fragment = document.createDocumentFragment(); - fragment.appendChild( div.firstChild ); + fragment.appendChild(div.firstChild); // WebKit doesn't clone checked state correctly in fragments - support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked; + support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked; div.innerHTML = ""; @@ -1271,7 +1275,7 @@ div.style.width = div.style.paddingLeft = "1px"; // We use our own, invisible, body - body = document.createElement( "body" ); + body = document.createElement("body"); bodyStyle = { visibility: "hidden", width: 0, @@ -1281,11 +1285,11 @@ // Set background to avoid IE crashes when removing (#9028) background: "none" }; - for ( i in bodyStyle ) { - body.style[ i ] = bodyStyle[ i ]; + for (i in bodyStyle) { + body.style[i] = bodyStyle[i]; } - body.appendChild( div ); - documentElement.insertBefore( body, documentElement.firstChild ); + body.appendChild(div); + documentElement.insertBefore(body, documentElement.firstChild); // Check if a disconnected checkbox will retain its checked // value of true after appended to the DOM (IE6/7) @@ -1293,24 +1297,24 @@ support.boxModel = div.offsetWidth === 2; - if ( "zoom" in div.style ) { + if ("zoom" in div.style) { // Check if natively block-level elements act like inline-block // elements when setting their display to 'inline' and giving // them layout // (IE < 8 does this) div.style.display = "inline"; div.style.zoom = 1; - support.inlineBlockNeedsLayout = ( div.offsetWidth === 2 ); + support.inlineBlockNeedsLayout = (div.offsetWidth === 2); // Check if elements with layout shrink-wrap their children // (IE 6 does this) div.style.display = ""; div.innerHTML = "

"; - support.shrinkWrapBlocks = ( div.offsetWidth !== 2 ); + support.shrinkWrapBlocks = (div.offsetWidth !== 2); } div.innerHTML = "
t
"; - tds = div.getElementsByTagName( "td" ); + tds = div.getElementsByTagName("td"); // Check if table cells still have offsetWidth/Height when they are set // to display:none and there are still other visible table cells in a @@ -1319,14 +1323,14 @@ // display:none (it is still safe to use offsets if a parent element is // hidden; don safety goggles and see bug #4512 for more information). // (only IE 8 fails this test) - isSupported = ( tds[ 0 ].offsetHeight === 0 ); + isSupported = (tds[0].offsetHeight === 0); - tds[ 0 ].style.display = ""; - tds[ 1 ].style.display = "none"; + tds[0].style.display = ""; + tds[1].style.display = "none"; // Check if empty table cells still have offsetWidth/Height // (IE < 8 fail this test) - support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 ); + support.reliableHiddenOffsets = isSupported && (tds[0].offsetHeight === 0); div.innerHTML = ""; // Check if div with explicit width and no margin-right incorrectly @@ -1334,18 +1338,18 @@ // info see bug #3333 // Fails in WebKit before Feb 2011 nightlies // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right - if ( document.defaultView && document.defaultView.getComputedStyle ) { - marginDiv = document.createElement( "div" ); + if (document.defaultView && document.defaultView.getComputedStyle) { + marginDiv = document.createElement("div"); marginDiv.style.width = "0"; marginDiv.style.marginRight = "0"; - div.appendChild( marginDiv ); + div.appendChild(marginDiv); support.reliableMarginRight = - ( parseInt( ( document.defaultView.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0; + (parseInt((document.defaultView.getComputedStyle(marginDiv, null) || {marginRight: 0}).marginRight, 10) || 0) === 0; } // Remove the body element we added body.innerHTML = ""; - documentElement.removeChild( body ); + documentElement.removeChild(body); // Technique from Juriy Zaytsev // http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/ @@ -1353,19 +1357,19 @@ // are used, namely in IE. Short-circuiting here helps us to // avoid an eval call (in setAttribute) which can cause CSP // to go haywire. See: https://developer.mozilla.org/en/Security/CSP - if ( div.attachEvent ) { - for( i in { + if (div.attachEvent) { + for (i in { submit: 1, change: 1, focusin: 1 - } ) { + }) { eventName = "on" + i; - isSupported = ( eventName in div ); - if ( !isSupported ) { - div.setAttribute( eventName, "return;" ); - isSupported = ( typeof div[ eventName ] === "function" ); + isSupported = (eventName in div); + if (!isSupported) { + div.setAttribute(eventName, "return;"); + isSupported = (typeof div[eventName] === "function"); } - support[ i + "Bubbles" ] = isSupported; + support[i + "Bubbles"] = isSupported; } } @@ -1376,8 +1380,6 @@ jQuery.boxModel = jQuery.support.boxModel; - - var rbrace = /^(?:\{.*\}|\[.*\])$/, rmultiDash = /([a-z])([A-Z])/g; @@ -1389,7 +1391,7 @@ // Unique for each copy of jQuery on the page // Non-digits removed to match rinlinejQuery - expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ), + expando: "jQuery" + (jQuery.fn.jquery + Math.random()).replace(/\D/g, ""), // The following elements throw uncatchable exceptions if you // attempt to add expando properties to them. @@ -1400,14 +1402,14 @@ "applet": true }, - hasData: function( elem ) { - elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ]; + hasData: function (elem) { + elem = elem.nodeType ? jQuery.cache[elem[jQuery.expando]] : elem[jQuery.expando]; - return !!elem && !isEmptyDataObject( elem ); + return !!elem && !isEmptyDataObject(elem); }, - data: function( elem, name, data, pvt /* Internal Use Only */ ) { - if ( !jQuery.acceptData( elem ) ) { + data: function (elem, name, data, pvt /* Internal Use Only */) { + if (!jQuery.acceptData(elem)) { return; } @@ -1423,74 +1425,74 @@ // Only defining an ID for JS objects if its cache already exists allows // the code to shortcut on the same path as a DOM node with no cache - id = isNode ? elem[ jQuery.expando ] : elem[ jQuery.expando ] && jQuery.expando; + id = isNode ? elem[jQuery.expando] : elem[jQuery.expando] && jQuery.expando; // Avoid doing any more work than we need to when trying to get data on an // object that has no data at all - if ( (!id || (pvt && id && !cache[ id ][ internalKey ])) && getByName && data === undefined ) { + if ((!id || (pvt && id && !cache[id][internalKey])) && getByName && data === undefined) { return; } - if ( !id ) { + if (!id) { // Only DOM nodes need a new unique ID for each element since their data // ends up in the global cache - if ( isNode ) { - elem[ jQuery.expando ] = id = ++jQuery.uuid; + if (isNode) { + elem[jQuery.expando] = id = ++jQuery.uuid; } else { id = jQuery.expando; } } - if ( !cache[ id ] ) { - cache[ id ] = {}; + if (!cache[id]) { + cache[id] = {}; // TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery // metadata on plain JS objects when the object is serialized using // JSON.stringify - if ( !isNode ) { - cache[ id ].toJSON = jQuery.noop; + if (!isNode) { + cache[id].toJSON = jQuery.noop; } } // An object can be passed to jQuery.data instead of a key/value pair; this gets // shallow copied over onto the existing cache - if ( typeof name === "object" || typeof name === "function" ) { - if ( pvt ) { - cache[ id ][ internalKey ] = jQuery.extend(cache[ id ][ internalKey ], name); + if (typeof name === "object" || typeof name === "function") { + if (pvt) { + cache[id][internalKey] = jQuery.extend(cache[id][internalKey], name); } else { - cache[ id ] = jQuery.extend(cache[ id ], name); + cache[id] = jQuery.extend(cache[id], name); } } - thisCache = cache[ id ]; + thisCache = cache[id]; // Internal jQuery data is stored in a separate object inside the object's data // cache in order to avoid key collisions between internal data and user-defined // data - if ( pvt ) { - if ( !thisCache[ internalKey ] ) { - thisCache[ internalKey ] = {}; + if (pvt) { + if (!thisCache[internalKey]) { + thisCache[internalKey] = {}; } - thisCache = thisCache[ internalKey ]; + thisCache = thisCache[internalKey]; } - if ( data !== undefined ) { - thisCache[ jQuery.camelCase( name ) ] = data; + if (data !== undefined) { + thisCache[jQuery.camelCase(name)] = data; } // TODO: This is a hack for 1.5 ONLY. It will be removed in 1.6. Users should // not attempt to inspect the internal events object using jQuery.data, as this // internal data object is undocumented and subject to change. - if ( name === "events" && !thisCache[name] ) { - return thisCache[ internalKey ] && thisCache[ internalKey ].events; + if (name === "events" && !thisCache[name]) { + return thisCache[internalKey] && thisCache[internalKey].events; } - return getByName ? thisCache[ jQuery.camelCase( name ) ] : thisCache; + return getByName ? thisCache[jQuery.camelCase(name)] : thisCache; }, - removeData: function( elem, name, pvt /* Internal Use Only */ ) { - if ( !jQuery.acceptData( elem ) ) { + removeData: function (elem, name, pvt /* Internal Use Only */) { + if (!jQuery.acceptData(elem)) { return; } @@ -1500,91 +1502,91 @@ cache = isNode ? jQuery.cache : elem, // See jQuery.data for more information - id = isNode ? elem[ jQuery.expando ] : jQuery.expando; + id = isNode ? elem[jQuery.expando] : jQuery.expando; // If there is already no cache entry for this object, there is no // purpose in continuing - if ( !cache[ id ] ) { + if (!cache[id]) { return; } - if ( name ) { - var thisCache = pvt ? cache[ id ][ internalKey ] : cache[ id ]; + if (name) { + var thisCache = pvt ? cache[id][internalKey] : cache[id]; - if ( thisCache ) { - delete thisCache[ name ]; + if (thisCache) { + delete thisCache[name]; // If there is no data left in the cache, we want to continue // and let the cache object itself get destroyed - if ( !isEmptyDataObject(thisCache) ) { + if (!isEmptyDataObject(thisCache)) { return; } } } // See jQuery.data for more information - if ( pvt ) { - delete cache[ id ][ internalKey ]; + if (pvt) { + delete cache[id][internalKey]; // Don't destroy the parent cache unless the internal data object // had been the only thing left in it - if ( !isEmptyDataObject(cache[ id ]) ) { + if (!isEmptyDataObject(cache[id])) { return; } } - var internalCache = cache[ id ][ internalKey ]; + var internalCache = cache[id][internalKey]; // Browsers that fail expando deletion also refuse to delete expandos on // the window, but it will allow it on all other JS objects; other browsers // don't care - if ( jQuery.support.deleteExpando || cache != window ) { - delete cache[ id ]; + if (jQuery.support.deleteExpando || cache != window) { + delete cache[id]; } else { - cache[ id ] = null; + cache[id] = null; } // We destroyed the entire user cache at once because it's faster than // iterating through each key, but we need to continue to persist internal // data if it existed - if ( internalCache ) { - cache[ id ] = {}; + if (internalCache) { + cache[id] = {}; // TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery // metadata on plain JS objects when the object is serialized using // JSON.stringify - if ( !isNode ) { - cache[ id ].toJSON = jQuery.noop; + if (!isNode) { + cache[id].toJSON = jQuery.noop; } - cache[ id ][ internalKey ] = internalCache; + cache[id][internalKey] = internalCache; // Otherwise, we need to eliminate the expando on the node to avoid // false lookups in the cache for entries that no longer exist - } else if ( isNode ) { + } else if (isNode) { // IE does not allow us to delete expando properties from nodes, // nor does it have a removeAttribute function on Document nodes; // we must handle all of these cases - if ( jQuery.support.deleteExpando ) { - delete elem[ jQuery.expando ]; - } else if ( elem.removeAttribute ) { - elem.removeAttribute( jQuery.expando ); + if (jQuery.support.deleteExpando) { + delete elem[jQuery.expando]; + } else if (elem.removeAttribute) { + elem.removeAttribute(jQuery.expando); } else { - elem[ jQuery.expando ] = null; + elem[jQuery.expando] = null; } } }, // For internal use only. - _data: function( elem, name, data ) { - return jQuery.data( elem, name, data, true ); + _data: function (elem, name, data) { + return jQuery.data(elem, name, data, true); }, // A method for determining if a DOM node can handle the data expando - acceptData: function( elem ) { - if ( elem.nodeName ) { - var match = jQuery.noData[ elem.nodeName.toLowerCase() ]; + acceptData: function (elem) { + if (elem.nodeName) { + var match = jQuery.noData[elem.nodeName.toLowerCase()]; - if ( match ) { + if (match) { return !(match === true || elem.getAttribute("classid") !== match); } } @@ -1594,22 +1596,22 @@ }); jQuery.fn.extend({ - data: function( key, value ) { + data: function (key, value) { var data = null; - if ( typeof key === "undefined" ) { - if ( this.length ) { - data = jQuery.data( this[0] ); + if (typeof key === "undefined") { + if (this.length) { + data = jQuery.data(this[0]); - if ( this[0].nodeType === 1 ) { + if (this[0].nodeType === 1) { var attr = this[0].attributes, name; - for ( var i = 0, l = attr.length; i < l; i++ ) { + for (var i = 0, l = attr.length; i < l; i++) { name = attr[i].name; - if ( name.indexOf( "data-" ) === 0 ) { - name = jQuery.camelCase( name.substring(5) ); + if (name.indexOf("data-") === 0) { + name = jQuery.camelCase(name.substring(5)); - dataAttr( this[0], name, data[ name ] ); + dataAttr(this[0], name, data[name]); } } } @@ -1617,67 +1619,68 @@ return data; - } else if ( typeof key === "object" ) { - return this.each(function() { - jQuery.data( this, key ); + } else if (typeof key === "object") { + return this.each(function () { + jQuery.data(this, key); }); } var parts = key.split("."); parts[1] = parts[1] ? "." + parts[1] : ""; - if ( value === undefined ) { + if (value === undefined) { data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); // Try to fetch any internally stored data first - if ( data === undefined && this.length ) { - data = jQuery.data( this[0], key ); - data = dataAttr( this[0], key, data ); + if (data === undefined && this.length) { + data = jQuery.data(this[0], key); + data = dataAttr(this[0], key, data); } return data === undefined && parts[1] ? - this.data( parts[0] ) : + this.data(parts[0]) : data; } else { - return this.each(function() { - var $this = jQuery( this ), - args = [ parts[0], value ]; + return this.each(function () { + var $this = jQuery(this), + args = [parts[0], value]; - $this.triggerHandler( "setData" + parts[1] + "!", args ); - jQuery.data( this, key, value ); - $this.triggerHandler( "changeData" + parts[1] + "!", args ); + $this.triggerHandler("setData" + parts[1] + "!", args); + jQuery.data(this, key, value); + $this.triggerHandler("changeData" + parts[1] + "!", args); }); } }, - removeData: function( key ) { - return this.each(function() { - jQuery.removeData( this, key ); + removeData: function (key) { + return this.each(function () { + jQuery.removeData(this, key); }); } }); - function dataAttr( elem, key, data ) { + function dataAttr(elem, key, data) { // If nothing was found internally, try to fetch any // data from the HTML5 data-* attribute - if ( data === undefined && elem.nodeType === 1 ) { - var name = "data-" + key.replace( rmultiDash, "$1-$2" ).toLowerCase(); + if (data === undefined && elem.nodeType === 1) { + var name = "data-" + key.replace(rmultiDash, "$1-$2").toLowerCase(); - data = elem.getAttribute( name ); + data = elem.getAttribute(name); - if ( typeof data === "string" ) { + if (typeof data === "string") { try { data = data === "true" ? true : data === "false" ? false : data === "null" ? null : - !jQuery.isNaN( data ) ? parseFloat( data ) : - rbrace.test( data ) ? jQuery.parseJSON( data ) : + !jQuery.isNaN(data) ? parseFloat(data) : + rbrace.test(data) ? jQuery.parseJSON(data) : data; - } catch( e ) {} + } catch (e) { + } // Make sure we set the data so it isn't changed later - jQuery.data( elem, key, data ); + jQuery.data(elem, key, data); } else { data = undefined; @@ -1690,9 +1693,9 @@ // TODO: This is a hack for 1.5 ONLY to allow objects with a single toJSON // property to be considered empty objects; this property always exists in // order to make sure JSON.stringify does not expose internal metadata - function isEmptyDataObject( obj ) { - for ( var name in obj ) { - if ( name !== "toJSON" ) { + function isEmptyDataObject(obj) { + for (var name in obj) { + if (name !== "toJSON") { return false; } } @@ -1701,146 +1704,144 @@ } - - - function handleQueueMarkDefer( elem, type, src ) { + function handleQueueMarkDefer(elem, type, src) { var deferDataKey = type + "defer", queueDataKey = type + "queue", markDataKey = type + "mark", - defer = jQuery.data( elem, deferDataKey, undefined, true ); - if ( defer && - ( src === "queue" || !jQuery.data( elem, queueDataKey, undefined, true ) ) && - ( src === "mark" || !jQuery.data( elem, markDataKey, undefined, true ) ) ) { + defer = jQuery.data(elem, deferDataKey, undefined, true); + if (defer && + (src === "queue" || !jQuery.data(elem, queueDataKey, undefined, true)) && + (src === "mark" || !jQuery.data(elem, markDataKey, undefined, true))) { // Give room for hard-coded callbacks to fire first // and eventually mark/queue something else on the element - setTimeout( function() { - if ( !jQuery.data( elem, queueDataKey, undefined, true ) && - !jQuery.data( elem, markDataKey, undefined, true ) ) { - jQuery.removeData( elem, deferDataKey, true ); + setTimeout(function () { + if (!jQuery.data(elem, queueDataKey, undefined, true) && + !jQuery.data(elem, markDataKey, undefined, true)) { + jQuery.removeData(elem, deferDataKey, true); defer.resolve(); } - }, 0 ); + }, 0); } } jQuery.extend({ - _mark: function( elem, type ) { - if ( elem ) { + _mark: function (elem, type) { + if (elem) { type = (type || "fx") + "mark"; - jQuery.data( elem, type, (jQuery.data(elem,type,undefined,true) || 0) + 1, true ); + jQuery.data(elem, type, (jQuery.data(elem, type, undefined, true) || 0) + 1, true); } }, - _unmark: function( force, elem, type ) { - if ( force !== true ) { + _unmark: function (force, elem, type) { + if (force !== true) { type = elem; elem = force; force = false; } - if ( elem ) { + if (elem) { type = type || "fx"; var key = type + "mark", - count = force ? 0 : ( (jQuery.data( elem, key, undefined, true) || 1 ) - 1 ); - if ( count ) { - jQuery.data( elem, key, count, true ); + count = force ? 0 : ((jQuery.data(elem, key, undefined, true) || 1) - 1); + if (count) { + jQuery.data(elem, key, count, true); } else { - jQuery.removeData( elem, key, true ); - handleQueueMarkDefer( elem, type, "mark" ); + jQuery.removeData(elem, key, true); + handleQueueMarkDefer(elem, type, "mark"); } } }, - queue: function( elem, type, data ) { - if ( elem ) { + queue: function (elem, type, data) { + if (elem) { type = (type || "fx") + "queue"; - var q = jQuery.data( elem, type, undefined, true ); + var q = jQuery.data(elem, type, undefined, true); // Speed up dequeue by getting out quickly if this is just a lookup - if ( data ) { - if ( !q || jQuery.isArray(data) ) { - q = jQuery.data( elem, type, jQuery.makeArray(data), true ); + if (data) { + if (!q || jQuery.isArray(data)) { + q = jQuery.data(elem, type, jQuery.makeArray(data), true); } else { - q.push( data ); + q.push(data); } } return q || []; } }, - dequeue: function( elem, type ) { + dequeue: function (elem, type) { type = type || "fx"; - var queue = jQuery.queue( elem, type ), + var queue = jQuery.queue(elem, type), fn = queue.shift(), defer; // If the fx queue is dequeued, always remove the progress sentinel - if ( fn === "inprogress" ) { + if (fn === "inprogress") { fn = queue.shift(); } - if ( fn ) { + if (fn) { // Add a progress sentinel to prevent the fx queue from being // automatically dequeued - if ( type === "fx" ) { + if (type === "fx") { queue.unshift("inprogress"); } - fn.call(elem, function() { + fn.call(elem, function () { jQuery.dequeue(elem, type); }); } - if ( !queue.length ) { - jQuery.removeData( elem, type + "queue", true ); - handleQueueMarkDefer( elem, type, "queue" ); + if (!queue.length) { + jQuery.removeData(elem, type + "queue", true); + handleQueueMarkDefer(elem, type, "queue"); } } }); jQuery.fn.extend({ - queue: function( type, data ) { - if ( typeof type !== "string" ) { + queue: function (type, data) { + if (typeof type !== "string") { data = type; type = "fx"; } - if ( data === undefined ) { - return jQuery.queue( this[0], type ); + if (data === undefined) { + return jQuery.queue(this[0], type); } - return this.each(function() { - var queue = jQuery.queue( this, type, data ); + return this.each(function () { + var queue = jQuery.queue(this, type, data); - if ( type === "fx" && queue[0] !== "inprogress" ) { - jQuery.dequeue( this, type ); + if (type === "fx" && queue[0] !== "inprogress") { + jQuery.dequeue(this, type); } }); }, - dequeue: function( type ) { - return this.each(function() { - jQuery.dequeue( this, type ); + dequeue: function (type) { + return this.each(function () { + jQuery.dequeue(this, type); }); }, // Based off of the plugin by Clint Helfers, with permission. // http://blindsignals.com/index.php/2009/07/jquery-delay/ - delay: function( time, type ) { + delay: function (time, type) { time = jQuery.fx ? jQuery.fx.speeds[time] || time : time; type = type || "fx"; - return this.queue( type, function() { + return this.queue(type, function () { var elem = this; - setTimeout(function() { - jQuery.dequeue( elem, type ); - }, time ); + setTimeout(function () { + jQuery.dequeue(elem, type); + }, time); }); }, - clearQueue: function( type ) { - return this.queue( type || "fx", [] ); + clearQueue: function (type) { + return this.queue(type || "fx", []); }, // Get a promise resolved when queues of a certain type // are emptied (fx is the type by default) - promise: function( type, object ) { - if ( typeof type !== "string" ) { + promise: function (type, object) { + if (typeof type !== "string") { object = type; type = undefined; } @@ -1853,18 +1854,20 @@ queueDataKey = type + "queue", markDataKey = type + "mark", tmp; + function resolve() { - if ( !( --count ) ) { - defer.resolveWith( elements, [ elements ] ); + if (!(--count)) { + defer.resolveWith(elements, [elements]); } } - while( i-- ) { - if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) || - ( jQuery.data( elements[ i ], queueDataKey, undefined, true ) || - jQuery.data( elements[ i ], markDataKey, undefined, true ) ) && - jQuery.data( elements[ i ], deferDataKey, jQuery._Deferred(), true ) )) { + + while (i--) { + if ((tmp = jQuery.data(elements[i], deferDataKey, undefined, true) || + (jQuery.data(elements[i], queueDataKey, undefined, true) || + jQuery.data(elements[i], markDataKey, undefined, true)) && + jQuery.data(elements[i], deferDataKey, jQuery._Deferred(), true))) { count++; - tmp.done( resolve ); + tmp.done(resolve); } } resolve(); @@ -1873,8 +1876,6 @@ }); - - var rclass = /[\n\t\r]/g, rspace = /\s+/, rreturn = /\r/g, @@ -1886,59 +1887,60 @@ formHook, boolHook; jQuery.fn.extend({ - attr: function( name, value ) { - return jQuery.access( this, name, value, true, jQuery.attr ); + attr: function (name, value) { + return jQuery.access(this, name, value, true, jQuery.attr); }, - removeAttr: function( name ) { - return this.each(function() { - jQuery.removeAttr( this, name ); + removeAttr: function (name) { + return this.each(function () { + jQuery.removeAttr(this, name); }); }, - prop: function( name, value ) { - return jQuery.access( this, name, value, true, jQuery.prop ); + prop: function (name, value) { + return jQuery.access(this, name, value, true, jQuery.prop); }, - removeProp: function( name ) { - name = jQuery.propFix[ name ] || name; - return this.each(function() { + removeProp: function (name) { + name = jQuery.propFix[name] || name; + return this.each(function () { // try/catch handles cases where IE balks (such as removing a property on window) try { - this[ name ] = undefined; - delete this[ name ]; - } catch( e ) {} + this[name] = undefined; + delete this[name]; + } catch (e) { + } }); }, - addClass: function( value ) { - if ( jQuery.isFunction( value ) ) { - return this.each(function(i) { + addClass: function (value) { + if (jQuery.isFunction(value)) { + return this.each(function (i) { var self = jQuery(this); - self.addClass( value.call(this, i, self.attr("class") || "") ); + self.addClass(value.call(this, i, self.attr("class") || "")); }); } - if ( value && typeof value === "string" ) { - var classNames = (value || "").split( rspace ); + if (value && typeof value === "string") { + var classNames = (value || "").split(rspace); - for ( var i = 0, l = this.length; i < l; i++ ) { + for (var i = 0, l = this.length; i < l; i++) { var elem = this[i]; - if ( elem.nodeType === 1 ) { - if ( !elem.className ) { + if (elem.nodeType === 1) { + if (!elem.className) { elem.className = value; } else { var className = " " + elem.className + " ", setClass = elem.className; - for ( var c = 0, cl = classNames.length; c < cl; c++ ) { - if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) { + for (var c = 0, cl = classNames.length; c < cl; c++) { + if (className.indexOf(" " + classNames[c] + " ") < 0) { setClass += " " + classNames[c]; } } - elem.className = jQuery.trim( setClass ); + elem.className = jQuery.trim(setClass); } } } @@ -1947,27 +1949,27 @@ return this; }, - removeClass: function( value ) { - if ( jQuery.isFunction(value) ) { - return this.each(function(i) { + removeClass: function (value) { + if (jQuery.isFunction(value)) { + return this.each(function (i) { var self = jQuery(this); - self.removeClass( value.call(this, i, self.attr("class")) ); + self.removeClass(value.call(this, i, self.attr("class"))); }); } - if ( (value && typeof value === "string") || value === undefined ) { - var classNames = (value || "").split( rspace ); + if ((value && typeof value === "string") || value === undefined) { + var classNames = (value || "").split(rspace); - for ( var i = 0, l = this.length; i < l; i++ ) { + for (var i = 0, l = this.length; i < l; i++) { var elem = this[i]; - if ( elem.nodeType === 1 && elem.className ) { - if ( value ) { + if (elem.nodeType === 1 && elem.className) { + if (value) { var className = (" " + elem.className + " ").replace(rclass, " "); - for ( var c = 0, cl = classNames.length; c < cl; c++ ) { + for (var c = 0, cl = classNames.length; c < cl; c++) { className = className.replace(" " + classNames[c] + " ", " "); } - elem.className = jQuery.trim( className ); + elem.className = jQuery.trim(className); } else { elem.className = ""; @@ -1979,48 +1981,48 @@ return this; }, - toggleClass: function( value, stateVal ) { + toggleClass: function (value, stateVal) { var type = typeof value, isBool = typeof stateVal === "boolean"; - if ( jQuery.isFunction( value ) ) { - return this.each(function(i) { + if (jQuery.isFunction(value)) { + return this.each(function (i) { var self = jQuery(this); - self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal ); + self.toggleClass(value.call(this, i, self.attr("class"), stateVal), stateVal); }); } - return this.each(function() { - if ( type === "string" ) { + return this.each(function () { + if (type === "string") { // toggle individual class names var className, i = 0, - self = jQuery( this ), + self = jQuery(this), state = stateVal, - classNames = value.split( rspace ); + classNames = value.split(rspace); - while ( (className = classNames[ i++ ]) ) { + while ((className = classNames[i++])) { // check each className given, space seperated list - state = isBool ? state : !self.hasClass( className ); - self[ state ? "addClass" : "removeClass" ]( className ); + state = isBool ? state : !self.hasClass(className); + self[state ? "addClass" : "removeClass"](className); } - } else if ( type === "undefined" || type === "boolean" ) { - if ( this.className ) { + } else if (type === "undefined" || type === "boolean") { + if (this.className) { // store className if set - jQuery._data( this, "__className__", this.className ); + jQuery._data(this, "__className__", this.className); } // toggle whole className - this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || ""; + this.className = this.className || value === false ? "" : jQuery._data(this, "__className__") || ""; } }); }, - hasClass: function( selector ) { + hasClass: function (selector) { var className = " " + selector + " "; - for ( var i = 0, l = this.length; i < l; i++ ) { - if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { + for (var i = 0, l = this.length; i < l; i++) { + if ((" " + this[i].className + " ").replace(rclass, " ").indexOf(className) > -1) { return true; } } @@ -2028,15 +2030,15 @@ return false; }, - val: function( value ) { + val: function (value) { var hooks, ret, elem = this[0]; - if ( !arguments.length ) { - if ( elem ) { - hooks = jQuery.valHooks[ elem.nodeName.toLowerCase() ] || jQuery.valHooks[ elem.type ]; + if (!arguments.length) { + if (elem) { + hooks = jQuery.valHooks[elem.nodeName.toLowerCase()] || jQuery.valHooks[elem.type]; - if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) { + if (hooks && "get" in hooks && (ret = hooks.get(elem, "value")) !== undefined) { return ret; } @@ -2046,36 +2048,36 @@ return undefined; } - var isFunction = jQuery.isFunction( value ); + var isFunction = jQuery.isFunction(value); - return this.each(function( i ) { + return this.each(function (i) { var self = jQuery(this), val; - if ( this.nodeType !== 1 ) { + if (this.nodeType !== 1) { return; } - if ( isFunction ) { - val = value.call( this, i, self.val() ); + if (isFunction) { + val = value.call(this, i, self.val()); } else { val = value; } // Treat null/undefined as ""; convert numbers to string - if ( val == null ) { + if (val == null) { val = ""; - } else if ( typeof val === "number" ) { + } else if (typeof val === "number") { val += ""; - } else if ( jQuery.isArray( val ) ) { - val = jQuery.map(val, function ( value ) { + } else if (jQuery.isArray(val)) { + val = jQuery.map(val, function (value) { return value == null ? "" : value + ""; }); } - hooks = jQuery.valHooks[ this.nodeName.toLowerCase() ] || jQuery.valHooks[ this.type ]; + hooks = jQuery.valHooks[this.nodeName.toLowerCase()] || jQuery.valHooks[this.type]; // If set returns undefined, fall back to normal setting - if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) { + if (!hooks || !("set" in hooks) || hooks.set(this, val, "value") === undefined) { this.value = val; } }); @@ -2085,7 +2087,7 @@ jQuery.extend({ valHooks: { option: { - get: function( elem ) { + get: function (elem) { // attributes.value is undefined in Blackberry 4.7 but // uses .value. See #6932 var val = elem.attributes.value; @@ -2093,7 +2095,7 @@ } }, select: { - get: function( elem ) { + get: function (elem) { var value, index = elem.selectedIndex, values = [], @@ -2101,47 +2103,47 @@ one = elem.type === "select-one"; // Nothing was selected - if ( index < 0 ) { + if (index < 0) { return null; } // Loop through all the selected options - for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { - var option = options[ i ]; + for (var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++) { + var option = options[i]; // Don't return options that are disabled or in a disabled optgroup - if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && - (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) { + if (option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && + (!option.parentNode.disabled || !jQuery.nodeName(option.parentNode, "optgroup"))) { // Get the specific value for the option - value = jQuery( option ).val(); + value = jQuery(option).val(); // We don't need an array for one selects - if ( one ) { + if (one) { return value; } // Multi-Selects return an array - values.push( value ); + values.push(value); } } // Fixes Bug #2551 -- select.val() broken in IE after form.reset() - if ( one && !values.length && options.length ) { - return jQuery( options[ index ] ).val(); + if (one && !values.length && options.length) { + return jQuery(options[index]).val(); } return values; }, - set: function( elem, value ) { - var values = jQuery.makeArray( value ); + set: function (elem, value) { + var values = jQuery.makeArray(value); - jQuery(elem).find("option").each(function() { - this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0; + jQuery(elem).find("option").each(function () { + this.selected = jQuery.inArray(jQuery(this).val(), values) >= 0; }); - if ( !values.length ) { + if (!values.length) { elem.selectedIndex = -1; } return values; @@ -2165,64 +2167,64 @@ tabindex: "tabIndex" }, - attr: function( elem, name, value, pass ) { + attr: function (elem, name, value, pass) { var nType = elem.nodeType; // don't get/set attributes on text, comment and attribute nodes - if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { + if (!elem || nType === 3 || nType === 8 || nType === 2) { return undefined; } - if ( pass && name in jQuery.attrFn ) { - return jQuery( elem )[ name ]( value ); + if (pass && name in jQuery.attrFn) { + return jQuery(elem)[name](value); } // Fallback to prop when attributes are not supported - if ( !("getAttribute" in elem) ) { - return jQuery.prop( elem, name, value ); + if (!("getAttribute" in elem)) { + return jQuery.prop(elem, name, value); } var ret, hooks, - notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); + notxml = nType !== 1 || !jQuery.isXMLDoc(elem); // Normalize the name if needed - name = notxml && jQuery.attrFix[ name ] || name; + name = notxml && jQuery.attrFix[name] || name; - hooks = jQuery.attrHooks[ name ]; + hooks = jQuery.attrHooks[name]; - if ( !hooks ) { + if (!hooks) { // Use boolHook for boolean attributes - if ( rboolean.test( name ) && - (typeof value === "boolean" || value === undefined || value.toLowerCase() === name.toLowerCase()) ) { + if (rboolean.test(name) && + (typeof value === "boolean" || value === undefined || value.toLowerCase() === name.toLowerCase())) { hooks = boolHook; // Use formHook for forms and if the name contains certain characters - } else if ( formHook && (jQuery.nodeName( elem, "form" ) || rinvalidChar.test( name )) ) { + } else if (formHook && (jQuery.nodeName(elem, "form") || rinvalidChar.test(name))) { hooks = formHook; } } - if ( value !== undefined ) { + if (value !== undefined) { - if ( value === null ) { - jQuery.removeAttr( elem, name ); + if (value === null) { + jQuery.removeAttr(elem, name); return undefined; - } else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) { + } else if (hooks && "set" in hooks && notxml && (ret = hooks.set(elem, value, name)) !== undefined) { return ret; } else { - elem.setAttribute( name, "" + value ); + elem.setAttribute(name, "" + value); return value; } - } else if ( hooks && "get" in hooks && notxml ) { - return hooks.get( elem, name ); + } else if (hooks && "get" in hooks && notxml) { + return hooks.get(elem, name); } else { - ret = elem.getAttribute( name ); + ret = elem.getAttribute(name); // Non-existent attributes return null, we normalize to undefined return ret === null ? @@ -2231,39 +2233,39 @@ } }, - removeAttr: function( elem, name ) { + removeAttr: function (elem, name) { var propName; - if ( elem.nodeType === 1 ) { - name = jQuery.attrFix[ name ] || name; + if (elem.nodeType === 1) { + name = jQuery.attrFix[name] || name; - if ( jQuery.support.getSetAttribute ) { + if (jQuery.support.getSetAttribute) { // Use removeAttribute in browsers that support it - elem.removeAttribute( name ); + elem.removeAttribute(name); } else { - jQuery.attr( elem, name, "" ); - elem.removeAttributeNode( elem.getAttributeNode( name ) ); + jQuery.attr(elem, name, ""); + elem.removeAttributeNode(elem.getAttributeNode(name)); } // Set corresponding property to false for boolean attributes - if ( rboolean.test( name ) && (propName = jQuery.propFix[ name ] || name) in elem ) { - elem[ propName ] = false; + if (rboolean.test(name) && (propName = jQuery.propFix[name] || name) in elem) { + elem[propName] = false; } } }, attrHooks: { type: { - set: function( elem, value ) { + set: function (elem, value) { // We can't allow the type property to be changed (since it causes problems in IE) - if ( rtype.test( elem.nodeName ) && elem.parentNode ) { - jQuery.error( "type property can't be changed" ); - } else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) { + if (rtype.test(elem.nodeName) && elem.parentNode) { + jQuery.error("type property can't be changed"); + } else if (!jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input")) { // Setting the type on a radio button after the value resets the value in IE6-9 // Reset value to it's default in case type is set after value // This is for element creation var val = elem.value; - elem.setAttribute( "type", value ); - if ( val ) { + elem.setAttribute("type", value); + if (val) { elem.value = val; } return value; @@ -2271,14 +2273,14 @@ } }, tabIndex: { - get: function( elem ) { + get: function (elem) { // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ var attributeNode = elem.getAttributeNode("tabIndex"); return attributeNode && attributeNode.specified ? - parseInt( attributeNode.value, 10 ) : - rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? + parseInt(attributeNode.value, 10) : + rfocusable.test(elem.nodeName) || rclickable.test(elem.nodeName) && elem.href ? 0 : undefined; } @@ -2300,36 +2302,36 @@ contenteditable: "contentEditable" }, - prop: function( elem, name, value ) { + prop: function (elem, name, value) { var nType = elem.nodeType; // don't get/set properties on text, comment and attribute nodes - if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { + if (!elem || nType === 3 || nType === 8 || nType === 2) { return undefined; } var ret, hooks, - notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); + notxml = nType !== 1 || !jQuery.isXMLDoc(elem); // Try to normalize/fix the name - name = notxml && jQuery.propFix[ name ] || name; + name = notxml && jQuery.propFix[name] || name; - hooks = jQuery.propHooks[ name ]; + hooks = jQuery.propHooks[name]; - if ( value !== undefined ) { - if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { + if (value !== undefined) { + if (hooks && "set" in hooks && (ret = hooks.set(elem, value, name)) !== undefined) { return ret; } else { - return (elem[ name ] = value); + return (elem[name] = value); } } else { - if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== undefined ) { + if (hooks && "get" in hooks && (ret = hooks.get(elem, name)) !== undefined) { return ret; } else { - return elem[ name ]; + return elem[name]; } } }, @@ -2339,27 +2341,27 @@ // Hook for boolean attributes boolHook = { - get: function( elem, name ) { + get: function (elem, name) { // Align boolean attributes with corresponding properties - return elem[ jQuery.propFix[ name ] || name ] ? + return elem[jQuery.propFix[name] || name] ? name.toLowerCase() : undefined; }, - set: function( elem, value, name ) { + set: function (elem, value, name) { var propName; - if ( value === false ) { + if (value === false) { // Remove boolean attributes when set to false - jQuery.removeAttr( elem, name ); + jQuery.removeAttr(elem, name); } else { // value is true since we know at this point it's type boolean and not false // Set boolean attributes to the same name and set the DOM property - propName = jQuery.propFix[ name ] || name; - if ( propName in elem ) { + propName = jQuery.propFix[name] || name; + if (propName in elem) { // Only set the IDL specifically if it already exists on the element - elem[ propName ] = value; + elem[propName] = value; } - elem.setAttribute( name, name.toLowerCase() ); + elem.setAttribute(name, name.toLowerCase()); } return name; } @@ -2368,15 +2370,15 @@ // Use the value property for back compat // Use the formHook for button elements in IE6/7 (#1954) jQuery.attrHooks.value = { - get: function( elem, name ) { - if ( formHook && jQuery.nodeName( elem, "button" ) ) { - return formHook.get( elem, name ); + get: function (elem, name) { + if (formHook && jQuery.nodeName(elem, "button")) { + return formHook.get(elem, name); } return elem.value; }, - set: function( elem, value, name ) { - if ( formHook && jQuery.nodeName( elem, "button" ) ) { - return formHook.set( elem, value, name ); + set: function (elem, value, name) { + if (formHook && jQuery.nodeName(elem, "button")) { + return formHook.set(elem, value, name); } // Does not return so that setAttribute is also used elem.value = value; @@ -2384,26 +2386,26 @@ }; // IE6/7 do not support getting/setting some attributes with get/setAttribute - if ( !jQuery.support.getSetAttribute ) { + if (!jQuery.support.getSetAttribute) { // propFix is more comprehensive and contains all fixes jQuery.attrFix = jQuery.propFix; // Use this for any attribute on a form in IE6/7 formHook = jQuery.attrHooks.name = jQuery.valHooks.button = { - get: function( elem, name ) { + get: function (elem, name) { var ret; - ret = elem.getAttributeNode( name ); + ret = elem.getAttributeNode(name); // Return undefined if nodeValue is empty string return ret && ret.nodeValue !== "" ? ret.nodeValue : undefined; }, - set: function( elem, value, name ) { + set: function (elem, value, name) { // Check form objects in IE (multiple bugs related) // Only use nodeValue if the attribute node exists on the form - var ret = elem.getAttributeNode( name ); - if ( ret ) { + var ret = elem.getAttributeNode(name); + if (ret) { ret.nodeValue = value; return value; } @@ -2412,11 +2414,11 @@ // Set width and height to auto instead of 0 on empty string( Bug #8150 ) // This is for removals - jQuery.each([ "width", "height" ], function( i, name ) { - jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { - set: function( elem, value ) { - if ( value === "" ) { - elem.setAttribute( name, "auto" ); + jQuery.each(["width", "height"], function (i, name) { + jQuery.attrHooks[name] = jQuery.extend(jQuery.attrHooks[name], { + set: function (elem, value) { + if (value === "") { + elem.setAttribute(name, "auto"); return value; } } @@ -2426,25 +2428,25 @@ // Some attributes require a special call on IE - if ( !jQuery.support.hrefNormalized ) { - jQuery.each([ "href", "src", "width", "height" ], function( i, name ) { - jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { - get: function( elem ) { - var ret = elem.getAttribute( name, 2 ); + if (!jQuery.support.hrefNormalized) { + jQuery.each(["href", "src", "width", "height"], function (i, name) { + jQuery.attrHooks[name] = jQuery.extend(jQuery.attrHooks[name], { + get: function (elem) { + var ret = elem.getAttribute(name, 2); return ret === null ? undefined : ret; } }); }); } - if ( !jQuery.support.style ) { + if (!jQuery.support.style) { jQuery.attrHooks.style = { - get: function( elem ) { + get: function (elem) { // Return undefined in the case of empty string // Normalize to lowercase since IE uppercases css property names return elem.style.cssText.toLowerCase() || undefined; }, - set: function( elem, value ) { + set: function (elem, value) { return (elem.style.cssText = "" + value); } }; @@ -2452,16 +2454,16 @@ // Safari mis-reports the default selected property of an option // Accessing the parent's selectedIndex property fixes it - if ( !jQuery.support.optSelected ) { - jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, { - get: function( elem ) { + if (!jQuery.support.optSelected) { + jQuery.propHooks.selected = jQuery.extend(jQuery.propHooks.selected, { + get: function (elem) { var parent = elem.parentNode; - if ( parent ) { + if (parent) { parent.selectedIndex; // Make sure that it also works with optgroups, see #5701 - if ( parent.parentNode ) { + if (parent.parentNode) { parent.parentNode.selectedIndex; } } @@ -2470,36 +2472,34 @@ } // Radios and checkboxes getter/setter - if ( !jQuery.support.checkOn ) { - jQuery.each([ "radio", "checkbox" ], function() { - jQuery.valHooks[ this ] = { - get: function( elem ) { + if (!jQuery.support.checkOn) { + jQuery.each(["radio", "checkbox"], function () { + jQuery.valHooks[this] = { + get: function (elem) { // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified return elem.getAttribute("value") === null ? "on" : elem.value; } }; }); } - jQuery.each([ "radio", "checkbox" ], function() { - jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], { - set: function( elem, value ) { - if ( jQuery.isArray( value ) ) { - return (elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0); + jQuery.each(["radio", "checkbox"], function () { + jQuery.valHooks[this] = jQuery.extend(jQuery.valHooks[this], { + set: function (elem, value) { + if (jQuery.isArray(value)) { + return (elem.checked = jQuery.inArray(jQuery(elem).val(), value) >= 0); } } }); }); - - var hasOwn = Object.prototype.hasOwnProperty, rnamespaces = /\.(.*)$/, rformElems = /^(?:textarea|input|select)$/i, rperiod = /\./g, rspaces = / /g, rescape = /[^\w\s.|`]/g, - fcleanup = function( nm ) { + fcleanup = function (nm) { return nm.replace(rescape, "\\$&"); }; @@ -2512,52 +2512,52 @@ // Bind an event to an element // Original by Dean Edwards - add: function( elem, types, handler, data ) { - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + add: function (elem, types, handler, data) { + if (elem.nodeType === 3 || elem.nodeType === 8) { return; } - if ( handler === false ) { + if (handler === false) { handler = returnFalse; - } else if ( !handler ) { + } else if (!handler) { // Fixes bug #7229. Fix recommended by jdalton return; } var handleObjIn, handleObj; - if ( handler.handler ) { + if (handler.handler) { handleObjIn = handler; handler = handleObjIn.handler; } // Make sure that the function being executed has a unique ID - if ( !handler.guid ) { + if (!handler.guid) { handler.guid = jQuery.guid++; } // Init the element's event structure - var elemData = jQuery._data( elem ); + var elemData = jQuery._data(elem); // If no elemData is found then we must be trying to bind to one of the // banned noData elements - if ( !elemData ) { + if (!elemData) { return; } var events = elemData.events, eventHandle = elemData.handle; - if ( !events ) { + if (!events) { elemData.events = events = {}; } - if ( !eventHandle ) { - elemData.handle = eventHandle = function( e ) { + if (!eventHandle) { + elemData.handle = eventHandle = function (e) { // Discard the second event of a jQuery.event.trigger() and // when an event is called after a page has unloaded return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ? - jQuery.event.handle.apply( eventHandle.elem, arguments ) : + jQuery.event.handle.apply(eventHandle.elem, arguments) : undefined; }; } @@ -2572,13 +2572,13 @@ var type, i = 0, namespaces; - while ( (type = types[ i++ ]) ) { + while ((type = types[i++])) { handleObj = handleObjIn ? jQuery.extend({}, handleObjIn) : - { handler: handler, data: data }; + {handler: handler, data: data}; // Namespaced event handlers - if ( type.indexOf(".") > -1 ) { + if (type.indexOf(".") > -1) { namespaces = type.split("."); type = namespaces.shift(); handleObj.namespace = namespaces.slice(0).sort().join("."); @@ -2589,45 +2589,45 @@ } handleObj.type = type; - if ( !handleObj.guid ) { + if (!handleObj.guid) { handleObj.guid = handler.guid; } // Get the current list of functions bound to this event - var handlers = events[ type ], - special = jQuery.event.special[ type ] || {}; + var handlers = events[type], + special = jQuery.event.special[type] || {}; // Init the event handler queue - if ( !handlers ) { - handlers = events[ type ] = []; + if (!handlers) { + handlers = events[type] = []; // Check for a special event handler // Only use addEventListener/attachEvent if the special // events handler returns false - if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + if (!special.setup || special.setup.call(elem, data, namespaces, eventHandle) === false) { // Bind the global event handler to the element - if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle, false ); + if (elem.addEventListener) { + elem.addEventListener(type, eventHandle, false); - } else if ( elem.attachEvent ) { - elem.attachEvent( "on" + type, eventHandle ); + } else if (elem.attachEvent) { + elem.attachEvent("on" + type, eventHandle); } } } - if ( special.add ) { - special.add.call( elem, handleObj ); + if (special.add) { + special.add.call(elem, handleObj); - if ( !handleObj.handler.guid ) { + if (!handleObj.handler.guid) { handleObj.handler.guid = handler.guid; } } // Add the function to the element's handler list - handlers.push( handleObj ); + handlers.push(handleObj); // Keep track of which events have been used, for event optimization - jQuery.event.global[ type ] = true; + jQuery.event.global[type] = true; } // Nullify elem to prevent memory leaks in IE @@ -2637,36 +2637,36 @@ global: {}, // Detach an event or set of events from an element - remove: function( elem, types, handler, pos ) { + remove: function (elem, types, handler, pos) { // don't do events on text and comment nodes - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + if (elem.nodeType === 3 || elem.nodeType === 8) { return; } - if ( handler === false ) { + if (handler === false) { handler = returnFalse; } var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType, - elemData = jQuery.hasData( elem ) && jQuery._data( elem ), + elemData = jQuery.hasData(elem) && jQuery._data(elem), events = elemData && elemData.events; - if ( !elemData || !events ) { + if (!elemData || !events) { return; } // types is actually an event object here - if ( types && types.type ) { + if (types && types.type) { handler = types.handler; types = types.type; } // Unbind all events for the element - if ( !types || typeof types === "string" && types.charAt(0) === "." ) { + if (!types || typeof types === "string" && types.charAt(0) === ".") { types = types || ""; - for ( type in events ) { - jQuery.event.remove( elem, type + types ); + for (type in events) { + jQuery.event.remove(elem, type + types); } return; @@ -2676,86 +2676,86 @@ // jQuery(...).unbind("mouseover mouseout", fn); types = types.split(" "); - while ( (type = types[ i++ ]) ) { + while ((type = types[i++])) { origType = type; handleObj = null; all = type.indexOf(".") < 0; namespaces = []; - if ( !all ) { + if (!all) { // Namespaced event handlers namespaces = type.split("."); type = namespaces.shift(); namespace = new RegExp("(^|\\.)" + - jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)"); + jQuery.map(namespaces.slice(0).sort(), fcleanup).join("\\.(?:.*\\.)?") + "(\\.|$)"); } - eventType = events[ type ]; + eventType = events[type]; - if ( !eventType ) { + if (!eventType) { continue; } - if ( !handler ) { - for ( j = 0; j < eventType.length; j++ ) { - handleObj = eventType[ j ]; + if (!handler) { + for (j = 0; j < eventType.length; j++) { + handleObj = eventType[j]; - if ( all || namespace.test( handleObj.namespace ) ) { - jQuery.event.remove( elem, origType, handleObj.handler, j ); - eventType.splice( j--, 1 ); + if (all || namespace.test(handleObj.namespace)) { + jQuery.event.remove(elem, origType, handleObj.handler, j); + eventType.splice(j--, 1); } } continue; } - special = jQuery.event.special[ type ] || {}; + special = jQuery.event.special[type] || {}; - for ( j = pos || 0; j < eventType.length; j++ ) { - handleObj = eventType[ j ]; + for (j = pos || 0; j < eventType.length; j++) { + handleObj = eventType[j]; - if ( handler.guid === handleObj.guid ) { + if (handler.guid === handleObj.guid) { // remove the given handler for the given type - if ( all || namespace.test( handleObj.namespace ) ) { - if ( pos == null ) { - eventType.splice( j--, 1 ); + if (all || namespace.test(handleObj.namespace)) { + if (pos == null) { + eventType.splice(j--, 1); } - if ( special.remove ) { - special.remove.call( elem, handleObj ); + if (special.remove) { + special.remove.call(elem, handleObj); } } - if ( pos != null ) { + if (pos != null) { break; } } } // remove generic event handler if no more handlers exist - if ( eventType.length === 0 || pos != null && eventType.length === 1 ) { - if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) { - jQuery.removeEvent( elem, type, elemData.handle ); + if (eventType.length === 0 || pos != null && eventType.length === 1) { + if (!special.teardown || special.teardown.call(elem, namespaces) === false) { + jQuery.removeEvent(elem, type, elemData.handle); } ret = null; - delete events[ type ]; + delete events[type]; } } // Remove the expando if it's no longer used - if ( jQuery.isEmptyObject( events ) ) { + if (jQuery.isEmptyObject(events)) { var handle = elemData.handle; - if ( handle ) { + if (handle) { handle.elem = null; } delete elemData.events; delete elemData.handle; - if ( jQuery.isEmptyObject( elemData ) ) { - jQuery.removeData( elem, undefined, true ); + if (jQuery.isEmptyObject(elemData)) { + jQuery.removeData(elem, undefined, true); } } }, @@ -2768,26 +2768,26 @@ "changeData": true }, - trigger: function( event, data, elem, onlyHandlers ) { + trigger: function (event, data, elem, onlyHandlers) { // Event object or event type var type = event.type || event, namespaces = [], exclusive; - if ( type.indexOf("!") >= 0 ) { + if (type.indexOf("!") >= 0) { // Exclusive events trigger only for the exact event (no namespaces) type = type.slice(0, -1); exclusive = true; } - if ( type.indexOf(".") >= 0 ) { + if (type.indexOf(".") >= 0) { // Namespaced trigger; create a regexp to match event type in handle() namespaces = type.split("."); type = namespaces.shift(); namespaces.sort(); } - if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) { + if ((!elem || jQuery.event.customEvent[type]) && !jQuery.event.global[type]) { // No jQuery handlers for this event type, and it can't have inline handlers return; } @@ -2795,11 +2795,11 @@ // Caller can pass in an Event, Object, or just an event type string event = typeof event === "object" ? // jQuery.Event object - event[ jQuery.expando ] ? event : + event[jQuery.expando] ? event : // Object literal - new jQuery.Event( type, event ) : + new jQuery.Event(type, event) : // Just the event type (string) - new jQuery.Event( type ); + new jQuery.Event(type); event.type = type; event.exclusive = exclusive; @@ -2807,29 +2807,29 @@ event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)"); // triggerHandler() and global events don't bubble or run the default action - if ( onlyHandlers || !elem ) { + if (onlyHandlers || !elem) { event.preventDefault(); event.stopPropagation(); } // Handle a global trigger - if ( !elem ) { + if (!elem) { // TODO: Stop taunting the data cache; remove global events and always attach to document - jQuery.each( jQuery.cache, function() { + jQuery.each(jQuery.cache, function () { // internalKey variable is just used to make it easier to find // and potentially change this stuff later; currently it just // points to jQuery.expando var internalKey = jQuery.expando, - internalCache = this[ internalKey ]; - if ( internalCache && internalCache.events && internalCache.events[ type ] ) { - jQuery.event.trigger( event, data, internalCache.handle.elem ); + internalCache = this[internalKey]; + if (internalCache && internalCache.events && internalCache.events[type]) { + jQuery.event.trigger(event, data, internalCache.handle.elem); } }); return; } // Don't do events on text and comment nodes - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + if (elem.nodeType === 3 || elem.nodeType === 8) { return; } @@ -2838,8 +2838,8 @@ event.target = elem; // Clone any incoming data and prepend the event, creating the handler arg list - data = data ? jQuery.makeArray( data ) : []; - data.unshift( event ); + data = data ? jQuery.makeArray(data) : []; + data.unshift(event); var cur = elem, // IE doesn't like method names with a colon (#3533, #8272) @@ -2847,50 +2847,51 @@ // Fire event on the current element, then bubble up the DOM tree do { - var handle = jQuery._data( cur, "handle" ); + var handle = jQuery._data(cur, "handle"); event.currentTarget = cur; - if ( handle ) { - handle.apply( cur, data ); + if (handle) { + handle.apply(cur, data); } // Trigger an inline bound script - if ( ontype && jQuery.acceptData( cur ) && cur[ ontype ] && cur[ ontype ].apply( cur, data ) === false ) { + if (ontype && jQuery.acceptData(cur) && cur[ontype] && cur[ontype].apply(cur, data) === false) { event.result = false; event.preventDefault(); } // Bubble up to document, then to window cur = cur.parentNode || cur.ownerDocument || cur === event.target.ownerDocument && window; - } while ( cur && !event.isPropagationStopped() ); + } while (cur && !event.isPropagationStopped()); // If nobody prevented the default action, do it now - if ( !event.isDefaultPrevented() ) { + if (!event.isDefaultPrevented()) { var old, - special = jQuery.event.special[ type ] || {}; + special = jQuery.event.special[type] || {}; - if ( (!special._default || special._default.call( elem.ownerDocument, event ) === false) && - !(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) { + if ((!special._default || special._default.call(elem.ownerDocument, event) === false) && + !(type === "click" && jQuery.nodeName(elem, "a")) && jQuery.acceptData(elem)) { // Call a native DOM method on the target with the same name name as the event. // Can't use an .isFunction)() check here because IE6/7 fails that test. // IE<9 dies on focus to hidden element (#1486), may want to revisit a try/catch. try { - if ( ontype && elem[ type ] ) { + if (ontype && elem[type]) { // Don't re-trigger an onFOO event when we call its FOO() method - old = elem[ ontype ]; + old = elem[ontype]; - if ( old ) { - elem[ ontype ] = null; + if (old) { + elem[ontype] = null; } jQuery.event.triggered = type; - elem[ type ](); + elem[type](); } - } catch ( ieError ) {} + } catch (ieError) { + } - if ( old ) { - elem[ ontype ] = old; + if (old) { + elem[ontype] = old; } jQuery.event.triggered = undefined; @@ -2900,40 +2901,40 @@ return event.result; }, - handle: function( event ) { - event = jQuery.event.fix( event || window.event ); + handle: function (event) { + event = jQuery.event.fix(event || window.event); // Snapshot the handlers list since a called handler may add/remove events. - var handlers = ((jQuery._data( this, "events" ) || {})[ event.type ] || []).slice(0), + var handlers = ((jQuery._data(this, "events") || {})[event.type] || []).slice(0), run_all = !event.exclusive && !event.namespace, - args = Array.prototype.slice.call( arguments, 0 ); + args = Array.prototype.slice.call(arguments, 0); // Use the fix-ed Event rather than the (read-only) native event args[0] = event; event.currentTarget = this; - for ( var j = 0, l = handlers.length; j < l; j++ ) { - var handleObj = handlers[ j ]; + for (var j = 0, l = handlers.length; j < l; j++) { + var handleObj = handlers[j]; // Triggered event must 1) be non-exclusive and have no namespace, or // 2) have namespace(s) a subset or equal to those in the bound event. - if ( run_all || event.namespace_re.test( handleObj.namespace ) ) { + if (run_all || event.namespace_re.test(handleObj.namespace)) { // Pass in a reference to the handler function itself // So that we can later remove it event.handler = handleObj.handler; event.data = handleObj.data; event.handleObj = handleObj; - var ret = handleObj.handler.apply( this, args ); + var ret = handleObj.handler.apply(this, args); - if ( ret !== undefined ) { + if (ret !== undefined) { event.result = ret; - if ( ret === false ) { + if (ret === false) { event.preventDefault(); event.stopPropagation(); } } - if ( event.isImmediatePropagationStopped() ) { + if (event.isImmediatePropagationStopped()) { break; } } @@ -2943,61 +2944,61 @@ props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "), - fix: function( event ) { - if ( event[ jQuery.expando ] ) { + fix: function (event) { + if (event[jQuery.expando]) { return event; } // store a copy of the original event object // and "clone" to set read-only properties var originalEvent = event; - event = jQuery.Event( originalEvent ); + event = jQuery.Event(originalEvent); - for ( var i = this.props.length, prop; i; ) { - prop = this.props[ --i ]; - event[ prop ] = originalEvent[ prop ]; + for (var i = this.props.length, prop; i;) { + prop = this.props[--i]; + event[prop] = originalEvent[prop]; } // Fix target property, if necessary - if ( !event.target ) { + if (!event.target) { // Fixes #1925 where srcElement might not be defined either event.target = event.srcElement || document; } // check if target is a textnode (safari) - if ( event.target.nodeType === 3 ) { + if (event.target.nodeType === 3) { event.target = event.target.parentNode; } // Add relatedTarget, if necessary - if ( !event.relatedTarget && event.fromElement ) { + if (!event.relatedTarget && event.fromElement) { event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement; } // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && event.clientX != null ) { + if (event.pageX == null && event.clientX != null) { var eventDocument = event.target.ownerDocument || document, doc = eventDocument.documentElement, body = eventDocument.body; event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0); - event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc && doc.clientTop || body && body.clientTop || 0); + event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc && doc.clientTop || body && body.clientTop || 0); } // Add which for key events - if ( event.which == null && (event.charCode != null || event.keyCode != null) ) { + if (event.which == null && (event.charCode != null || event.keyCode != null)) { event.which = event.charCode != null ? event.charCode : event.keyCode; } // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs) - if ( !event.metaKey && event.ctrlKey ) { + if (!event.metaKey && event.ctrlKey) { event.metaKey = event.ctrlKey; } // Add which for click: 1 === left; 2 === middle; 3 === right // Note: button is not normalized, so don't use it - if ( !event.which && event.button !== undefined ) { - event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) )); + if (!event.which && event.button !== undefined) { + event.which = (event.button & 1 ? 1 : (event.button & 2 ? 3 : (event.button & 4 ? 2 : 0))); } return event; @@ -3017,27 +3018,27 @@ }, live: { - add: function( handleObj ) { - jQuery.event.add( this, - liveConvert( handleObj.origType, handleObj.selector ), - jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) ); + add: function (handleObj) { + jQuery.event.add(this, + liveConvert(handleObj.origType, handleObj.selector), + jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid})); }, - remove: function( handleObj ) { - jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj ); + remove: function (handleObj) { + jQuery.event.remove(this, liveConvert(handleObj.origType, handleObj.selector), handleObj); } }, beforeunload: { - setup: function( data, namespaces, eventHandle ) { + setup: function (data, namespaces, eventHandle) { // We only want to do this special case on windows - if ( jQuery.isWindow( this ) ) { + if (jQuery.isWindow(this)) { this.onbeforeunload = eventHandle; } }, - teardown: function( namespaces, eventHandle ) { - if ( this.onbeforeunload === eventHandle ) { + teardown: function (namespaces, eventHandle) { + if (this.onbeforeunload === eventHandle) { this.onbeforeunload = null; } } @@ -3046,25 +3047,25 @@ }; jQuery.removeEvent = document.removeEventListener ? - function( elem, type, handle ) { - if ( elem.removeEventListener ) { - elem.removeEventListener( type, handle, false ); + function (elem, type, handle) { + if (elem.removeEventListener) { + elem.removeEventListener(type, handle, false); } } : - function( elem, type, handle ) { - if ( elem.detachEvent ) { - elem.detachEvent( "on" + type, handle ); + function (elem, type, handle) { + if (elem.detachEvent) { + elem.detachEvent("on" + type, handle); } }; - jQuery.Event = function( src, props ) { + jQuery.Event = function (src, props) { // Allow instantiation without the 'new' keyword - if ( !this.preventDefault ) { - return new jQuery.Event( src, props ); + if (!this.preventDefault) { + return new jQuery.Event(src, props); } // Event object - if ( src && src.type ) { + if (src && src.type) { this.originalEvent = src; this.type = src.type; @@ -3079,8 +3080,8 @@ } // Put explicitly provided properties onto the event object - if ( props ) { - jQuery.extend( this, props ); + if (props) { + jQuery.extend(this, props); } // timeStamp is buggy for some events on Firefox(#3843) @@ -3088,12 +3089,13 @@ this.timeStamp = jQuery.now(); // Mark it as fixed - this[ jQuery.expando ] = true; + this[jQuery.expando] = true; }; function returnFalse() { return false; } + function returnTrue() { return true; } @@ -3101,16 +3103,16 @@ // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding // http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html jQuery.Event.prototype = { - preventDefault: function() { + preventDefault: function () { this.isDefaultPrevented = returnTrue; var e = this.originalEvent; - if ( !e ) { + if (!e) { return; } // if preventDefault exists run it on the original event - if ( e.preventDefault ) { + if (e.preventDefault) { e.preventDefault(); // otherwise set the returnValue property of the original event to false (IE) @@ -3118,21 +3120,21 @@ e.returnValue = false; } }, - stopPropagation: function() { + stopPropagation: function () { this.isPropagationStopped = returnTrue; var e = this.originalEvent; - if ( !e ) { + if (!e) { return; } // if stopPropagation exists run it on the original event - if ( e.stopPropagation ) { + if (e.stopPropagation) { e.stopPropagation(); } // otherwise set the cancelBubble property of the original event to true (IE) e.cancelBubble = true; }, - stopImmediatePropagation: function() { + stopImmediatePropagation: function () { this.isImmediatePropagationStopped = returnTrue; this.stopPropagation(); }, @@ -3143,7 +3145,7 @@ // Checks if an event happened on an element within another element // Used in jQuery.event.special.mouseenter and mouseleave handlers - var withinElement = function( event ) { + var withinElement = function (event) { // Check if mouse(over|out) are still within the same parent element var parent = event.relatedTarget; @@ -3156,67 +3158,68 @@ // Chrome does something similar, the parentNode property // can be accessed but is null. - if ( parent && parent !== document && !parent.parentNode ) { + if (parent && parent !== document && !parent.parentNode) { return; } // Traverse up the tree - while ( parent && parent !== this ) { + while (parent && parent !== this) { parent = parent.parentNode; } - if ( parent !== this ) { + if (parent !== this) { // handle event if we actually just moused on to a non sub-element - jQuery.event.handle.apply( this, arguments ); + jQuery.event.handle.apply(this, arguments); } // assuming we've left the element since we most likely mousedover a xul element - } catch(e) { } + } catch (e) { + } }, // In case of event delegation, we only need to rename the event.type, // liveHandler will take care of the rest. - delegate = function( event ) { + delegate = function (event) { event.type = event.data; - jQuery.event.handle.apply( this, arguments ); + jQuery.event.handle.apply(this, arguments); }; // Create mouseenter and mouseleave events jQuery.each({ mouseenter: "mouseover", mouseleave: "mouseout" - }, function( orig, fix ) { - jQuery.event.special[ orig ] = { - setup: function( data ) { - jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig ); + }, function (orig, fix) { + jQuery.event.special[orig] = { + setup: function (data) { + jQuery.event.add(this, fix, data && data.selector ? delegate : withinElement, orig); }, - teardown: function( data ) { - jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement ); + teardown: function (data) { + jQuery.event.remove(this, fix, data && data.selector ? delegate : withinElement); } }; }); // submit delegation - if ( !jQuery.support.submitBubbles ) { + if (!jQuery.support.submitBubbles) { jQuery.event.special.submit = { - setup: function( data, namespaces ) { - if ( !jQuery.nodeName( this, "form" ) ) { - jQuery.event.add(this, "click.specialSubmit", function( e ) { + setup: function (data, namespaces) { + if (!jQuery.nodeName(this, "form")) { + jQuery.event.add(this, "click.specialSubmit", function (e) { var elem = e.target, type = elem.type; - if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) { - trigger( "submit", this, arguments ); + if ((type === "submit" || type === "image") && jQuery(elem).closest("form").length) { + trigger("submit", this, arguments); } }); - jQuery.event.add(this, "keypress.specialSubmit", function( e ) { + jQuery.event.add(this, "keypress.specialSubmit", function (e) { var elem = e.target, type = elem.type; - if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) { - trigger( "submit", this, arguments ); + if ((type === "text" || type === "password") && jQuery(elem).closest("form").length && e.keyCode === 13) { + trigger("submit", this, arguments); } }); @@ -3225,61 +3228,61 @@ } }, - teardown: function( namespaces ) { - jQuery.event.remove( this, ".specialSubmit" ); + teardown: function (namespaces) { + jQuery.event.remove(this, ".specialSubmit"); } }; } // change delegation, happens here so we have bind. - if ( !jQuery.support.changeBubbles ) { + if (!jQuery.support.changeBubbles) { var changeFilters, - getVal = function( elem ) { + getVal = function (elem) { var type = elem.type, val = elem.value; - if ( type === "radio" || type === "checkbox" ) { + if (type === "radio" || type === "checkbox") { val = elem.checked; - } else if ( type === "select-multiple" ) { + } else if (type === "select-multiple") { val = elem.selectedIndex > -1 ? - jQuery.map( elem.options, function( elem ) { + jQuery.map(elem.options, function (elem) { return elem.selected; }).join("-") : ""; - } else if ( jQuery.nodeName( elem, "select" ) ) { + } else if (jQuery.nodeName(elem, "select")) { val = elem.selectedIndex; } return val; }, - testChange = function testChange( e ) { + testChange = function testChange(e) { var elem = e.target, data, val; - if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) { + if (!rformElems.test(elem.nodeName) || elem.readOnly) { return; } - data = jQuery._data( elem, "_change_data" ); + data = jQuery._data(elem, "_change_data"); val = getVal(elem); // the current data will be also retrieved by beforeactivate - if ( e.type !== "focusout" || elem.type !== "radio" ) { - jQuery._data( elem, "_change_data", val ); + if (e.type !== "focusout" || elem.type !== "radio") { + jQuery._data(elem, "_change_data", val); } - if ( data === undefined || val === data ) { + if (data === undefined || val === data) { return; } - if ( data != null || val ) { + if (data != null || val) { e.type = "change"; e.liveFired = undefined; - jQuery.event.trigger( e, arguments[1], elem ); + jQuery.event.trigger(e, arguments[1], elem); } }; @@ -3289,51 +3292,51 @@ beforedeactivate: testChange, - click: function( e ) { - var elem = e.target, type = jQuery.nodeName( elem, "input" ) ? elem.type : ""; + click: function (e) { + var elem = e.target, type = jQuery.nodeName(elem, "input") ? elem.type : ""; - if ( type === "radio" || type === "checkbox" || jQuery.nodeName( elem, "select" ) ) { - testChange.call( this, e ); + if (type === "radio" || type === "checkbox" || jQuery.nodeName(elem, "select")) { + testChange.call(this, e); } }, // Change has to be called before submit // Keydown will be called before keypress, which is used in submit-event delegation - keydown: function( e ) { - var elem = e.target, type = jQuery.nodeName( elem, "input" ) ? elem.type : ""; + keydown: function (e) { + var elem = e.target, type = jQuery.nodeName(elem, "input") ? elem.type : ""; - if ( (e.keyCode === 13 && !jQuery.nodeName( elem, "textarea" ) ) || + if ((e.keyCode === 13 && !jQuery.nodeName(elem, "textarea")) || (e.keyCode === 32 && (type === "checkbox" || type === "radio")) || - type === "select-multiple" ) { - testChange.call( this, e ); + type === "select-multiple") { + testChange.call(this, e); } }, // Beforeactivate happens also before the previous element is blurred // with this event you can't trigger a change event, but you can store // information - beforeactivate: function( e ) { + beforeactivate: function (e) { var elem = e.target; - jQuery._data( elem, "_change_data", getVal(elem) ); + jQuery._data(elem, "_change_data", getVal(elem)); } }, - setup: function( data, namespaces ) { - if ( this.type === "file" ) { + setup: function (data, namespaces) { + if (this.type === "file") { return false; } - for ( var type in changeFilters ) { - jQuery.event.add( this, type + ".specialChange", changeFilters[type] ); + for (var type in changeFilters) { + jQuery.event.add(this, type + ".specialChange", changeFilters[type]); } - return rformElems.test( this.nodeName ); + return rformElems.test(this.nodeName); }, - teardown: function( namespaces ) { - jQuery.event.remove( this, ".specialChange" ); + teardown: function (namespaces) { + jQuery.event.remove(this, ".specialChange"); - return rformElems.test( this.nodeName ); + return rformElems.test(this.nodeName); } }; @@ -3343,88 +3346,88 @@ changeFilters.focus = changeFilters.beforeactivate; } - function trigger( type, elem, args ) { + function trigger(type, elem, args) { // Piggyback on a donor event to simulate a different one. // Fake originalEvent to avoid donor's stopPropagation, but if the // simulated event prevents default then we do the same on the donor. // Don't pass args or remember liveFired; they apply to the donor event. - var event = jQuery.extend( {}, args[ 0 ] ); + var event = jQuery.extend({}, args[0]); event.type = type; event.originalEvent = {}; event.liveFired = undefined; - jQuery.event.handle.call( elem, event ); - if ( event.isDefaultPrevented() ) { - args[ 0 ].preventDefault(); + jQuery.event.handle.call(elem, event); + if (event.isDefaultPrevented()) { + args[0].preventDefault(); } } // Create "bubbling" focus and blur events - if ( !jQuery.support.focusinBubbles ) { - jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { + if (!jQuery.support.focusinBubbles) { + jQuery.each({focus: "focusin", blur: "focusout"}, function (orig, fix) { // Attach a single capturing handler while someone wants focusin/focusout var attaches = 0; - jQuery.event.special[ fix ] = { - setup: function() { - if ( attaches++ === 0 ) { - document.addEventListener( orig, handler, true ); + jQuery.event.special[fix] = { + setup: function () { + if (attaches++ === 0) { + document.addEventListener(orig, handler, true); } }, - teardown: function() { - if ( --attaches === 0 ) { - document.removeEventListener( orig, handler, true ); + teardown: function () { + if (--attaches === 0) { + document.removeEventListener(orig, handler, true); } } }; - function handler( donor ) { + function handler(donor) { // Donor event is always a native one; fix it and switch its type. // Let focusin/out handler cancel the donor focus/blur event. - var e = jQuery.event.fix( donor ); + var e = jQuery.event.fix(donor); e.type = fix; e.originalEvent = {}; - jQuery.event.trigger( e, null, e.target ); - if ( e.isDefaultPrevented() ) { + jQuery.event.trigger(e, null, e.target); + if (e.isDefaultPrevented()) { donor.preventDefault(); } } }); } - jQuery.each(["bind", "one"], function( i, name ) { - jQuery.fn[ name ] = function( type, data, fn ) { + jQuery.each(["bind", "one"], function (i, name) { + jQuery.fn[name] = function (type, data, fn) { var handler; // Handle object literals - if ( typeof type === "object" ) { - for ( var key in type ) { - this[ name ](key, data, type[key], fn); + if (typeof type === "object") { + for (var key in type) { + this[name](key, data, type[key], fn); } return this; } - if ( arguments.length === 2 || data === false ) { + if (arguments.length === 2 || data === false) { fn = data; data = undefined; } - if ( name === "one" ) { - handler = function( event ) { - jQuery( this ).unbind( event, handler ); - return fn.apply( this, arguments ); + if (name === "one") { + handler = function (event) { + jQuery(this).unbind(event, handler); + return fn.apply(this, arguments); }; handler.guid = fn.guid || jQuery.guid++; } else { handler = fn; } - if ( type === "unload" && name !== "one" ) { - this.one( type, data, fn ); + if (type === "unload" && name !== "one") { + this.one(type, data, fn); } else { - for ( var i = 0, l = this.length; i < l; i++ ) { - jQuery.event.add( this[i], type, handler, data ); + for (var i = 0, l = this.length; i < l; i++) { + jQuery.event.add(this[i], type, handler, data); } } @@ -3433,75 +3436,75 @@ }); jQuery.fn.extend({ - unbind: function( type, fn ) { + unbind: function (type, fn) { // Handle object literals - if ( typeof type === "object" && !type.preventDefault ) { - for ( var key in type ) { + if (typeof type === "object" && !type.preventDefault) { + for (var key in type) { this.unbind(key, type[key]); } } else { - for ( var i = 0, l = this.length; i < l; i++ ) { - jQuery.event.remove( this[i], type, fn ); + for (var i = 0, l = this.length; i < l; i++) { + jQuery.event.remove(this[i], type, fn); } } return this; }, - delegate: function( selector, types, data, fn ) { - return this.live( types, data, fn, selector ); + delegate: function (selector, types, data, fn) { + return this.live(types, data, fn, selector); }, - undelegate: function( selector, types, fn ) { - if ( arguments.length === 0 ) { - return this.unbind( "live" ); + undelegate: function (selector, types, fn) { + if (arguments.length === 0) { + return this.unbind("live"); } else { - return this.die( types, null, fn, selector ); + return this.die(types, null, fn, selector); } }, - trigger: function( type, data ) { - return this.each(function() { - jQuery.event.trigger( type, data, this ); + trigger: function (type, data) { + return this.each(function () { + jQuery.event.trigger(type, data, this); }); }, - triggerHandler: function( type, data ) { - if ( this[0] ) { - return jQuery.event.trigger( type, data, this[0], true ); + triggerHandler: function (type, data) { + if (this[0]) { + return jQuery.event.trigger(type, data, this[0], true); } }, - toggle: function( fn ) { + toggle: function (fn) { // Save reference to arguments for access in closure var args = arguments, guid = fn.guid || jQuery.guid++, i = 0, - toggler = function( event ) { + toggler = function (event) { // Figure out which function to execute - var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i; - jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 ); + var lastToggle = (jQuery.data(this, "lastToggle" + fn.guid) || 0) % i; + jQuery.data(this, "lastToggle" + fn.guid, lastToggle + 1); // Make sure that clicks stop event.preventDefault(); // and execute the function - return args[ lastToggle ].apply( this, arguments ) || false; + return args[lastToggle].apply(this, arguments) || false; }; // link all the functions, so any of them can unbind this click handler toggler.guid = guid; - while ( i < args.length ) { - args[ i++ ].guid = guid; + while (i < args.length) { + args[i++].guid = guid; } - return this.click( toggler ); + return this.click(toggler); }, - hover: function( fnOver, fnOut ) { - return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver ); + hover: function (fnOver, fnOut) { + return this.mouseenter(fnOver).mouseleave(fnOut || fnOver); } }); @@ -3512,69 +3515,76 @@ mouseleave: "mouseout" }; - jQuery.each(["live", "die"], function( i, name ) { - jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) { + jQuery.each(["live", "die"], function (i, name) { + jQuery.fn[name] = function (types, data, fn, origSelector /* Internal Use Only */) { var type, i = 0, match, namespaces, preType, selector = origSelector || this.selector, - context = origSelector ? this : jQuery( this.context ); + context = origSelector ? this : jQuery(this.context); - if ( typeof types === "object" && !types.preventDefault ) { - for ( var key in types ) { - context[ name ]( key, data, types[key], selector ); + if (typeof types === "object" && !types.preventDefault) { + for (var key in types) { + context[name](key, data, types[key], selector); } return this; } - if ( name === "die" && !types && - origSelector && origSelector.charAt(0) === "." ) { + if (name === "die" && !types && + origSelector && origSelector.charAt(0) === ".") { - context.unbind( origSelector ); + context.unbind(origSelector); return this; } - if ( data === false || jQuery.isFunction( data ) ) { + if (data === false || jQuery.isFunction(data)) { fn = data || returnFalse; data = undefined; } types = (types || "").split(" "); - while ( (type = types[ i++ ]) != null ) { - match = rnamespaces.exec( type ); + while ((type = types[i++]) != null) { + match = rnamespaces.exec(type); namespaces = ""; - if ( match ) { + if (match) { namespaces = match[0]; - type = type.replace( rnamespaces, "" ); + type = type.replace(rnamespaces, ""); } - if ( type === "hover" ) { - types.push( "mouseenter" + namespaces, "mouseleave" + namespaces ); + if (type === "hover") { + types.push("mouseenter" + namespaces, "mouseleave" + namespaces); continue; } preType = type; - if ( liveMap[ type ] ) { - types.push( liveMap[ type ] + namespaces ); + if (liveMap[type]) { + types.push(liveMap[type] + namespaces); type = type + namespaces; } else { - type = (liveMap[ type ] || type) + namespaces; + type = (liveMap[type] || type) + namespaces; } - if ( name === "live" ) { + if (name === "live") { // bind live handler - for ( var j = 0, l = context.length; j < l; j++ ) { - jQuery.event.add( context[j], "live." + liveConvert( type, selector ), - { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } ); + for (var j = 0, l = context.length; j < l; j++) { + jQuery.event.add(context[j], "live." + liveConvert(type, selector), + { + data: data, + selector: selector, + handler: fn, + origType: type, + origHandler: fn, + preType: preType + }); } } else { // unbind live handler - context.unbind( "live." + liveConvert( type, selector ), fn ); + context.unbind("live." + liveConvert(type, selector), fn); } } @@ -3582,18 +3592,18 @@ }; }); - function liveHandler( event ) { + function liveHandler(event) { var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret, elems = [], selectors = [], - events = jQuery._data( this, "events" ); + events = jQuery._data(this, "events"); // Make sure we avoid non-left-click bubbling in Firefox (#3861) and disabled elements in IE (#6911) - if ( event.liveFired === this || !events || !events.live || event.target.disabled || event.button && event.type === "click" ) { + if (event.liveFired === this || !events || !events.live || event.target.disabled || event.button && event.type === "click") { return; } - if ( event.namespace ) { + if (event.namespace) { namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)"); } @@ -3601,51 +3611,51 @@ var live = events.live.slice(0); - for ( j = 0; j < live.length; j++ ) { + for (j = 0; j < live.length; j++) { handleObj = live[j]; - if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) { - selectors.push( handleObj.selector ); + if (handleObj.origType.replace(rnamespaces, "") === event.type) { + selectors.push(handleObj.selector); } else { - live.splice( j--, 1 ); + live.splice(j--, 1); } } - match = jQuery( event.target ).closest( selectors, event.currentTarget ); + match = jQuery(event.target).closest(selectors, event.currentTarget); - for ( i = 0, l = match.length; i < l; i++ ) { + for (i = 0, l = match.length; i < l; i++) { close = match[i]; - for ( j = 0; j < live.length; j++ ) { + for (j = 0; j < live.length; j++) { handleObj = live[j]; - if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) && !close.elem.disabled ) { + if (close.selector === handleObj.selector && (!namespace || namespace.test(handleObj.namespace)) && !close.elem.disabled) { elem = close.elem; related = null; // Those two events require additional checking - if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) { + if (handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave") { event.type = handleObj.preType; - related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0]; + related = jQuery(event.relatedTarget).closest(handleObj.selector)[0]; // Make sure not to accidentally match a child element with the same selector - if ( related && jQuery.contains( elem, related ) ) { + if (related && jQuery.contains(elem, related)) { related = elem; } } - if ( !related || related !== elem ) { - elems.push({ elem: elem, handleObj: handleObj, level: close.level }); + if (!related || related !== elem) { + elems.push({elem: elem, handleObj: handleObj, level: close.level}); } } } } - for ( i = 0, l = elems.length; i < l; i++ ) { + for (i = 0, l = elems.length; i < l; i++) { match = elems[i]; - if ( maxLevel && match.level > maxLevel ) { + if (maxLevel && match.level > maxLevel) { break; } @@ -3653,15 +3663,15 @@ event.data = match.handleObj.data; event.handleObj = match.handleObj; - ret = match.handleObj.origHandler.apply( match.elem, arguments ); + ret = match.handleObj.origHandler.apply(match.elem, arguments); - if ( ret === false || event.isPropagationStopped() ) { + if (ret === false || event.isPropagationStopped()) { maxLevel = match.level; - if ( ret === false ) { + if (ret === false) { stop = false; } - if ( event.isImmediatePropagationStopped() ) { + if (event.isImmediatePropagationStopped()) { break; } } @@ -3670,40 +3680,39 @@ return stop; } - function liveConvert( type, selector ) { + function liveConvert(type, selector) { return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspaces, "&"); } - jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + + jQuery.each(("blur focus focusin focusout load resize scroll unload click dblclick " + "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + - "change select submit keydown keypress keyup error").split(" "), function( i, name ) { + "change select submit keydown keypress keyup error").split(" "), function (i, name) { // Handle event binding - jQuery.fn[ name ] = function( data, fn ) { - if ( fn == null ) { + jQuery.fn[name] = function (data, fn) { + if (fn == null) { fn = data; data = null; } return arguments.length > 0 ? - this.bind( name, data, fn ) : - this.trigger( name ); + this.bind(name, data, fn) : + this.trigger(name); }; - if ( jQuery.attrFn ) { - jQuery.attrFn[ name ] = true; + if (jQuery.attrFn) { + jQuery.attrFn[name] = true; } }); - /*! * Sizzle CSS Selector Engine * Copyright 2011, The Dojo Foundation * Released under the MIT, BSD, and GPL Licenses. * More information: http://sizzlejs.com/ */ - (function(){ + (function () { var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, done = 0, @@ -3717,112 +3726,112 @@ // optimization where it does not always call our comparision // function. If that is the case, discard the hasDuplicate value. // Thus far that includes Google Chrome. - [0, 0].sort(function() { + [0, 0].sort(function () { baseHasDuplicate = false; return 0; }); - var Sizzle = function( selector, context, results, seed ) { + var Sizzle = function (selector, context, results, seed) { results = results || []; context = context || document; var origContext = context; - if ( context.nodeType !== 1 && context.nodeType !== 9 ) { + if (context.nodeType !== 1 && context.nodeType !== 9) { return []; } - if ( !selector || typeof selector !== "string" ) { + if (!selector || typeof selector !== "string") { return results; } var m, set, checkSet, extra, ret, cur, pop, i, prune = true, - contextXML = Sizzle.isXML( context ), + contextXML = Sizzle.isXML(context), parts = [], soFar = selector; // Reset the position of the chunker regexp (start from head) do { - chunker.exec( "" ); - m = chunker.exec( soFar ); + chunker.exec(""); + m = chunker.exec(soFar); - if ( m ) { + if (m) { soFar = m[3]; - parts.push( m[1] ); + parts.push(m[1]); - if ( m[2] ) { + if (m[2]) { extra = m[3]; break; } } - } while ( m ); + } while (m); - if ( parts.length > 1 && origPOS.exec( selector ) ) { + if (parts.length > 1 && origPOS.exec(selector)) { - if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { - set = posProcess( parts[0] + parts[1], context ); + if (parts.length === 2 && Expr.relative[parts[0]]) { + set = posProcess(parts[0] + parts[1], context); } else { - set = Expr.relative[ parts[0] ] ? - [ context ] : - Sizzle( parts.shift(), context ); + set = Expr.relative[parts[0]] ? + [context] : + Sizzle(parts.shift(), context); - while ( parts.length ) { + while (parts.length) { selector = parts.shift(); - if ( Expr.relative[ selector ] ) { + if (Expr.relative[selector]) { selector += parts.shift(); } - set = posProcess( selector, set ); + set = posProcess(selector, set); } } } else { // Take a shortcut and set the context if the root selector is an ID // (but not if it'll be faster if the inner selector is an ID) - if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML && - Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) { + if (!seed && parts.length > 1 && context.nodeType === 9 && !contextXML && + Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1])) { - ret = Sizzle.find( parts.shift(), context, contextXML ); + ret = Sizzle.find(parts.shift(), context, contextXML); context = ret.expr ? - Sizzle.filter( ret.expr, ret.set )[0] : + Sizzle.filter(ret.expr, ret.set)[0] : ret.set[0]; } - if ( context ) { + if (context) { ret = seed ? - { expr: parts.pop(), set: makeArray(seed) } : - Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML ); + {expr: parts.pop(), set: makeArray(seed)} : + Sizzle.find(parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML); set = ret.expr ? - Sizzle.filter( ret.expr, ret.set ) : + Sizzle.filter(ret.expr, ret.set) : ret.set; - if ( parts.length > 0 ) { - checkSet = makeArray( set ); + if (parts.length > 0) { + checkSet = makeArray(set); } else { prune = false; } - while ( parts.length ) { + while (parts.length) { cur = parts.pop(); pop = cur; - if ( !Expr.relative[ cur ] ) { + if (!Expr.relative[cur]) { cur = ""; } else { pop = parts.pop(); } - if ( pop == null ) { + if (pop == null) { pop = context; } - Expr.relative[ cur ]( checkSet, pop, contextXML ); + Expr.relative[cur](checkSet, pop, contextXML); } } else { @@ -3830,54 +3839,54 @@ } } - if ( !checkSet ) { + if (!checkSet) { checkSet = set; } - if ( !checkSet ) { - Sizzle.error( cur || selector ); + if (!checkSet) { + Sizzle.error(cur || selector); } - if ( toString.call(checkSet) === "[object Array]" ) { - if ( !prune ) { - results.push.apply( results, checkSet ); + if (toString.call(checkSet) === "[object Array]") { + if (!prune) { + results.push.apply(results, checkSet); - } else if ( context && context.nodeType === 1 ) { - for ( i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) { - results.push( set[i] ); + } else if (context && context.nodeType === 1) { + for (i = 0; checkSet[i] != null; i++) { + if (checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i]))) { + results.push(set[i]); } } } else { - for ( i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && checkSet[i].nodeType === 1 ) { - results.push( set[i] ); + for (i = 0; checkSet[i] != null; i++) { + if (checkSet[i] && checkSet[i].nodeType === 1) { + results.push(set[i]); } } } } else { - makeArray( checkSet, results ); + makeArray(checkSet, results); } - if ( extra ) { - Sizzle( extra, origContext, results, seed ); - Sizzle.uniqueSort( results ); + if (extra) { + Sizzle(extra, origContext, results, seed); + Sizzle.uniqueSort(results); } return results; }; - Sizzle.uniqueSort = function( results ) { - if ( sortOrder ) { + Sizzle.uniqueSort = function (results) { + if (sortOrder) { hasDuplicate = baseHasDuplicate; - results.sort( sortOrder ); + results.sort(sortOrder); - if ( hasDuplicate ) { - for ( var i = 1; i < results.length; i++ ) { - if ( results[i] === results[ i - 1 ] ) { - results.splice( i--, 1 ); + if (hasDuplicate) { + for (var i = 1; i < results.length; i++) { + if (results[i] === results[i - 1]) { + results.splice(i--, 1); } } } @@ -3886,117 +3895,117 @@ return results; }; - Sizzle.matches = function( expr, set ) { - return Sizzle( expr, null, null, set ); + Sizzle.matches = function (expr, set) { + return Sizzle(expr, null, null, set); }; - Sizzle.matchesSelector = function( node, expr ) { - return Sizzle( expr, null, null, [node] ).length > 0; + Sizzle.matchesSelector = function (node, expr) { + return Sizzle(expr, null, null, [node]).length > 0; }; - Sizzle.find = function( expr, context, isXML ) { + Sizzle.find = function (expr, context, isXML) { var set; - if ( !expr ) { + if (!expr) { return []; } - for ( var i = 0, l = Expr.order.length; i < l; i++ ) { + for (var i = 0, l = Expr.order.length; i < l; i++) { var match, type = Expr.order[i]; - if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { + if ((match = Expr.leftMatch[type].exec(expr))) { var left = match[1]; - match.splice( 1, 1 ); + match.splice(1, 1); - if ( left.substr( left.length - 1 ) !== "\\" ) { - match[1] = (match[1] || "").replace( rBackslash, "" ); - set = Expr.find[ type ]( match, context, isXML ); + if (left.substr(left.length - 1) !== "\\") { + match[1] = (match[1] || "").replace(rBackslash, ""); + set = Expr.find[type](match, context, isXML); - if ( set != null ) { - expr = expr.replace( Expr.match[ type ], "" ); + if (set != null) { + expr = expr.replace(Expr.match[type], ""); break; } } } } - if ( !set ) { + if (!set) { set = typeof context.getElementsByTagName !== "undefined" ? - context.getElementsByTagName( "*" ) : + context.getElementsByTagName("*") : []; } - return { set: set, expr: expr }; + return {set: set, expr: expr}; }; - Sizzle.filter = function( expr, set, inplace, not ) { + Sizzle.filter = function (expr, set, inplace, not) { var match, anyFound, old = expr, result = [], curLoop = set, - isXMLFilter = set && set[0] && Sizzle.isXML( set[0] ); + isXMLFilter = set && set[0] && Sizzle.isXML(set[0]); - while ( expr && set.length ) { - for ( var type in Expr.filter ) { - if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) { + while (expr && set.length) { + for (var type in Expr.filter) { + if ((match = Expr.leftMatch[type].exec(expr)) != null && match[2]) { var found, item, - filter = Expr.filter[ type ], + filter = Expr.filter[type], left = match[1]; anyFound = false; - match.splice(1,1); + match.splice(1, 1); - if ( left.substr( left.length - 1 ) === "\\" ) { + if (left.substr(left.length - 1) === "\\") { continue; } - if ( curLoop === result ) { + if (curLoop === result) { result = []; } - if ( Expr.preFilter[ type ] ) { - match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter ); + if (Expr.preFilter[type]) { + match = Expr.preFilter[type](match, curLoop, inplace, result, not, isXMLFilter); - if ( !match ) { + if (!match) { anyFound = found = true; - } else if ( match === true ) { + } else if (match === true) { continue; } } - if ( match ) { - for ( var i = 0; (item = curLoop[i]) != null; i++ ) { - if ( item ) { - found = filter( item, match, i, curLoop ); + if (match) { + for (var i = 0; (item = curLoop[i]) != null; i++) { + if (item) { + found = filter(item, match, i, curLoop); var pass = not ^ !!found; - if ( inplace && found != null ) { - if ( pass ) { + if (inplace && found != null) { + if (pass) { anyFound = true; } else { curLoop[i] = false; } - } else if ( pass ) { - result.push( item ); + } else if (pass) { + result.push(item); anyFound = true; } } } } - if ( found !== undefined ) { - if ( !inplace ) { + if (found !== undefined) { + if (!inplace) { curLoop = result; } - expr = expr.replace( Expr.match[ type ], "" ); + expr = expr.replace(Expr.match[type], ""); - if ( !anyFound ) { + if (!anyFound) { return []; } @@ -4006,9 +4015,9 @@ } // Improper expression - if ( expr === old ) { - if ( anyFound == null ) { - Sizzle.error( expr ); + if (expr === old) { + if (anyFound == null) { + Sizzle.error(expr); } else { break; @@ -4021,12 +4030,12 @@ return curLoop; }; - Sizzle.error = function( msg ) { + Sizzle.error = function (msg) { throw "Syntax error, unrecognized expression: " + msg; }; var Expr = Sizzle.selectors = { - order: [ "ID", "NAME", "TAG" ], + order: ["ID", "NAME", "TAG"], match: { ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, @@ -4047,27 +4056,28 @@ }, attrHandle: { - href: function( elem ) { - return elem.getAttribute( "href" ); + href: function (elem) { + return elem.getAttribute("href"); }, - type: function( elem ) { - return elem.getAttribute( "type" ); + type: function (elem) { + return elem.getAttribute("type"); } }, relative: { - "+": function(checkSet, part){ + "+": function (checkSet, part) { var isPartStr = typeof part === "string", - isTag = isPartStr && !rNonWord.test( part ), + isTag = isPartStr && !rNonWord.test(part), isPartStrNotTag = isPartStr && !isTag; - if ( isTag ) { + if (isTag) { part = part.toLowerCase(); } - for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) { - if ( (elem = checkSet[i]) ) { - while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {} + for (var i = 0, l = checkSet.length, elem; i < l; i++) { + if ((elem = checkSet[i])) { + while ((elem = elem.previousSibling) && elem.nodeType !== 1) { + } checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ? elem || false : @@ -4075,78 +4085,78 @@ } } - if ( isPartStrNotTag ) { - Sizzle.filter( part, checkSet, true ); + if (isPartStrNotTag) { + Sizzle.filter(part, checkSet, true); } }, - ">": function( checkSet, part ) { + ">": function (checkSet, part) { var elem, isPartStr = typeof part === "string", i = 0, l = checkSet.length; - if ( isPartStr && !rNonWord.test( part ) ) { + if (isPartStr && !rNonWord.test(part)) { part = part.toLowerCase(); - for ( ; i < l; i++ ) { + for (; i < l; i++) { elem = checkSet[i]; - if ( elem ) { + if (elem) { var parent = elem.parentNode; checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false; } } } else { - for ( ; i < l; i++ ) { + for (; i < l; i++) { elem = checkSet[i]; - if ( elem ) { + if (elem) { checkSet[i] = isPartStr ? elem.parentNode : elem.parentNode === part; } } - if ( isPartStr ) { - Sizzle.filter( part, checkSet, true ); + if (isPartStr) { + Sizzle.filter(part, checkSet, true); } } }, - "": function(checkSet, part, isXML){ + "": function (checkSet, part, isXML) { var nodeCheck, doneName = done++, checkFn = dirCheck; - if ( typeof part === "string" && !rNonWord.test( part ) ) { + if (typeof part === "string" && !rNonWord.test(part)) { part = part.toLowerCase(); nodeCheck = part; checkFn = dirNodeCheck; } - checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML ); + checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML); }, - "~": function( checkSet, part, isXML ) { + "~": function (checkSet, part, isXML) { var nodeCheck, doneName = done++, checkFn = dirCheck; - if ( typeof part === "string" && !rNonWord.test( part ) ) { + if (typeof part === "string" && !rNonWord.test(part)) { part = part.toLowerCase(); nodeCheck = part; checkFn = dirNodeCheck; } - checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML ); + checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML); } }, find: { - ID: function( match, context, isXML ) { - if ( typeof context.getElementById !== "undefined" && !isXML ) { + ID: function (match, context, isXML) { + if (typeof context.getElementById !== "undefined" && !isXML) { var m = context.getElementById(match[1]); // Check parentNode to catch when Blackberry 4.6 returns // nodes that are no longer in the document #6963 @@ -4154,14 +4164,14 @@ } }, - NAME: function( match, context ) { - if ( typeof context.getElementsByName !== "undefined" ) { + NAME: function (match, context) { + if (typeof context.getElementsByName !== "undefined") { var ret = [], - results = context.getElementsByName( match[1] ); + results = context.getElementsByName(match[1]); - for ( var i = 0, l = results.length; i < l; i++ ) { - if ( results[i].getAttribute("name") === match[1] ) { - ret.push( results[i] ); + for (var i = 0, l = results.length; i < l; i++) { + if (results[i].getAttribute("name") === match[1]) { + ret.push(results[i]); } } @@ -4169,28 +4179,28 @@ } }, - TAG: function( match, context ) { - if ( typeof context.getElementsByTagName !== "undefined" ) { - return context.getElementsByTagName( match[1] ); + TAG: function (match, context) { + if (typeof context.getElementsByTagName !== "undefined") { + return context.getElementsByTagName(match[1]); } } }, preFilter: { - CLASS: function( match, curLoop, inplace, result, not, isXML ) { - match = " " + match[1].replace( rBackslash, "" ) + " "; + CLASS: function (match, curLoop, inplace, result, not, isXML) { + match = " " + match[1].replace(rBackslash, "") + " "; - if ( isXML ) { + if (isXML) { return match; } - for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) { - if ( elem ) { - if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) { - if ( !inplace ) { - result.push( elem ); + for (var i = 0, elem; (elem = curLoop[i]) != null; i++) { + if (elem) { + if (not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0)) { + if (!inplace) { + result.push(elem); } - } else if ( inplace ) { + } else if (inplace) { curLoop[i] = false; } } @@ -4199,18 +4209,18 @@ return false; }, - ID: function( match ) { - return match[1].replace( rBackslash, "" ); + ID: function (match) { + return match[1].replace(rBackslash, ""); }, - TAG: function( match, curLoop ) { - return match[1].replace( rBackslash, "" ).toLowerCase(); + TAG: function (match, curLoop) { + return match[1].replace(rBackslash, "").toLowerCase(); }, - CHILD: function( match ) { - if ( match[1] === "nth" ) { - if ( !match[2] ) { - Sizzle.error( match[0] ); + CHILD: function (match) { + if (match[1] === "nth") { + if (!match[2]) { + Sizzle.error(match[0]); } match[2] = match[2].replace(/^\+|\s*/g, ''); @@ -4218,14 +4228,13 @@ // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec( match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" || - !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]); + !/\D/.test(match[2]) && "0n+" + match[2] || match[2]); // calculate the numbers (first)n+(last) including if they are negative match[2] = (test[1] + (test[2] || 1)) - 0; match[3] = test[3] - 0; - } - else if ( match[2] ) { - Sizzle.error( match[0] ); + } else if (match[2]) { + Sizzle.error(match[0]); } // TODO: Move to normal caching system @@ -4234,191 +4243,191 @@ return match; }, - ATTR: function( match, curLoop, inplace, result, not, isXML ) { - var name = match[1] = match[1].replace( rBackslash, "" ); + ATTR: function (match, curLoop, inplace, result, not, isXML) { + var name = match[1] = match[1].replace(rBackslash, ""); - if ( !isXML && Expr.attrMap[name] ) { + if (!isXML && Expr.attrMap[name]) { match[1] = Expr.attrMap[name]; } // Handle if an un-quoted value was used - match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" ); + match[4] = (match[4] || match[5] || "").replace(rBackslash, ""); - if ( match[2] === "~=" ) { + if (match[2] === "~=") { match[4] = " " + match[4] + " "; } return match; }, - PSEUDO: function( match, curLoop, inplace, result, not ) { - if ( match[1] === "not" ) { + PSEUDO: function (match, curLoop, inplace, result, not) { + if (match[1] === "not") { // If we're dealing with a complex expression, or a simple one - if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) { + if ((chunker.exec(match[3]) || "").length > 1 || /^\w/.test(match[3])) { match[3] = Sizzle(match[3], null, null, curLoop); } else { var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not); - if ( !inplace ) { - result.push.apply( result, ret ); + if (!inplace) { + result.push.apply(result, ret); } return false; } - } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { + } else if (Expr.match.POS.test(match[0]) || Expr.match.CHILD.test(match[0])) { return true; } return match; }, - POS: function( match ) { - match.unshift( true ); + POS: function (match) { + match.unshift(true); return match; } }, filters: { - enabled: function( elem ) { + enabled: function (elem) { return elem.disabled === false && elem.type !== "hidden"; }, - disabled: function( elem ) { + disabled: function (elem) { return elem.disabled === true; }, - checked: function( elem ) { + checked: function (elem) { return elem.checked === true; }, - selected: function( elem ) { + selected: function (elem) { // Accessing this property makes selected-by-default // options in Safari work properly - if ( elem.parentNode ) { + if (elem.parentNode) { elem.parentNode.selectedIndex; } return elem.selected === true; }, - parent: function( elem ) { + parent: function (elem) { return !!elem.firstChild; }, - empty: function( elem ) { + empty: function (elem) { return !elem.firstChild; }, - has: function( elem, i, match ) { - return !!Sizzle( match[3], elem ).length; + has: function (elem, i, match) { + return !!Sizzle(match[3], elem).length; }, - header: function( elem ) { - return (/h\d/i).test( elem.nodeName ); + header: function (elem) { + return (/h\d/i).test(elem.nodeName); }, - text: function( elem ) { - var attr = elem.getAttribute( "type" ), type = elem.type; + text: function (elem) { + var attr = elem.getAttribute("type"), type = elem.type; // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) // use getAttribute instead to test this case - return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null ); + return elem.nodeName.toLowerCase() === "input" && "text" === type && (attr === type || attr === null); }, - radio: function( elem ) { + radio: function (elem) { return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type; }, - checkbox: function( elem ) { + checkbox: function (elem) { return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type; }, - file: function( elem ) { + file: function (elem) { return elem.nodeName.toLowerCase() === "input" && "file" === elem.type; }, - password: function( elem ) { + password: function (elem) { return elem.nodeName.toLowerCase() === "input" && "password" === elem.type; }, - submit: function( elem ) { + submit: function (elem) { var name = elem.nodeName.toLowerCase(); return (name === "input" || name === "button") && "submit" === elem.type; }, - image: function( elem ) { + image: function (elem) { return elem.nodeName.toLowerCase() === "input" && "image" === elem.type; }, - reset: function( elem ) { + reset: function (elem) { var name = elem.nodeName.toLowerCase(); return (name === "input" || name === "button") && "reset" === elem.type; }, - button: function( elem ) { + button: function (elem) { var name = elem.nodeName.toLowerCase(); return name === "input" && "button" === elem.type || name === "button"; }, - input: function( elem ) { - return (/input|select|textarea|button/i).test( elem.nodeName ); + input: function (elem) { + return (/input|select|textarea|button/i).test(elem.nodeName); }, - focus: function( elem ) { + focus: function (elem) { return elem === elem.ownerDocument.activeElement; } }, setFilters: { - first: function( elem, i ) { + first: function (elem, i) { return i === 0; }, - last: function( elem, i, match, array ) { + last: function (elem, i, match, array) { return i === array.length - 1; }, - even: function( elem, i ) { + even: function (elem, i) { return i % 2 === 0; }, - odd: function( elem, i ) { + odd: function (elem, i) { return i % 2 === 1; }, - lt: function( elem, i, match ) { + lt: function (elem, i, match) { return i < match[3] - 0; }, - gt: function( elem, i, match ) { + gt: function (elem, i, match) { return i > match[3] - 0; }, - nth: function( elem, i, match ) { + nth: function (elem, i, match) { return match[3] - 0 === i; }, - eq: function( elem, i, match ) { + eq: function (elem, i, match) { return match[3] - 0 === i; } }, filter: { - PSEUDO: function( elem, match, i, array ) { + PSEUDO: function (elem, match, i, array) { var name = match[1], - filter = Expr.filters[ name ]; + filter = Expr.filters[name]; - if ( filter ) { - return filter( elem, i, match, array ); + if (filter) { + return filter(elem, i, match, array); - } else if ( name === "contains" ) { - return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0; + } else if (name === "contains") { + return (elem.textContent || elem.innerText || Sizzle.getText([elem]) || "").indexOf(match[3]) >= 0; - } else if ( name === "not" ) { + } else if (name === "not") { var not = match[3]; - for ( var j = 0, l = not.length; j < l; j++ ) { - if ( not[j] === elem ) { + for (var j = 0, l = not.length; j < l; j++) { + if (not[j] === elem) { return false; } } @@ -4426,32 +4435,32 @@ return true; } else { - Sizzle.error( name ); + Sizzle.error(name); } }, - CHILD: function( elem, match ) { + CHILD: function (elem, match) { var type = match[1], node = elem; - switch ( type ) { + switch (type) { case "only": case "first": - while ( (node = node.previousSibling) ) { - if ( node.nodeType === 1 ) { + while ((node = node.previousSibling)) { + if (node.nodeType === 1) { return false; } } - if ( type === "first" ) { + if (type === "first") { return true; } node = elem; case "last": - while ( (node = node.nextSibling) ) { - if ( node.nodeType === 1 ) { + while ((node = node.nextSibling)) { + if (node.nodeType === 1) { return false; } } @@ -4462,18 +4471,18 @@ var first = match[2], last = match[3]; - if ( first === 1 && last === 0 ) { + if (first === 1 && last === 0) { return true; } var doneName = match[0], parent = elem.parentNode; - if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) { + if (parent && (parent.sizcache !== doneName || !elem.nodeIndex)) { var count = 0; - for ( node = parent.firstChild; node; node = node.nextSibling ) { - if ( node.nodeType === 1 ) { + for (node = parent.firstChild; node; node = node.nextSibling) { + if (node.nodeType === 1) { node.nodeIndex = ++count; } } @@ -4483,35 +4492,35 @@ var diff = elem.nodeIndex - last; - if ( first === 0 ) { + if (first === 0) { return diff === 0; } else { - return ( diff % first === 0 && diff / first >= 0 ); + return (diff % first === 0 && diff / first >= 0); } } }, - ID: function( elem, match ) { + ID: function (elem, match) { return elem.nodeType === 1 && elem.getAttribute("id") === match; }, - TAG: function( elem, match ) { + TAG: function (elem, match) { return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match; }, - CLASS: function( elem, match ) { + CLASS: function (elem, match) { return (" " + (elem.className || elem.getAttribute("class")) + " ") - .indexOf( match ) > -1; + .indexOf(match) > -1; }, - ATTR: function( elem, match ) { + ATTR: function (elem, match) { var name = match[1], - result = Expr.attrHandle[ name ] ? - Expr.attrHandle[ name ]( elem ) : - elem[ name ] != null ? - elem[ name ] : - elem.getAttribute( name ), + result = Expr.attrHandle[name] ? + Expr.attrHandle[name](elem) : + elem[name] != null ? + elem[name] : + elem.getAttribute(name), value = result + "", type = match[2], check = match[4]; @@ -4537,32 +4546,32 @@ false; }, - POS: function( elem, match, i, array ) { + POS: function (elem, match, i, array) { var name = match[2], - filter = Expr.setFilters[ name ]; + filter = Expr.setFilters[name]; - if ( filter ) { - return filter( elem, i, match, array ); + if (filter) { + return filter(elem, i, match, array); } } } }; var origPOS = Expr.match.POS, - fescape = function(all, num){ + fescape = function (all, num) { return "\\" + (num - 0 + 1); }; - for ( var type in Expr.match ) { - Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) ); - Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) ); + for (var type in Expr.match) { + Expr.match[type] = new RegExp(Expr.match[type].source + (/(?![^\[]*\])(?![^\(]*\))/.source)); + Expr.leftMatch[type] = new RegExp(/(^(?:.|\r|\n)*?)/.source + Expr.match[type].source.replace(/\\(\d+)/g, fescape)); } - var makeArray = function( array, results ) { - array = Array.prototype.slice.call( array, 0 ); + var makeArray = function (array, results) { + array = Array.prototype.slice.call(array, 0); - if ( results ) { - results.push.apply( results, array ); + if (results) { + results.push.apply(results, array); return results; } @@ -4574,26 +4583,26 @@ // Also verifies that the returned array holds DOM nodes // (which is not the case in the Blackberry browser) try { - Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType; + Array.prototype.slice.call(document.documentElement.childNodes, 0)[0].nodeType; // Provide a fallback method if it does not work - } catch( e ) { - makeArray = function( array, results ) { + } catch (e) { + makeArray = function (array, results) { var i = 0, ret = results || []; - if ( toString.call(array) === "[object Array]" ) { - Array.prototype.push.apply( ret, array ); + if (toString.call(array) === "[object Array]") { + Array.prototype.push.apply(ret, array); } else { - if ( typeof array.length === "number" ) { - for ( var l = array.length; i < l; i++ ) { - ret.push( array[i] ); + if (typeof array.length === "number") { + for (var l = array.length; i < l; i++) { + ret.push(array[i]); } } else { - for ( ; array[i]; i++ ) { - ret.push( array[i] ); + for (; array[i]; i++) { + ret.push(array[i]); } } } @@ -4604,14 +4613,14 @@ var sortOrder, siblingCheck; - if ( document.documentElement.compareDocumentPosition ) { - sortOrder = function( a, b ) { - if ( a === b ) { + if (document.documentElement.compareDocumentPosition) { + sortOrder = function (a, b) { + if (a === b) { hasDuplicate = true; return 0; } - if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) { + if (!a.compareDocumentPosition || !b.compareDocumentPosition) { return a.compareDocumentPosition ? -1 : 1; } @@ -4619,14 +4628,14 @@ }; } else { - sortOrder = function( a, b ) { + sortOrder = function (a, b) { // The nodes are identical, we can exit early - if ( a === b ) { + if (a === b) { hasDuplicate = true; return 0; // Fallback to using sourceIndex (in IE) if it's available on both nodes - } else if ( a.sourceIndex && b.sourceIndex ) { + } else if (a.sourceIndex && b.sourceIndex) { return a.sourceIndex - b.sourceIndex; } @@ -4638,28 +4647,28 @@ cur = aup; // If the nodes are siblings (or identical) we can do a quick check - if ( aup === bup ) { - return siblingCheck( a, b ); + if (aup === bup) { + return siblingCheck(a, b); // If no parents were found then the nodes are disconnected - } else if ( !aup ) { + } else if (!aup) { return -1; - } else if ( !bup ) { + } else if (!bup) { return 1; } // Otherwise they're somewhere else in the tree so we need // to build up a full list of the parentNodes for comparison - while ( cur ) { - ap.unshift( cur ); + while (cur) { + ap.unshift(cur); cur = cur.parentNode; } cur = bup; - while ( cur ) { - bp.unshift( cur ); + while (cur) { + bp.unshift(cur); cur = cur.parentNode; } @@ -4667,27 +4676,27 @@ bl = bp.length; // Start walking down the tree looking for a discrepancy - for ( var i = 0; i < al && i < bl; i++ ) { - if ( ap[i] !== bp[i] ) { - return siblingCheck( ap[i], bp[i] ); + for (var i = 0; i < al && i < bl; i++) { + if (ap[i] !== bp[i]) { + return siblingCheck(ap[i], bp[i]); } } // We ended someplace up the tree so do a sibling check return i === al ? - siblingCheck( a, bp[i], -1 ) : - siblingCheck( ap[i], b, 1 ); + siblingCheck(a, bp[i], -1) : + siblingCheck(ap[i], b, 1); }; - siblingCheck = function( a, b, ret ) { - if ( a === b ) { + siblingCheck = function (a, b, ret) { + if (a === b) { return ret; } var cur = a.nextSibling; - while ( cur ) { - if ( cur === b ) { + while (cur) { + if (cur === b) { return -1; } @@ -4699,19 +4708,19 @@ } // Utility function for retreiving the text value of an array of DOM nodes - Sizzle.getText = function( elems ) { + Sizzle.getText = function (elems) { var ret = "", elem; - for ( var i = 0; elems[i]; i++ ) { + for (var i = 0; elems[i]; i++) { elem = elems[i]; // Get the text from text nodes and CDATA nodes - if ( elem.nodeType === 3 || elem.nodeType === 4 ) { + if (elem.nodeType === 3 || elem.nodeType === 4) { ret += elem.nodeValue; // Traverse everything else, except comment nodes - } else if ( elem.nodeType !== 8 ) { - ret += Sizzle.getText( elem.childNodes ); + } else if (elem.nodeType !== 8) { + ret += Sizzle.getText(elem.childNodes); } } @@ -4720,7 +4729,7 @@ // Check to see if the browser returns elements by name when // querying by getElementById (and provide a workaround) - (function(){ + (function () { // We're going to inject a fake input element with a specified name var form = document.createElement("div"), id = "script" + (new Date()).getTime(), @@ -4729,13 +4738,13 @@ form.innerHTML = ""; // Inject it into the root element, check its status, and remove it quickly - root.insertBefore( form, root.firstChild ); + root.insertBefore(form, root.firstChild); // The workaround has to do additional checks after a getElementById // Which slows things down for other browsers (hence the branching) - if ( document.getElementById( id ) ) { - Expr.find.ID = function( match, context, isXML ) { - if ( typeof context.getElementById !== "undefined" && !isXML ) { + if (document.getElementById(id)) { + Expr.find.ID = function (match, context, isXML) { + if (typeof context.getElementById !== "undefined" && !isXML) { var m = context.getElementById(match[1]); return m ? @@ -4746,39 +4755,39 @@ } }; - Expr.filter.ID = function( elem, match ) { + Expr.filter.ID = function (elem, match) { var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); return elem.nodeType === 1 && node && node.nodeValue === match; }; } - root.removeChild( form ); + root.removeChild(form); // release memory in IE root = form = null; })(); - (function(){ + (function () { // Check to see if the browser returns only elements // when doing getElementsByTagName("*") // Create a fake element var div = document.createElement("div"); - div.appendChild( document.createComment("") ); + div.appendChild(document.createComment("")); // Make sure no comments are found - if ( div.getElementsByTagName("*").length > 0 ) { - Expr.find.TAG = function( match, context ) { - var results = context.getElementsByTagName( match[1] ); + if (div.getElementsByTagName("*").length > 0) { + Expr.find.TAG = function (match, context) { + var results = context.getElementsByTagName(match[1]); // Filter out possible comments - if ( match[1] === "*" ) { + if (match[1] === "*") { var tmp = []; - for ( var i = 0; results[i]; i++ ) { - if ( results[i].nodeType === 1 ) { - tmp.push( results[i] ); + for (var i = 0; results[i]; i++) { + if (results[i].nodeType === 1) { + tmp.push(results[i]); } } @@ -4792,11 +4801,11 @@ // Check to see if an attribute returns normalized href attributes div.innerHTML = ""; - if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && - div.firstChild.getAttribute("href") !== "#" ) { + if (div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && + div.firstChild.getAttribute("href") !== "#") { - Expr.attrHandle.href = function( elem ) { - return elem.getAttribute( "href", 2 ); + Expr.attrHandle.href = function (elem) { + return elem.getAttribute("href", 2); }; } @@ -4804,8 +4813,8 @@ div = null; })(); - if ( document.querySelectorAll ) { - (function(){ + if (document.querySelectorAll) { + (function () { var oldSizzle = Sizzle, div = document.createElement("div"), id = "__sizzle__"; @@ -4814,87 +4823,88 @@ // Safari can't handle uppercase or unicode characters when // in quirks mode. - if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { + if (div.querySelectorAll && div.querySelectorAll(".TEST").length === 0) { return; } - Sizzle = function( query, context, extra, seed ) { + Sizzle = function (query, context, extra, seed) { context = context || document; // Only use querySelectorAll on non-XML documents // (ID selectors don't work in non-HTML documents) - if ( !seed && !Sizzle.isXML(context) ) { + if (!seed && !Sizzle.isXML(context)) { // See if we find a selector to speed up - var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query ); + var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(query); - if ( match && (context.nodeType === 1 || context.nodeType === 9) ) { + if (match && (context.nodeType === 1 || context.nodeType === 9)) { // Speed-up: Sizzle("TAG") - if ( match[1] ) { - return makeArray( context.getElementsByTagName( query ), extra ); + if (match[1]) { + return makeArray(context.getElementsByTagName(query), extra); // Speed-up: Sizzle(".CLASS") - } else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) { - return makeArray( context.getElementsByClassName( match[2] ), extra ); + } else if (match[2] && Expr.find.CLASS && context.getElementsByClassName) { + return makeArray(context.getElementsByClassName(match[2]), extra); } } - if ( context.nodeType === 9 ) { + if (context.nodeType === 9) { // Speed-up: Sizzle("body") // The body element only exists once, optimize finding it - if ( query === "body" && context.body ) { - return makeArray( [ context.body ], extra ); + if (query === "body" && context.body) { + return makeArray([context.body], extra); // Speed-up: Sizzle("#ID") - } else if ( match && match[3] ) { - var elem = context.getElementById( match[3] ); + } else if (match && match[3]) { + var elem = context.getElementById(match[3]); // Check parentNode to catch when Blackberry 4.6 returns // nodes that are no longer in the document #6963 - if ( elem && elem.parentNode ) { + if (elem && elem.parentNode) { // Handle the case where IE and Opera return items // by name instead of ID - if ( elem.id === match[3] ) { - return makeArray( [ elem ], extra ); + if (elem.id === match[3]) { + return makeArray([elem], extra); } } else { - return makeArray( [], extra ); + return makeArray([], extra); } } try { - return makeArray( context.querySelectorAll(query), extra ); - } catch(qsaError) {} + return makeArray(context.querySelectorAll(query), extra); + } catch (qsaError) { + } // qSA works strangely on Element-rooted queries // We can work around this by specifying an extra ID on the root // and working up from there (Thanks to Andrew Dupont for the technique) // IE 8 doesn't work on object elements - } else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { + } else if (context.nodeType === 1 && context.nodeName.toLowerCase() !== "object") { var oldContext = context, - old = context.getAttribute( "id" ), + old = context.getAttribute("id"), nid = old || id, hasParent = context.parentNode, - relativeHierarchySelector = /^\s*[+~]/.test( query ); + relativeHierarchySelector = /^\s*[+~]/.test(query); - if ( !old ) { - context.setAttribute( "id", nid ); + if (!old) { + context.setAttribute("id", nid); } else { - nid = nid.replace( /'/g, "\\$&" ); + nid = nid.replace(/'/g, "\\$&"); } - if ( relativeHierarchySelector && hasParent ) { + if (relativeHierarchySelector && hasParent) { context = context.parentNode; } try { - if ( !relativeHierarchySelector || hasParent ) { - return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra ); + if (!relativeHierarchySelector || hasParent) { + return makeArray(context.querySelectorAll("[id='" + nid + "'] " + query), extra); } - } catch(pseudoError) { + } catch (pseudoError) { } finally { - if ( !old ) { - oldContext.removeAttribute( "id" ); + if (!old) { + oldContext.removeAttribute("id"); } } } @@ -4903,8 +4913,8 @@ return oldSizzle(query, context, extra, seed); }; - for ( var prop in oldSizzle ) { - Sizzle[ prop ] = oldSizzle[ prop ]; + for (var prop in oldSizzle) { + Sizzle[prop] = oldSizzle[prop]; } // release memory in IE @@ -4912,43 +4922,44 @@ })(); } - (function(){ + (function () { var html = document.documentElement, matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector; - if ( matches ) { + if (matches) { // Check to see if it's possible to do matchesSelector // on a disconnected node (IE 9 fails this) - var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ), + var disconnectedMatch = !matches.call(document.createElement("div"), "div"), pseudoWorks = false; try { // This should fail with an exception // Gecko does not error, returns false instead - matches.call( document.documentElement, "[test!='']:sizzle" ); + matches.call(document.documentElement, "[test!='']:sizzle"); - } catch( pseudoError ) { + } catch (pseudoError) { pseudoWorks = true; } - Sizzle.matchesSelector = function( node, expr ) { + Sizzle.matchesSelector = function (node, expr) { // Make sure that attribute selectors are quoted expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']"); - if ( !Sizzle.isXML( node ) ) { + if (!Sizzle.isXML(node)) { try { - if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) { - var ret = matches.call( node, expr ); + if (pseudoWorks || !Expr.match.PSEUDO.test(expr) && !/!=/.test(expr)) { + var ret = matches.call(node, expr); // IE 9's matchesSelector returns false on disconnected nodes - if ( ret || !disconnectedMatch || + if (ret || !disconnectedMatch || // As well, disconnected nodes are said to be in a document // fragment in IE 9, so check for that - node.document && node.document.nodeType !== 11 ) { + node.document && node.document.nodeType !== 11) { return ret; } } - } catch(e) {} + } catch (e) { + } } return Sizzle(expr, null, null, [node]).length > 0; @@ -4956,27 +4967,27 @@ } })(); - (function(){ + (function () { var div = document.createElement("div"); div.innerHTML = "
"; // Opera can't find a second classname (in 9.6) // Also, make sure that getElementsByClassName actually exists - if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) { + if (!div.getElementsByClassName || div.getElementsByClassName("e").length === 0) { return; } // Safari caches class attributes, doesn't catch changes (in 3.2) div.lastChild.className = "e"; - if ( div.getElementsByClassName("e").length === 1 ) { + if (div.getElementsByClassName("e").length === 1) { return; } Expr.order.splice(1, 0, "CLASS"); - Expr.find.CLASS = function( match, context, isXML ) { - if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { + Expr.find.CLASS = function (match, context, isXML) { + if (typeof context.getElementsByClassName !== "undefined" && !isXML) { return context.getElementsByClassName(match[1]); } }; @@ -4985,27 +4996,27 @@ div = null; })(); - function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { + function dirNodeCheck(dir, cur, doneName, checkSet, nodeCheck, isXML) { + for (var i = 0, l = checkSet.length; i < l; i++) { var elem = checkSet[i]; - if ( elem ) { + if (elem) { var match = false; elem = elem[dir]; - while ( elem ) { - if ( elem.sizcache === doneName ) { + while (elem) { + if (elem.sizcache === doneName) { match = checkSet[elem.sizset]; break; } - if ( elem.nodeType === 1 && !isXML ){ + if (elem.nodeType === 1 && !isXML) { elem.sizcache = doneName; elem.sizset = i; } - if ( elem.nodeName.toLowerCase() === cur ) { + if (elem.nodeName.toLowerCase() === cur) { match = elem; break; } @@ -5018,34 +5029,34 @@ } } - function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { + function dirCheck(dir, cur, doneName, checkSet, nodeCheck, isXML) { + for (var i = 0, l = checkSet.length; i < l; i++) { var elem = checkSet[i]; - if ( elem ) { + if (elem) { var match = false; elem = elem[dir]; - while ( elem ) { - if ( elem.sizcache === doneName ) { + while (elem) { + if (elem.sizcache === doneName) { match = checkSet[elem.sizset]; break; } - if ( elem.nodeType === 1 ) { - if ( !isXML ) { + if (elem.nodeType === 1) { + if (!isXML) { elem.sizcache = doneName; elem.sizset = i; } - if ( typeof cur !== "string" ) { - if ( elem === cur ) { + if (typeof cur !== "string") { + if (elem === cur) { match = true; break; } - } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) { + } else if (Sizzle.filter(cur, [elem]).length > 0) { match = elem; break; } @@ -5059,23 +5070,23 @@ } } - if ( document.documentElement.contains ) { - Sizzle.contains = function( a, b ) { + if (document.documentElement.contains) { + Sizzle.contains = function (a, b) { return a !== b && (a.contains ? a.contains(b) : true); }; - } else if ( document.documentElement.compareDocumentPosition ) { - Sizzle.contains = function( a, b ) { + } else if (document.documentElement.compareDocumentPosition) { + Sizzle.contains = function (a, b) { return !!(a.compareDocumentPosition(b) & 16); }; } else { - Sizzle.contains = function() { + Sizzle.contains = function () { return false; }; } - Sizzle.isXML = function( elem ) { + Sizzle.isXML = function (elem) { // documentElement is verified for cases where it doesn't yet exist // (such as loading iframes in IE - #4833) var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; @@ -5083,7 +5094,7 @@ return documentElement ? documentElement.nodeName !== "HTML" : false; }; - var posProcess = function( selector, context ) { + var posProcess = function (selector, context) { var match, tmpSet = [], later = "", @@ -5091,18 +5102,18 @@ // Position selectors must be done after the filter // And so must :not(positional) so we move all PSEUDOs to the end - while ( (match = Expr.match.PSEUDO.exec( selector )) ) { + while ((match = Expr.match.PSEUDO.exec(selector))) { later += match[0]; - selector = selector.replace( Expr.match.PSEUDO, "" ); + selector = selector.replace(Expr.match.PSEUDO, ""); } selector = Expr.relative[selector] ? selector + "*" : selector; - for ( var i = 0, l = root.length; i < l; i++ ) { - Sizzle( selector, root[i], tmpSet ); + for (var i = 0, l = root.length; i < l; i++) { + Sizzle(selector, root[i], tmpSet); } - return Sizzle.filter( later, tmpSet ); + return Sizzle.filter(later, tmpSet); }; // EXPOSE @@ -5134,32 +5145,32 @@ }; jQuery.fn.extend({ - find: function( selector ) { + find: function (selector) { var self = this, i, l; - if ( typeof selector !== "string" ) { - return jQuery( selector ).filter(function() { - for ( i = 0, l = self.length; i < l; i++ ) { - if ( jQuery.contains( self[ i ], this ) ) { + if (typeof selector !== "string") { + return jQuery(selector).filter(function () { + for (i = 0, l = self.length; i < l; i++) { + if (jQuery.contains(self[i], this)) { return true; } } }); } - var ret = this.pushStack( "", "find", selector ), + var ret = this.pushStack("", "find", selector), length, n, r; - for ( i = 0, l = this.length; i < l; i++ ) { + for (i = 0, l = this.length; i < l; i++) { length = ret.length; - jQuery.find( selector, this[i], ret ); + jQuery.find(selector, this[i], ret); - if ( i > 0 ) { + if (i > 0) { // Make sure that the results are unique - for ( n = length; n < ret.length; n++ ) { - for ( r = 0; r < length; r++ ) { - if ( ret[r] === ret[n] ) { + for (n = length; n < ret.length; n++) { + for (r = 0; r < length; r++) { + if (ret[r] === ret[n]) { ret.splice(n--, 1); break; } @@ -5171,57 +5182,57 @@ return ret; }, - has: function( target ) { - var targets = jQuery( target ); - return this.filter(function() { - for ( var i = 0, l = targets.length; i < l; i++ ) { - if ( jQuery.contains( this, targets[i] ) ) { + has: function (target) { + var targets = jQuery(target); + return this.filter(function () { + for (var i = 0, l = targets.length; i < l; i++) { + if (jQuery.contains(this, targets[i])) { return true; } } }); }, - not: function( selector ) { - return this.pushStack( winnow(this, selector, false), "not", selector); + not: function (selector) { + return this.pushStack(winnow(this, selector, false), "not", selector); }, - filter: function( selector ) { - return this.pushStack( winnow(this, selector, true), "filter", selector ); + filter: function (selector) { + return this.pushStack(winnow(this, selector, true), "filter", selector); }, - is: function( selector ) { - return !!selector && ( typeof selector === "string" ? - jQuery.filter( selector, this ).length > 0 : - this.filter( selector ).length > 0 ); + is: function (selector) { + return !!selector && (typeof selector === "string" ? + jQuery.filter(selector, this).length > 0 : + this.filter(selector).length > 0); }, - closest: function( selectors, context ) { + closest: function (selectors, context) { var ret = [], i, l, cur = this[0]; // Array - if ( jQuery.isArray( selectors ) ) { + if (jQuery.isArray(selectors)) { var match, selector, matches = {}, level = 1; - if ( cur && selectors.length ) { - for ( i = 0, l = selectors.length; i < l; i++ ) { + if (cur && selectors.length) { + for (i = 0, l = selectors.length; i < l; i++) { selector = selectors[i]; - if ( !matches[ selector ] ) { - matches[ selector ] = POS.test( selector ) ? - jQuery( selector, context || this.context ) : + if (!matches[selector]) { + matches[selector] = POS.test(selector) ? + jQuery(selector, context || this.context) : selector; } } - while ( cur && cur.ownerDocument && cur !== context ) { - for ( selector in matches ) { - match = matches[ selector ]; + while (cur && cur.ownerDocument && cur !== context) { + for (selector in matches) { + match = matches[selector]; - if ( match.jquery ? match.index( cur ) > -1 : jQuery( cur ).is( match ) ) { - ret.push({ selector: selector, elem: cur, level: level }); + if (match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match)) { + ret.push({selector: selector, elem: cur, level: level}); } } @@ -5234,166 +5245,166 @@ } // String - var pos = POS.test( selectors ) || typeof selectors !== "string" ? - jQuery( selectors, context || this.context ) : + var pos = POS.test(selectors) || typeof selectors !== "string" ? + jQuery(selectors, context || this.context) : 0; - for ( i = 0, l = this.length; i < l; i++ ) { + for (i = 0, l = this.length; i < l; i++) { cur = this[i]; - while ( cur ) { - if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) { - ret.push( cur ); + while (cur) { + if (pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors)) { + ret.push(cur); break; } else { cur = cur.parentNode; - if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) { + if (!cur || !cur.ownerDocument || cur === context || cur.nodeType === 11) { break; } } } } - ret = ret.length > 1 ? jQuery.unique( ret ) : ret; + ret = ret.length > 1 ? jQuery.unique(ret) : ret; - return this.pushStack( ret, "closest", selectors ); + return this.pushStack(ret, "closest", selectors); }, // Determine the position of an element within // the matched set of elements - index: function( elem ) { - if ( !elem || typeof elem === "string" ) { - return jQuery.inArray( this[0], + index: function (elem) { + if (!elem || typeof elem === "string") { + return jQuery.inArray(this[0], // If it receives a string, the selector is used // If it receives nothing, the siblings are used - elem ? jQuery( elem ) : this.parent().children() ); + elem ? jQuery(elem) : this.parent().children()); } // Locate the position of the desired element return jQuery.inArray( // If it receives a jQuery object, the first element is used - elem.jquery ? elem[0] : elem, this ); + elem.jquery ? elem[0] : elem, this); }, - add: function( selector, context ) { + add: function (selector, context) { var set = typeof selector === "string" ? - jQuery( selector, context ) : - jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ), - all = jQuery.merge( this.get(), set ); + jQuery(selector, context) : + jQuery.makeArray(selector && selector.nodeType ? [selector] : selector), + all = jQuery.merge(this.get(), set); - return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ? + return this.pushStack(isDisconnected(set[0]) || isDisconnected(all[0]) ? all : - jQuery.unique( all ) ); + jQuery.unique(all)); }, - andSelf: function() { - return this.add( this.prevObject ); + andSelf: function () { + return this.add(this.prevObject); } }); // A painfully simple check to see if an element is disconnected // from a document (should be improved, where feasible). - function isDisconnected( node ) { + function isDisconnected(node) { return !node || !node.parentNode || node.parentNode.nodeType === 11; } jQuery.each({ - parent: function( elem ) { + parent: function (elem) { var parent = elem.parentNode; return parent && parent.nodeType !== 11 ? parent : null; }, - parents: function( elem ) { - return jQuery.dir( elem, "parentNode" ); + parents: function (elem) { + return jQuery.dir(elem, "parentNode"); }, - parentsUntil: function( elem, i, until ) { - return jQuery.dir( elem, "parentNode", until ); + parentsUntil: function (elem, i, until) { + return jQuery.dir(elem, "parentNode", until); }, - next: function( elem ) { - return jQuery.nth( elem, 2, "nextSibling" ); + next: function (elem) { + return jQuery.nth(elem, 2, "nextSibling"); }, - prev: function( elem ) { - return jQuery.nth( elem, 2, "previousSibling" ); + prev: function (elem) { + return jQuery.nth(elem, 2, "previousSibling"); }, - nextAll: function( elem ) { - return jQuery.dir( elem, "nextSibling" ); + nextAll: function (elem) { + return jQuery.dir(elem, "nextSibling"); }, - prevAll: function( elem ) { - return jQuery.dir( elem, "previousSibling" ); + prevAll: function (elem) { + return jQuery.dir(elem, "previousSibling"); }, - nextUntil: function( elem, i, until ) { - return jQuery.dir( elem, "nextSibling", until ); + nextUntil: function (elem, i, until) { + return jQuery.dir(elem, "nextSibling", until); }, - prevUntil: function( elem, i, until ) { - return jQuery.dir( elem, "previousSibling", until ); + prevUntil: function (elem, i, until) { + return jQuery.dir(elem, "previousSibling", until); }, - siblings: function( elem ) { - return jQuery.sibling( elem.parentNode.firstChild, elem ); + siblings: function (elem) { + return jQuery.sibling(elem.parentNode.firstChild, elem); }, - children: function( elem ) { - return jQuery.sibling( elem.firstChild ); + children: function (elem) { + return jQuery.sibling(elem.firstChild); }, - contents: function( elem ) { - return jQuery.nodeName( elem, "iframe" ) ? + contents: function (elem) { + return jQuery.nodeName(elem, "iframe") ? elem.contentDocument || elem.contentWindow.document : - jQuery.makeArray( elem.childNodes ); + jQuery.makeArray(elem.childNodes); } - }, function( name, fn ) { - jQuery.fn[ name ] = function( until, selector ) { - var ret = jQuery.map( this, fn, until ), + }, function (name, fn) { + jQuery.fn[name] = function (until, selector) { + var ret = jQuery.map(this, fn, until), // The variable 'args' was introduced in // https://github.com/jquery/jquery/commit/52a0238 // to work around a bug in Chrome 10 (Dev) and should be removed when the bug is fixed. // http://code.google.com/p/v8/issues/detail?id=1050 args = slice.call(arguments); - if ( !runtil.test( name ) ) { + if (!runtil.test(name)) { selector = until; } - if ( selector && typeof selector === "string" ) { - ret = jQuery.filter( selector, ret ); + if (selector && typeof selector === "string") { + ret = jQuery.filter(selector, ret); } - ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret; + ret = this.length > 1 && !guaranteedUnique[name] ? jQuery.unique(ret) : ret; - if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) { + if ((this.length > 1 || rmultiselector.test(selector)) && rparentsprev.test(name)) { ret = ret.reverse(); } - return this.pushStack( ret, name, args.join(",") ); + return this.pushStack(ret, name, args.join(",")); }; }); jQuery.extend({ - filter: function( expr, elems, not ) { - if ( not ) { + filter: function (expr, elems, not) { + if (not) { expr = ":not(" + expr + ")"; } return elems.length === 1 ? - jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] : + jQuery.find.matchesSelector(elems[0], expr) ? [elems[0]] : [] : jQuery.find.matches(expr, elems); }, - dir: function( elem, dir, until ) { + dir: function (elem, dir, until) { var matched = [], - cur = elem[ dir ]; + cur = elem[dir]; - while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { - if ( cur.nodeType === 1 ) { - matched.push( cur ); + while (cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery(cur).is(until))) { + if (cur.nodeType === 1) { + matched.push(cur); } cur = cur[dir]; } return matched; }, - nth: function( cur, result, dir, elem ) { + nth: function (cur, result, dir, elem) { result = result || 1; var num = 0; - for ( ; cur; cur = cur[dir] ) { - if ( cur.nodeType === 1 && ++num === result ) { + for (; cur; cur = cur[dir]) { + if (cur.nodeType === 1 && ++num === result) { break; } } @@ -5401,12 +5412,12 @@ return cur; }, - sibling: function( n, elem ) { + sibling: function (n, elem) { var r = []; - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType === 1 && n !== elem ) { - r.push( n ); + for (; n; n = n.nextSibling) { + if (n.nodeType === 1 && n !== elem) { + r.push(n); } } @@ -5415,43 +5426,41 @@ }); // Implement the identical functionality for filter and not - function winnow( elements, qualifier, keep ) { + function winnow(elements, qualifier, keep) { // Can't pass null or undefined to indexOf in Firefox 4 // Set to 0 to skip string check qualifier = qualifier || 0; - if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep(elements, function( elem, i ) { - var retVal = !!qualifier.call( elem, i, elem ); + if (jQuery.isFunction(qualifier)) { + return jQuery.grep(elements, function (elem, i) { + var retVal = !!qualifier.call(elem, i, elem); return retVal === keep; }); - } else if ( qualifier.nodeType ) { - return jQuery.grep(elements, function( elem, i ) { + } else if (qualifier.nodeType) { + return jQuery.grep(elements, function (elem, i) { return (elem === qualifier) === keep; }); - } else if ( typeof qualifier === "string" ) { - var filtered = jQuery.grep(elements, function( elem ) { + } else if (typeof qualifier === "string") { + var filtered = jQuery.grep(elements, function (elem) { return elem.nodeType === 1; }); - if ( isSimple.test( qualifier ) ) { + if (isSimple.test(qualifier)) { return jQuery.filter(qualifier, filtered, !keep); } else { - qualifier = jQuery.filter( qualifier, filtered ); + qualifier = jQuery.filter(qualifier, filtered); } } - return jQuery.grep(elements, function( elem, i ) { - return (jQuery.inArray( elem, qualifier ) >= 0) === keep; + return jQuery.grep(elements, function (elem, i) { + return (jQuery.inArray(elem, qualifier) >= 0) === keep; }); } - - var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, rleadingWhitespace = /^\s+/, rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig, @@ -5464,14 +5473,14 @@ rscriptType = /\/(java|ecma)script/i, rcleanScript = /^\s*", "" ], - legend: [ 1, "
", "
" ], - thead: [ 1, "", "
" ], - tr: [ 2, "", "
" ], - td: [ 3, "", "
" ], - col: [ 2, "", "
" ], - area: [ 1, "", "" ], - _default: [ 0, "", "" ] + option: [1, ""], + legend: [1, "
", "
"], + thead: [1, "", "
"], + tr: [2, "", "
"], + td: [3, "", "
"], + col: [2, "", "
"], + area: [1, "", ""], + _default: [0, "", ""] }; wrapMap.optgroup = wrapMap.option; @@ -5479,141 +5488,141 @@ wrapMap.th = wrapMap.td; // IE can't serialize and diff --git a/WebSocketServer/src/main/resources/templates/chat.html b/WebSocketServer/src/main/resources/templates/chat.html index 67574f7..1049514 100644 --- a/WebSocketServer/src/main/resources/templates/chat.html +++ b/WebSocketServer/src/main/resources/templates/chat.html @@ -2,18 +2,18 @@ - Spring Boot WebSocket 点对点 + Spring Boot WebSocket Point-to-Point chat

- +
diff --git a/WebSocketServer/src/main/resources/templates/group.html b/WebSocketServer/src/main/resources/templates/group.html index 4a5247e..76988ed 100644 --- a/WebSocketServer/src/main/resources/templates/group.html +++ b/WebSocketServer/src/main/resources/templates/group.html @@ -4,24 +4,24 @@ - Spring Boot WebSocket 组内广播 + Spring Boot WebSocket Group chat
- +
- - + +
- + - +

From 875f73cd2aac5132e0b9f1dc2c7cc53e5a95314e Mon Sep 17 00:00:00 2001 From: xlui Date: Sat, 28 Sep 2019 11:55:02 +0800 Subject: [PATCH 3/3] Update comment and ui language --- .../im/activities/BroadcastActivity.java | 51 +++++----- .../example/im/activities/ChatActivity.java | 94 +++++++++---------- .../example/im/activities/GroupActivity.java | 81 ++++++++-------- .../java/app/xlui/example/im/conf/Const.java | 7 +- .../app/xlui/example/im/util/StompUtils.java | 33 +++---- .../app/src/main/res/values/strings.xml | 20 ++-- .../im/config/HandshakeInterceptor.java | 16 ++-- .../xlui/example/im/config/WebMvcConfig.java | 4 +- .../example/im/config/WebSocketConfig.java | 16 +++- .../example/im/web/WebSocketController.java | 31 +++--- .../main/resources/templates/broadcast.html | 4 +- .../src/main/resources/templates/chat.html | 4 +- .../src/main/resources/templates/group.html | 4 +- 13 files changed, 185 insertions(+), 180 deletions(-) diff --git a/AndroidClient/app/src/main/java/app/xlui/example/im/activities/BroadcastActivity.java b/AndroidClient/app/src/main/java/app/xlui/example/im/activities/BroadcastActivity.java index 46993f5..153f6e4 100644 --- a/AndroidClient/app/src/main/java/app/xlui/example/im/activities/BroadcastActivity.java +++ b/AndroidClient/app/src/main/java/app/xlui/example/im/activities/BroadcastActivity.java @@ -1,6 +1,5 @@ package app.xlui.example.im.activities; -import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; @@ -24,27 +23,26 @@ import ua.naiksoftware.stomp.dto.StompHeader; import ua.naiksoftware.stomp.dto.StompMessage; +@SuppressWarnings({"FieldCanBeLocal", "ResultOfMethodCallIgnored", "CheckResult"}) public class BroadcastActivity extends AppCompatActivity { - private Button broadcast; - private Button groups; - private Button chat; + private Button broadcastButton; + private Button groupButton; + private Button chatButton; - private EditText name; - private Button send; - private TextView result; + private EditText nameText; + private Button sendButton; + private TextView resultText; private void init() { - broadcast = findViewById(R.id.broadcast); - broadcast.setEnabled(false); - groups = findViewById(R.id.groups); - chat = findViewById(R.id.chat); - name = findViewById(R.id.name); - send = findViewById(R.id.send); - result = findViewById(R.id.show); + broadcastButton = findViewById(R.id.broadcast); + broadcastButton.setEnabled(false); + groupButton = findViewById(R.id.groups); + chatButton = findViewById(R.id.chat); + nameText = findViewById(R.id.name); + sendButton = findViewById(R.id.send); + resultText = findViewById(R.id.show); } - @SuppressLint("CheckResult") - @SuppressWarnings("ResultOfMethodCallIgnored") @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -53,29 +51,29 @@ protected void onCreate(Bundle savedInstanceState) { this.init(); StompClient stompClient = Stomp.over(Stomp.ConnectionProvider.OKHTTP, Const.address); - // 连接服务器 - stompClient.connect(); - Toast.makeText(this, "Connect start", Toast.LENGTH_SHORT).show(); StompUtils.lifecycle(stompClient); + Toast.makeText(this, "Start connecting to server", Toast.LENGTH_SHORT).show(); + // Connect to WebSocket server + stompClient.connect(); // 订阅消息 - Log.i(Const.TAG, "Subscribe broadcast"); + Log.i(Const.TAG, "Subscribe broadcast endpoint to receive response"); stompClient.topic(Const.broadcastResponse).subscribe(stompMessage -> { JSONObject jsonObject = new JSONObject(stompMessage.getPayload()); Log.i(Const.TAG, "Receive: " + stompMessage.getPayload()); runOnUiThread(() -> { try { - result.append(jsonObject.getString("response") + "\n"); + resultText.append(jsonObject.getString("response") + "\n"); } catch (JSONException e) { e.printStackTrace(); } }); }); - send.setOnClickListener(v -> { + sendButton.setOnClickListener(v -> { JSONObject jsonObject = new JSONObject(); try { - jsonObject.put("name", name.getText()); + jsonObject.put("name", nameText.getText()); } catch (JSONException e) { e.printStackTrace(); } @@ -84,7 +82,7 @@ protected void onCreate(Bundle savedInstanceState) { // Stomp command StompCommand.SEND, // Stomp Headers, Send Headers with STOMP - // the first header is necessary, and the other can be customized by ourselves + // the first header is required, and the other can be customized by ourselves Arrays.asList( new StompHeader(StompHeader.DESTINATION, Const.broadcast), new StompHeader("authorization", "this is a token generated by your code!") @@ -92,15 +90,16 @@ protected void onCreate(Bundle savedInstanceState) { // Stomp payload jsonObject.toString()) ).subscribe(); + nameText.setText(""); }); - groups.setOnClickListener(v -> { + groupButton.setOnClickListener(v -> { Intent intent = new Intent(); intent.setClass(BroadcastActivity.this, GroupActivity.class); startActivity(intent); this.finish(); }); - chat.setOnClickListener(v -> { + chatButton.setOnClickListener(v -> { Intent intent = new Intent(); intent.setClass(BroadcastActivity.this, ChatActivity.class); startActivity(intent); diff --git a/AndroidClient/app/src/main/java/app/xlui/example/im/activities/ChatActivity.java b/AndroidClient/app/src/main/java/app/xlui/example/im/activities/ChatActivity.java index fe0ace7..5f2040e 100644 --- a/AndroidClient/app/src/main/java/app/xlui/example/im/activities/ChatActivity.java +++ b/AndroidClient/app/src/main/java/app/xlui/example/im/activities/ChatActivity.java @@ -1,6 +1,5 @@ package app.xlui.example.im.activities; -import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; import android.support.annotation.Nullable; @@ -24,44 +23,43 @@ import ua.naiksoftware.stomp.Stomp; import ua.naiksoftware.stomp.StompClient; +@SuppressWarnings({"FieldCanBeLocal", "ResultOfMethodCallIgnored", "CheckResult"}) public class ChatActivity extends AppCompatActivity { - private Button broadcast; - private Button groups; - private Button chat; + private Button broadcastButton; + private Button groupButton; + private Button chatButton; - private TextView userId; - private EditText chatUserId; - private Button submit; - private EditText chatMessage; - private Button send; - private TextView show; + private TextView userIdText; + private EditText chatUserIdText; + private Button submitButton; + private EditText chatMessageText; + private Button sendButton; + private TextView showText; - private String user_id; - private String chat_user_id; + private String userId; + private String chatUserId; private void init() { - broadcast = findViewById(R.id.broadcast); - groups = findViewById(R.id.groups); - chat = findViewById(R.id.chat); - chat.setEnabled(false); + broadcastButton = findViewById(R.id.broadcast); + groupButton = findViewById(R.id.groups); + chatButton = findViewById(R.id.chat); + chatButton.setEnabled(false); - userId = findViewById(R.id.id); - user_id = String.valueOf(new Random().nextInt(100)); - userId.setText(user_id); + userIdText = findViewById(R.id.id); + userId = String.valueOf(new Random().nextInt(100)); + userIdText.setText(userId); - chatUserId = findViewById(R.id.chat_user_id); - submit = findViewById(R.id.submit); - submit.setEnabled(false); + chatUserIdText = findViewById(R.id.chat_user_id); + submitButton = findViewById(R.id.submit); + submitButton.setEnabled(false); - chatMessage = findViewById(R.id.chat_message); - send = findViewById(R.id.send); - send.setEnabled(false); + chatMessageText = findViewById(R.id.chat_message); + sendButton = findViewById(R.id.send); + sendButton.setEnabled(false); - show = findViewById(R.id.show); + showText = findViewById(R.id.show); } - @SuppressWarnings("ResultOfMethodCallIgnored") - @SuppressLint("CheckResult") @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -70,23 +68,24 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { this.init(); StompClient stompClient = Stomp.over(Stomp.ConnectionProvider.OKHTTP, Const.address); + Toast.makeText(this, "Start connecting to server", Toast.LENGTH_SHORT).show(); stompClient.connect(); - Toast.makeText(this, "Connect start", Toast.LENGTH_SHORT).show(); StompUtils.lifecycle(stompClient); - stompClient.topic(Const.chatResponse.replace(Const.placeholder, user_id)).subscribe(stompMessage -> { + Log.i(Const.TAG, "Subscribe chat endpoint to receive response"); + stompClient.topic(Const.chatResponse.replace(Const.placeholder, userId)).subscribe(stompMessage -> { JSONObject jsonObject = new JSONObject(stompMessage.getPayload()); Log.i(Const.TAG, "Receive: " + jsonObject.toString()); runOnUiThread(() -> { try { - show.append(jsonObject.getString("response") + "\n"); + showText.append(jsonObject.getString("response") + "\n"); } catch (JSONException e) { e.printStackTrace(); } }); }); - chatUserId.addTextChangedListener(new TextWatcher() { + chatUserIdText.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { @@ -99,42 +98,43 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { @Override public void afterTextChanged(Editable s) { - if (!submit.isEnabled()) - submit.setEnabled(true); + if (!submitButton.isEnabled()) + submitButton.setEnabled(true); } }); - submit.setOnClickListener(v -> { - chat_user_id = chatUserId.getText().toString(); - if (chat_user_id.length() == 0) { + submitButton.setOnClickListener(v -> { + chatUserId = chatUserIdText.getText().toString(); + if (chatUserId.length() == 0) { return; } - submit.setEnabled(false); - send.setEnabled(true); + submitButton.setEnabled(false); + sendButton.setEnabled(true); }); - send.setOnClickListener(v -> { + sendButton.setOnClickListener(v -> { JSONObject jsonObject = new JSONObject(); try { - jsonObject.put("userID", chat_user_id); - jsonObject.put("fromUserID", userId.getText().toString()); - jsonObject.put("message", chatMessage.getText()); + jsonObject.put("userID", chatUserId); + jsonObject.put("fromUserID", userIdText.getText().toString()); + jsonObject.put("message", chatMessageText.getText()); } catch (JSONException e) { e.printStackTrace(); } - if (chat_user_id == null || chat_user_id.length() == 0) { - chat_user_id = chatUserId.getText().toString(); + if (chatUserId == null || chatUserId.length() == 0) { + chatUserId = chatUserIdText.getText().toString(); } stompClient.send(Const.chat, jsonObject.toString()).subscribe(); + chatMessageText.setText(""); }); - broadcast.setOnClickListener(v -> { + broadcastButton.setOnClickListener(v -> { Intent intent = new Intent(); intent.setClass(ChatActivity.this, BroadcastActivity.class); startActivity(intent); this.finish(); }); - groups.setOnClickListener(v -> { + groupButton.setOnClickListener(v -> { Intent intent = new Intent(); intent.setClass(ChatActivity.this, GroupActivity.class); startActivity(intent); diff --git a/AndroidClient/app/src/main/java/app/xlui/example/im/activities/GroupActivity.java b/AndroidClient/app/src/main/java/app/xlui/example/im/activities/GroupActivity.java index ea09010..13af9bb 100644 --- a/AndroidClient/app/src/main/java/app/xlui/example/im/activities/GroupActivity.java +++ b/AndroidClient/app/src/main/java/app/xlui/example/im/activities/GroupActivity.java @@ -1,6 +1,5 @@ package app.xlui.example.im.activities; -import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; import android.support.annotation.Nullable; @@ -22,38 +21,37 @@ import ua.naiksoftware.stomp.Stomp; import ua.naiksoftware.stomp.StompClient; +@SuppressWarnings({"FieldCanBeLocal", "ResultOfMethodCallIgnored", "CheckResult"}) public class GroupActivity extends AppCompatActivity { - private Button broadcast; - private Button groups; - private Button chat; + private Button broadcastButton; + private Button groupButton; + private Button chatButton; - private EditText groupId; - private Button submit; - private EditText name; - private Button send; - private TextView show; + private EditText groupIdText; + private Button submitButton; + private EditText nameText; + private Button sendButton; + private TextView showText; - private String group_id; + private String groupId; private void init() { - broadcast = findViewById(R.id.broadcast); - groups = findViewById(R.id.groups); - groups.setEnabled(false); - chat = findViewById(R.id.chat); + broadcastButton = findViewById(R.id.broadcast); + groupButton = findViewById(R.id.groups); + groupButton.setEnabled(false); + chatButton = findViewById(R.id.chat); - groupId = findViewById(R.id.group_id); - submit = findViewById(R.id.submit); - submit.setEnabled(false); + groupIdText = findViewById(R.id.group_id); + submitButton = findViewById(R.id.submit); + submitButton.setEnabled(false); - name = findViewById(R.id.name); - send = findViewById(R.id.send); - send.setEnabled(false); + nameText = findViewById(R.id.name); + sendButton = findViewById(R.id.send); + sendButton.setEnabled(false); - show = findViewById(R.id.show); + showText = findViewById(R.id.show); } - @SuppressWarnings("ResultOfMethodCallIgnored") - @SuppressLint("CheckResult") @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -62,11 +60,11 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { this.init(); StompClient stompClient = Stomp.over(Stomp.ConnectionProvider.OKHTTP, Const.address); + Toast.makeText(this, "Start connecting to server", Toast.LENGTH_SHORT).show(); stompClient.connect(); - Toast.makeText(this, "Connect start", Toast.LENGTH_SHORT).show(); StompUtils.lifecycle(stompClient); - groupId.addTextChangedListener(new TextWatcher() { + groupIdText.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { @@ -79,51 +77,52 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { @Override public void afterTextChanged(Editable s) { - if (!submit.isEnabled()) - submit.setEnabled(true); + if (!submitButton.isEnabled()) + submitButton.setEnabled(true); } }); - submit.setOnClickListener(v -> { - group_id = groupId.getText().toString(); - if (group_id.length() == 0) { + submitButton.setOnClickListener(v -> { + groupId = groupIdText.getText().toString(); + if (groupId.length() == 0) { return; } - stompClient.topic(Const.groupResponse.replace("placeholder", group_id)).subscribe(stompMessage -> { + stompClient.topic(Const.groupResponse.replace(Const.placeholder, groupId)).subscribe(stompMessage -> { JSONObject jsonObject = new JSONObject(stompMessage.getPayload()); Log.i(Const.TAG, "Receive: " + stompMessage.getPayload()); runOnUiThread(() -> { try { - show.append(jsonObject.getString("response") + "\n"); + showText.append(jsonObject.getString("response") + "\n"); } catch (JSONException e) { e.printStackTrace(); } }); }); - submit.setEnabled(false); - send.setEnabled(true); + submitButton.setEnabled(false); + sendButton.setEnabled(true); }); - send.setOnClickListener(v -> { + sendButton.setOnClickListener(v -> { JSONObject jsonObject = new JSONObject(); try { - jsonObject.put("name", name.getText().toString()); + jsonObject.put("name", nameText.getText().toString()); } catch (JSONException e) { e.printStackTrace(); } - if (group_id == null || group_id.length() == 0) { - group_id = groupId.getText().toString(); + if (groupId == null || groupId.length() == 0) { + groupId = groupIdText.getText().toString(); } - stompClient.send(Const.group.replace("placeholder", group_id), jsonObject.toString()).subscribe(); + stompClient.send(Const.group.replace(Const.placeholder, groupId), jsonObject.toString()).subscribe(); + nameText.setText(""); }); - broadcast.setOnClickListener(v -> { + broadcastButton.setOnClickListener(v -> { Intent intent = new Intent(); intent.setClass(GroupActivity.this, BroadcastActivity.class); startActivity(intent); this.finish(); }); - chat.setOnClickListener(v -> { + chatButton.setOnClickListener(v -> { Intent intent = new Intent(); intent.setClass(GroupActivity.this, ChatActivity.class); startActivity(intent); diff --git a/AndroidClient/app/src/main/java/app/xlui/example/im/conf/Const.java b/AndroidClient/app/src/main/java/app/xlui/example/im/conf/Const.java index e7dbca0..6bd3a37 100644 --- a/AndroidClient/app/src/main/java/app/xlui/example/im/conf/Const.java +++ b/AndroidClient/app/src/main/java/app/xlui/example/im/conf/Const.java @@ -5,9 +5,10 @@ public class Const { public static final String placeholder = "placeholder"; /** - * URL 中的 {@code im} 是在服务器中配置的 endpoint， - * 如果使用 Android Studio 自带的 AVD，地址应该是 10.0.2.2； - * 如果使用 Genymotion，地址应该是 10.0.3.2 + * im in address is the endpoint configured in server. + * If you are using AVD provided by Android Studio, you should uncomment the upper address. + * If you are using Genymotion, nothing else to do. + * If you are using your own phone, just change the server address and port. */ // private static final String address = "ws://10.0.2.2:8080/im/websocket"; public static final String address = "ws://10.0.3.2:8080/im/websocket"; diff --git a/AndroidClient/app/src/main/java/app/xlui/example/im/util/StompUtils.java b/AndroidClient/app/src/main/java/app/xlui/example/im/util/StompUtils.java index a322b4e..d037138 100644 --- a/AndroidClient/app/src/main/java/app/xlui/example/im/util/StompUtils.java +++ b/AndroidClient/app/src/main/java/app/xlui/example/im/util/StompUtils.java @@ -1,28 +1,29 @@ package app.xlui.example.im.util; -import android.annotation.SuppressLint; import android.util.Log; import app.xlui.example.im.conf.Const; import ua.naiksoftware.stomp.StompClient; +import static app.xlui.example.im.conf.Const.TAG; + public class StompUtils { - @SuppressLint("CheckResult") + @SuppressWarnings({"ResultOfMethodCallIgnored", "CheckResult"}) public static void lifecycle(StompClient stompClient) { - stompClient.lifecycle().subscribe(lifecycleEvent -> { - switch (lifecycleEvent.getType()) { - case OPENED: - Log.d(Const.TAG, "Stomp connection opened"); - break; + stompClient.lifecycle().subscribe(lifecycleEvent -> { + switch (lifecycleEvent.getType()) { + case OPENED: + Log.d(TAG, "Stomp connection opened"); + break; - case ERROR: - Log.e(Const.TAG, "Error", lifecycleEvent.getException()); - break; + case ERROR: + Log.e(TAG, "Error", lifecycleEvent.getException()); + break; - case CLOSED: - Log.d(Const.TAG, "Stomp connection closed"); - break; - } - }); - } + case CLOSED: + Log.d(TAG, "Stomp connection closed"); + break; + } + }); + } } diff --git a/AndroidClient/app/src/main/res/values/strings.xml b/AndroidClient/app/src/main/res/values/strings.xml index 6de869e..0bd4d6e 100644 --- a/AndroidClient/app/src/main/res/values/strings.xml +++ b/AndroidClient/app/src/main/res/values/strings.xml @@ -1,17 +1,17 @@ Im - 广播 - 动态群组 - 点对点 + Broadcast + Groups + Chat - 请输入你的名字： - 发送 + Please input you name: + Send - 请输入你要加入的群组： - 确定 + Please input the group id: + Confirm - 你的ID是： - 请输入聊天对象的ID： - 请输入聊天内容： + Please input you id: + Please input chat user id: + Please input chat message diff --git a/WebSocketServer/src/main/java/app/xlui/example/im/config/HandshakeInterceptor.java b/WebSocketServer/src/main/java/app/xlui/example/im/config/HandshakeInterceptor.java index 9010be2..3c35316 100644 --- a/WebSocketServer/src/main/java/app/xlui/example/im/config/HandshakeInterceptor.java +++ b/WebSocketServer/src/main/java/app/xlui/example/im/config/HandshakeInterceptor.java @@ -1,7 +1,6 @@ package app.xlui.example.im.config; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.web.socket.WebSocketHandler; @@ -9,21 +8,18 @@ import java.util.Map; +@Slf4j public class HandshakeInterceptor extends HttpSessionHandshakeInterceptor { - private static Logger logger = LoggerFactory.getLogger("xlui"); - /** * Before websocket handshake * You can put some data into {@code attributes} here, and get it in WebSocketHandler's session - * - * WebSocket 握手前 *

- * 可以设置数据到 attributes 中，并在 WebSocketHandler 的 session 中获取 + * WebSocket 握手前 —— 可以设置数据到 attributes 中，并在 WebSocketHandler 的 session 中获取 */ @Override public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map attributes) throws Exception { - logger.info("HandshakeInterceptor: beforeHandshake"); - logger.info("Attributes: " + attributes.toString()); + log.info("HandshakeInterceptor: beforeHandshake"); + log.info("Attributes: " + attributes.toString()); return super.beforeHandshake(request, response, wsHandler, attributes); } @@ -32,7 +28,7 @@ public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse res */ @Override public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Exception ex) { - logger.info("HandshakeInterceptor: afterHandshake"); + log.info("HandshakeInterceptor: afterHandshake"); super.afterHandshake(request, response, wsHandler, ex); } } diff --git a/WebSocketServer/src/main/java/app/xlui/example/im/config/WebMvcConfig.java b/WebSocketServer/src/main/java/app/xlui/example/im/config/WebMvcConfig.java index 0ffc94b..d76eac7 100644 --- a/WebSocketServer/src/main/java/app/xlui/example/im/config/WebMvcConfig.java +++ b/WebSocketServer/src/main/java/app/xlui/example/im/config/WebMvcConfig.java @@ -2,10 +2,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration -public class WebMvcConfig extends WebMvcConfigurerAdapter { +public class WebMvcConfig implements WebMvcConfigurer { @Override public void addViewControllers(ViewControllerRegistry registry) { registry.addViewController("/broadcast").setViewName("/broadcast"); diff --git a/WebSocketServer/src/main/java/app/xlui/example/im/config/WebSocketConfig.java b/WebSocketServer/src/main/java/app/xlui/example/im/config/WebSocketConfig.java index 693e4da..0229f25 100644 --- a/WebSocketServer/src/main/java/app/xlui/example/im/config/WebSocketConfig.java +++ b/WebSocketServer/src/main/java/app/xlui/example/im/config/WebSocketConfig.java @@ -2,19 +2,19 @@ import org.springframework.context.annotation.Configuration; import org.springframework.messaging.simp.config.MessageBrokerRegistry; -import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; import org.springframework.web.socket.config.annotation.StompEndpointRegistry; +import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; @Configuration // Enable WebSocket's message broker // 启用 Websocket 的消息代理 @EnableWebSocketMessageBroker -public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer { +public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { /** * Register STOMP's endpoint - * We don't need to implement WebSocketHandler, STOMP has do the thins what it need to do. - * + * We don't need to implement WebSocketHandler, STOMP has done this thing. + *

* 注册 STOMP 协议的节点（Endpoint），并映射为指定的 URL * 我们使用 STOMP，所以不需要再实现 WebSocketHandler。 * 实现 WebSocketHandler 的目的是接收和处理消息，STOMP 已经为我们做了这些。 @@ -26,7 +26,13 @@ public void registerStompEndpoints(StompEndpointRegistry stompEndpointRegistry) stompEndpointRegistry.addEndpoint("/im").addInterceptors(new HandshakeInterceptor()).withSockJS(); } - // 配置使用消息代理 + /** + * Configure message broker + *

+ * 配置使用消息代理 + * + * @param registry message broker registry + */ @Override public void configureMessageBroker(MessageBrokerRegistry registry) { // Configure global message broker, client will subscribe these message brokers to receive messages diff --git a/WebSocketServer/src/main/java/app/xlui/example/im/web/WebSocketController.java b/WebSocketServer/src/main/java/app/xlui/example/im/web/WebSocketController.java index 2dd6a3a..72e6642 100644 --- a/WebSocketServer/src/main/java/app/xlui/example/im/web/WebSocketController.java +++ b/WebSocketServer/src/main/java/app/xlui/example/im/web/WebSocketController.java @@ -15,6 +15,7 @@ @Controller @Slf4j public class WebSocketController { + // You cannot integrate WebSocket with JWT for token validate. private static final String token = "this is a token generated by your code!"; private final SimpMessagingTemplate simpMessagingTemplate; @@ -23,23 +24,25 @@ public WebSocketController(SimpMessagingTemplate simpMessagingTemplate) { } /** - * @MessageMapping defines the endpoint for receiving message, client will send websocket message - * to endpoints defined in this method. @SendTo defines the return value's target endpoint of some - * method, clients which subscribe to this endpoint will receive the return value of this method. This method will - * send received message to all clients that subscribe @SendTo endpoint, just like a broadcast + * @MessageMapping defines the endpoint for receiving messages, client will send websocket message + * to endpoints defined in this annotation. + * @SendTo defines the return value's target endpoint of this method, clients which subscribe to + * this endpoint will receive the return value of this method. + * This method will simply send messages received to all clients that subscribe to endpoint specified in + * @SendTo, just like a broadcast * * @MessageMapping 定义接收消息的端点，客户端发送 WebSocket 消息到此端点。 * @SendTo 定义方法返回值发送的端点，订阅该端点的客户端可以收到服务器端的回复。 * 此端点默认将收到的消息发送到所有订阅了 @SendTo 端点的客户端，相当于广播。 * - * @param message 客户端消息 - * @param authorizationToken 自定义的请求校验 Token，后续也可以与 JWT 集成进行验证 - * @return 返回消息 + * @param message client message + * @param authorizationToken customize header, for token validate + * @return return client message to all clients that subscribe to /b */ // @MessageMapping("/broadcast") @SendTo("/b") - public Response say(Message message, @Header(value = "authorization") String authorizationToken) { + public Response broadcast(Message message, @Header(value = "authorization") String authorizationToken) { val response = new Response("Token check failed!"); if (authorizationToken.equals(token)) { log.info("Token check success!!!"); @@ -52,14 +55,14 @@ public Response say(Message message, @Header(value = "authorization") String aut /** * Add a placeholder in @MessageMapping to get the dynamic param in websocket url, for dynamic - * resending. Message sent to this method will be resent to any clients that subscribe endpoint {@code /g/}. + * resending. Message sent to this endpoint will be resent to any clients that subscribe endpoint {@code /g/}. * Just like a group chat. - * + *

* 通过在 @MessageMapping 中添加消息占位符来获取 url 内容，从而动态转发。 * 消息会发送到所有订阅了 {@code /g/} 的客户端，实现效果相当于群聊 * - * @param groupID 组ID - * @param message 发送的消息 + * @param groupID group id + * @param message client message */ @MessageMapping("/group/{groupID}") public void group(@DestinationVariable int groupID, Message message) { @@ -69,9 +72,9 @@ public void group(@DestinationVariable int groupID, Message message) { } /** - * Send message to specify user depend on {@code ChatMessage}, every user will subscribe himself/herself's endpoint + * Send message to specify user depend on {@link ChatMessage#getUserID}, each user will subscribe himself/herself's endpoint * {@code /user//msg}, just like point to point chat. - * + *

* 依据 {@code ChatMessage} 中的内容发送消息给特定用户，每个用户都订阅自己接受消息的端点 * {@code /user//msg}，实现效果类似点对点聊天 * diff --git a/WebSocketServer/src/main/resources/templates/broadcast.html b/WebSocketServer/src/main/resources/templates/broadcast.html index 5e24279..bcadbd2 100644 --- a/WebSocketServer/src/main/resources/templates/broadcast.html +++ b/WebSocketServer/src/main/resources/templates/broadcast.html @@ -1,12 +1,12 @@ - + Spring Boot WebSocket Broadcast

You browser does not support websocket!

+

Your browser does not support websocket!

diff --git a/WebSocketServer/src/main/resources/templates/chat.html b/WebSocketServer/src/main/resources/templates/chat.html index 1049514..d2950a3 100644 --- a/WebSocketServer/src/main/resources/templates/chat.html +++ b/WebSocketServer/src/main/resources/templates/chat.html @@ -1,12 +1,12 @@ - + Spring Boot WebSocket Point-to-Point chat
diff --git a/WebSocketServer/src/main/resources/templates/group.html b/WebSocketServer/src/main/resources/templates/group.html index 76988ed..6a6b035 100644 --- a/WebSocketServer/src/main/resources/templates/group.html +++ b/WebSocketServer/src/main/resources/templates/group.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@