diff --git a/account/decorators.py b/account/decorators.py index 1181c6a..2646c02 100644 --- a/account/decorators.py +++ b/account/decorators.py @@ -1,58 +1,48 @@ # coding=utf-8 +import functools from functools import wraps -from django.http import HttpResponse, HttpResponseRedirect -from django.shortcuts import render -from utils.shortcuts import error_response, error_page -from .models import User, SUPER_ADMIN +from django.http import HttpResponseRedirect + +from utils.shortcuts import error_response +from .models import SUPER_ADMIN, ADMIN -def login_required(func): - @wraps(func) - def check(*args, **kwargs): - # 在class based views 里面，args 有两个元素，一个是self, 第二个才是request， - # 在function based views 里面，args 只有request 一个参数 +class BasePermissionDecorator(object): + def __init__(self, func): + self.func = func + + def __get__(self, obj, obj_type): + return functools.partial(self.__call__, obj) + + def __call__(self, *args, **kwargs): if len(args) == 2: - request = args[-1] + self.request = args[1] else: - request = args[0] - if request.user.is_authenticated(): - return func(*args, **kwargs) - if request.is_ajax(): - return error_response(u"请先登录") + self.request = args[0] + + if self.check_permission(): + return self.func(*args, **kwargs) else: - return HttpResponseRedirect("/login/") - return check + if self.request.is_ajax(): + return error_response(u"请先登录") + else: + return HttpResponseRedirect("/login/") + + def check_permission(self): + raise NotImplementedError() -def admin_required(func): - @wraps(func) - def check(*args, **kwargs): - if len(args) == 2: - request = args[-1] - else: - request = args[0] - if request.user.is_authenticated() and request.user.admin_type: - return func(*args, **kwargs) - if request.is_ajax(): - return error_response(u"需要管理员权限") - else: - return error_page(request, u"需要管理员权限，如果没有登录，请先登录") - return check +class login_required(BasePermissionDecorator): + def check_permission(self): + return self.request.user.is_authenticated() -def super_admin_required(func): - @wraps(func) - def check(*args, **kwargs): - if len(args) == 2: - request = args[-1] - else: - request = args[0] - if request.user.is_authenticated() and request.user.admin_type == SUPER_ADMIN: - return func(*args, **kwargs) - if request.is_ajax(): - return error_response(u"需要超级管理员权限") - else: - return error_page(request, u"需要超级管理员权限") +class super_admin_required(BasePermissionDecorator): + def check_permission(self): + return self.request.user.is_authenticated() and self.request.user.admin_type == SUPER_ADMIN - return check \ No newline at end of file + +class admin_required(BasePermissionDecorator): + def check_permission(self): + return self.request.user.is_authenticated() and self.request.user.admin_type in [SUPER_ADMIN, ADMIN] \ No newline at end of file diff --git a/account/serializers.py b/account/serializers.py index 528edc7..13f3e24 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -7,7 +7,7 @@ from .models import User class UserLoginSerializer(serializers.Serializer): username = serializers.CharField(max_length=30) password = serializers.CharField(max_length=30) - captcha = serializers.CharField(required=False, min_length=4, max_length=4) + captcha = serializers.CharField(min_length=4, max_length=4) class UsernameCheckSerializer(serializers.Serializer): @@ -51,4 +51,10 @@ class EditUserSerializer(serializers.Serializer): class ApplyResetPasswordSerializer(serializers.Serializer): username = serializers.CharField(max_length=30) email = serializers.EmailField() + captcha = serializers.CharField(max_length=4, min_length=4) + + +class ResetPasswordSerializer(serializers.Serializer): + token = serializers.CharField(min_length=1, max_length=40) + password = serializers.CharField(min_length=6, max_length=30) captcha = serializers.CharField(max_length=4, min_length=4) \ No newline at end of file diff --git a/account/test_urls.py b/account/test_urls.py index 5d2bdcc..224ee63 100644 --- a/account/test_urls.py +++ b/account/test_urls.py @@ -3,7 +3,8 @@ from django.conf.urls import include, url from django.views.generic import TemplateView from .tests import (LoginRequiredCBVTestWithArgs, LoginRequiredCBVTestWithoutArgs, - AdminRequiredCBVTestWithArgs, AdminRequiredCBVTestWithoutArgs) + AdminRequiredCBVTestWithArgs, AdminRequiredCBVTestWithoutArgs, + SuperAdminRequiredCBVTestWithArgs, SuperAdminRequiredCBVTestWithoutArgs) urlpatterns = [ @@ -16,5 +17,11 @@ urlpatterns = [ url(r'^admin_required_test/fbv/(?P\d+)/$', "account.tests.admin_required_FBC_test_with_args"), url(r'^admin_required_test/cbv/1/$', AdminRequiredCBVTestWithoutArgs.as_view()), url(r'^admin_required_test/cbv/(?P\d+)/$', AdminRequiredCBVTestWithArgs.as_view()), + + url(r'^super_admin_required_test/fbv/1/$', "account.tests.super_admin_required_FBV_test_without_args"), + url(r'^super_admin_required_test/fbv/(?P\d+)/$', "account.tests.super_admin_required_FBC_test_with_args"), + url(r'^super_admin_required_test/cbv/1/$', SuperAdminRequiredCBVTestWithoutArgs.as_view()), + url(r'^super_admin_required_test/cbv/(?P\d+)/$', SuperAdminRequiredCBVTestWithArgs.as_view()), + url(r'^login/$', TemplateView.as_view(template_name="oj/account/login.html"), name="user_login_page"), ] diff --git a/account/tests.py b/account/tests.py index d0adf8a..968b4c2 100644 --- a/account/tests.py +++ b/account/tests.py @@ -1,17 +1,16 @@ # coding=utf-8 import json +import time from django.core.urlresolvers import reverse from django.test import TestCase, Client from django.http import HttpResponse from django.contrib import auth - from rest_framework.test import APITestCase, APIClient from rest_framework.views import APIView -from rest_framework.response import Response -from .models import User, SUPER_ADMIN -from .decorators import login_required, admin_required +from .models import User, SUPER_ADMIN, REGULAR_USER, ADMIN +from .decorators import login_required, admin_required, super_admin_required class UserLoginTest(TestCase): @@ -21,26 +20,44 @@ class UserLoginTest(TestCase): self.assertTemplateUsed(response, "oj/account/login.html") +def create_user(username="test", real_name="test_real_name", email="test@qq.com", + password="111111", admin_type=REGULAR_USER): + user = User.objects.create(username=username, real_name=real_name, email=email, admin_type=admin_type) + user.set_password(password) + user.save() + return user + + +def set_captcha(session): + session["_django_captcha_key"] = "aaaa" + session["_django_captcha_expires_time"] = time.time() + 10000 + session.save() + + class UserLoginAPITest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse("user_login_api") - user = User.objects.create(username="test") - user.set_password("test") - user.save() + self.user = create_user() + set_captcha(self.client.session) def test_invalid_data(self): data = {"username": "test"} response = self.client.post(self.url, data=data) self.assertEqual(response.data["code"], 1) + def test_captcha(self): + error_data = {"username": "test", "password": "test11", "captcha": "1111"} + response = self.client.post(self.url, data=error_data) + self.assertEqual(response.data, {"code": 1, "data": u"验证码错误"}) + def test_error_username_or_password(self): - error_data = {"username": "test", "password": "test11"} + error_data = {"username": "test", "password": "test11", "captcha": "aaaa"} response = self.client.post(self.url, data=error_data) self.assertEqual(response.data, {"code": 1, "data": u"用户名或密码错误"}) - def test_success_login(self): - data = {"username": "test", "password": "test"} + def test_login_successfully(self): + data = {"username": "test", "password": "111111", "captcha": "aaaa"} response = self.client.post(self.url, data=data) self.assertEqual(response.data, {"code": 0, "data": u"登录成功"}) @@ -49,69 +66,75 @@ class UsernameCheckTest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse("username_check_api") - User.objects.create(username="testtest") + create_user() def test_invalid_data(self): - response = self.client.post(self.url, data={"username111": "testtest"}) - self.assertEqual(response.data["code"], 1) + response = self.client.get(self.url, data={"username111": "testtest"}) + self.assertEqual(response.status_code, 200) def test_username_exists(self): - response = self.client.post(self.url, data={"username": "testtest"}) - self.assertEqual(response.data, {"code": 0, "data": True}) + response = self.client.get(self.url, data={"username": "test"}) + self.assertEqual(response.status_code, 400) def test_username_does_not_exist(self): - response = self.client.post(self.url, data={"username": "testtest123"}) - self.assertEqual(response.data, {"code": 0, "data": False}) + response = self.client.get(self.url, data={"username": "testtest123"}) + self.assertEqual(response.status_code, 200) class EmailCheckTest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse("email_check_api") - User.objects.create(email="11@qq.com") + create_user() def test_invalid_data(self): - response = self.client.post(self.url, data={"email000": "11@qq.com"}) - self.assertEqual(response.data["code"], 1) + response = self.client.get(self.url, data={"email000": "11@qq.com"}) + self.assertEqual(response.status_code, 200) def test_email_exists(self): - response = self.client.post(self.url, data={"email": "11@qq.com"}) - self.assertEqual(response.data, {"code": 0, "data": True}) + response = self.client.get(self.url, data={"email": "test@qq.com"}) + self.assertEqual(response.status_code, 400) def test_email_does_not_exist(self): - response = self.client.post(self.url, data={"email": "33@qq.com"}) - self.assertEqual(response.data, {"code": 0, "data": False}) + response = self.client.get(self.url, data={"email": "33testtest@qq.com"}) + self.assertEqual(response.status_code, 200) class UserRegisterAPITest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse("user_register_api") + set_captcha(self.client.session) def test_invalid_data(self): data = {"username": "test", "real_name": "TT"} response = self.client.post(self.url, data=data) self.assertEqual(response.data["code"], 1) + def test_captcha(self): + data = {"username": "test", "real_name": "TT", "password": "qqqqqq", "email": "6060@qq.com", "captcha": "bbaa"} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data, {"code": 1, "data": u"验证码错误"}) + def test_short_password(self): - data = {"username": "test", "real_name": "TT", "password": "qq", "email": "6060@qq.com"} + data = {"username": "test", "real_name": "TT", "password": "qq", "email": "6060@qq.com", "captcha": "aaaa"} response = self.client.post(self.url, data=data) self.assertEqual(response.data["code"], 1) def test_same_username(self): - User.objects.create(username="aa") - data = {"username": "aa", "real_name": "ww", "password": "zzzzzzz", "email": "6060@qq.com"} + create_user() + data = {"username": "test", "real_name": "ww", "password": "zzzzzzz", "email": "606fds0@qq.com", "captcha": "aaaa"} response = self.client.post(self.url, data=data) self.assertEqual(response.data, {"code": 1, "data": u"用户名已存在"}) def test_same_email(self): - User.objects.create(username="bb", email="8080@qq.com") - data = {"username": "aa", "real_name": "ww", "password": "zzzzzzz", "email": "8080@qq.com"} + create_user(username="test1", email="test1@qq.com") + data = {"username": "aa", "real_name": "ww", "password": "zzzzzzz", "email": "test1@qq.com", "captcha": "aaaa"} response = self.client.post(self.url, data=data) self.assertEqual(response.data, {"code": 1, "data": u"该邮箱已被注册，请换其他邮箱进行注册"}) - def test_success_email(self): - data = {"username": "cc", "real_name": "dd", "password": "xxxxxx", "email": "9090@qq.com"} + def test_register_successfully(self): + data = {"username": "cc", "real_name": "dd", "password": "xxxxxx", "email": "9090@qq.com", "captcha": "aaaa"} response = self.client.post(self.url, data=data) self.assertEqual(response.data, {"code": 0, "data": u"注册成功！"}) @@ -120,18 +143,27 @@ class UserChangePasswordAPITest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse("user_change_password_api") - user = User.objects.create(username="test") - user.set_password("aaabbb") - user.save() - self.client.login(username="test",password="aaabbb") + create_user() + self.client.login(username="test",password="111111") + set_captcha(self.client.session) + + def test_captcha(self): + data = {"old_password": "aaaccc", "new_password": "aaaddd", "captcha": "abba"} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data, {"code": 1, "data": u"验证码错误"}) + + def test_invalid_data(self): + data = {"new_password": "aaaddd", "captcha": "aaaa"} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data["code"], 1) def test_error_old_password(self): - data = {"old_password": "aaaccc", "new_password": "aaaddd"} + data = {"old_password": "aaaccc", "new_password": "aaaddd", "captcha": "aaaa"} response = self.client.post(self.url, data=data) self.assertEqual(response.data, {"code": 1, "data": u"密码不正确，请重新修改！"}) - def test_success_change_password(self): - data = {"username": "test", "old_password": "aaabbb", "new_password": "aaaccc"} + def test_change_password_successfully(self): + data = {"old_password": "111111", "new_password": "aaaccc", "captcha": "aaaa"} response = self.client.post(self.url, data=data) self.assertEqual(response.data, {"code": 0, "data": u"用户密码修改成功！"}) @@ -140,81 +172,82 @@ class UserAdminAPITest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse("user_admin_api") - self.user1 = User.objects.create(username="testx", real_name="xx", admin_type=SUPER_ADMIN) - self.user1.set_password("testxx") - self.user1.save() - self.user = User.objects.create(username="testy", real_name="yy", admin_type=SUPER_ADMIN) - self.user.set_password("testyy") - self.user.save() - self.client.login(username="testx", password="testxx") + self.user = create_user(admin_type=SUPER_ADMIN) + self.client.login(username="test", password="111111") - # 以下是编辑用户的测试 def test_success_get_data(self): self.assertEqual(self.client.get(self.url).data["code"], 0) + def test_super_admin_required(self): + create_user(username="test1", email="test1@qq.com", admin_type=ADMIN) + self.client.login(username="test1", password="111111") + + self.assertEqual(json.loads(self.client.get(self.url, HTTP_X_REQUESTED_WITH="XMLHttpRequest").content), + {"code": 1, "data": u"请先登录"}) + self.assertEqual(json.loads(self.client.put(self.url, HTTP_X_REQUESTED_WITH="XMLHttpRequest").content), + {"code": 1, "data": u"请先登录"}) + + # 这个拦截操作其实是 Middleware 完成的 + create_user(username="test2", email="test2@qq.com") + self.client.login(username="test2", password="111111") + self.assertEqual(json.loads(self.client.get(self.url, HTTP_X_REQUESTED_WITH="XMLHttpRequest").content), + {"code": 1, "data": u"请先登录"}) + self.assertEqual(json.loads(self.client.put(self.url, HTTP_X_REQUESTED_WITH="XMLHttpRequest").content), + {"code": 1, "data": u"请先登录"}) + def test_put_invalid_data(self): - data = {"username": "test", "password": "testaa", "email": "60@qq.com", "admin_type": "2"} + data = {"username": "test", "password": "testaa"} response = self.client.put(self.url, data=data) self.assertEqual(response.data["code"], 1) def test_user_does_not_exist(self): - data = {"id": 3, "username": "test0", "real_name": "test00", + data = {"id": 8888, "username": "test0", "real_name": "test00", "password": "testaa", "email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data, {"code": 1, "data": u"该用户不存在！"}) def test_username_exists(self): - data = {"id": self.user.id, "username": "testx", "real_name": "test00", + create_user(username="test1", email="test1@qq.com") + data = {"id": self.user.id, "username": "test1", "real_name": "test00", "password": "testaa", "email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data, {"code": 1, "data": u"昵称已经存在"}) - def test_user_edit_not_password_successfully(self): - data = {"id": self.user.id, "username": "test0", "real_name": "test00", + def test_edit_user_without_changing_password(self): + data = {"id": self.user.id, "username": "test2", "real_name": "test00", "email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data["code"], 0) - def test_user_edit_change_password_successfully(self): - data = {"id": self.user.id, "username": "test0", "real_name": "test00", "password": "111111", + def test_user_edit_with_changing_password(self): + data = {"id": self.user.id, "username": "test", "real_name": "test00", "password": "111111", "email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data["code"], 0) - self.assertIsNotNone(auth.authenticate(username="test0", password="111111")) + self.assertIsNotNone(auth.authenticate(username="test", password="111111")) + + def test_search_user(self): + r = self.assertEqual(self.client.get(self.url + "?keyword=11").status_code, 200) def test_error_admin_type(self): response = self.client.get(self.url + "?admin_type=error") self.assertEqual(response.data, {"code": 1, "data": u"参数错误"}) - # 以下是用户分页的测试 - def test_query_by_keyword(self): - user1 = User.objects.create(username="test1", real_name="aa") - user1.set_password("testaa") - user1.save() - - user2 = User.objects.create(username="test2", real_name="bb") - user2.set_password("testbb") - user2.save() - - user3 = User.objects.create(username="test3", real_name="cc") - user3.set_password("testcc") - user3.save() - - response = self.client.get(self.url + "?keyword=test1") - self.assertEqual(response.data["code"], 0) - class UserInfoAPITest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse('user_info_api') - user = User.objects.create(username="test1", real_name="aa") - user.set_password("testaa") - user.save() + self.user = create_user() def test_get_data_successfully(self): - self.client.login(username="test1", password="testaa") - self.assertEqual(self.client.get(self.url).data["code"], 0) + self.client.login(username="test", password="111111") + data = self.client.get(self.url).data + self.assertEqual(data["code"], 0) + self.assertEqual(data["data"]["username"], self.user.username) + + def test_get_data_without_logging_in(self): + self.assertEqual(self.client.get(self.url, HTTP_X_REQUESTED_WITH="XMLHttpRequest").data["code"], 1) @login_required @@ -324,7 +357,7 @@ class AdminRequiredDecoratorTest(TestCase): def test_fbv_without_args(self): # 没登陆 response = self.client.get("/admin_required_test/fbv/1/") - self.assertTemplateUsed(response, "utils/error.html") + self.assertRedirects(response, "/login/") # 登陆后 self.client.login(username="test", password="test") @@ -334,7 +367,7 @@ class AdminRequiredDecoratorTest(TestCase): def test_fbv_with_args(self): # 没登陆 response = self.client.get("/admin_required_test/fbv/1024/") - self.assertTemplateUsed(response, "utils/error.html") + self.assertRedirects(response, "/login/") # 登陆后 self.client.login(username="test", password="test") @@ -343,8 +376,8 @@ class AdminRequiredDecoratorTest(TestCase): def test_cbv_without_args(self): # 没登陆 - response = self.client.get("/admin_required_test/cbv/1/") - self.assertTemplateUsed(response, "utils/error.html") + response = self.client.get("/admin_required_test/cbv/1/", HTTP_X_REQUESTED_WITH='XMLHttpRequest') + self.assertEqual(response.data, {"code": 1, "data": u"请先登录"}) # 登陆后 self.client.login(username="test", password="test") @@ -354,7 +387,7 @@ class AdminRequiredDecoratorTest(TestCase): def test_cbv_with_args(self): # 没登陆 response = self.client.get("/admin_required_test/cbv/1024/", HTTP_X_REQUESTED_WITH='XMLHttpRequest') - self.assertEqual(json.loads(response.content), {"code": 1, "data": u"需要管理员权限"}) + self.assertEqual(response.data, {"code": 1, "data": u"请先登录"}) # 登陆后 self.client.login(username="test", password="test") @@ -362,16 +395,100 @@ class AdminRequiredDecoratorTest(TestCase): self.assertEqual(response.content, "1024") +@super_admin_required +def super_admin_required_FBV_test_without_args(request): + return HttpResponse("function based view test1") + + +@super_admin_required +def super_admin_required_FBC_test_with_args(request, problem_id): + return HttpResponse(problem_id) + + +class SuperAdminRequiredCBVTestWithoutArgs(APIView): + @super_admin_required + def get(self, request): + return HttpResponse("class based view login required test1") + + +class SuperAdminRequiredCBVTestWithArgs(APIView): + @super_admin_required + def get(self, request, problem_id): + return HttpResponse(problem_id) + + +class SuperAdminRequiredDecoratorTest(TestCase): + urls = 'account.test_urls' + + def setUp(self): + self.client = Client() + create_user(admin_type=SUPER_ADMIN) + + def test_fbv_without_args(self): + # 没登陆 + response = self.client.get("/super_admin_required_test/fbv/1/") + self.assertRedirects(response, "/login/") + + # 登陆后 + self.client.login(username="test", password="111111") + response = self.client.get("/super_admin_required_test/fbv/1/") + self.assertEqual(response.content, "function based view test1") + + def test_fbv_with_args(self): + # 没登陆 + response = self.client.get("/super_admin_required_test/fbv/1024/") + self.assertRedirects(response, "/login/") + + # 登陆后 + self.client.login(username="test", password="111111") + response = self.client.get("/super_admin_required_test/fbv/1024/") + self.assertEqual(response.content, "1024") + + def test_cbv_without_args(self): + # 没登陆 + response = self.client.get("/super_admin_required_test/cbv/1/", HTTP_X_REQUESTED_WITH='XMLHttpRequest') + self.assertEqual(response.data, {"code": 1, "data": u"请先登录"}) + + # 登陆后 + self.client.login(username="test", password="111111") + response = self.client.get("/super_admin_required_test/cbv/1/") + self.assertEqual(response.content, "class based view login required test1") + + def test_cbv_with_args(self): + # 没登陆 + response = self.client.get("/super_admin_required_test/cbv/1024/", HTTP_X_REQUESTED_WITH='XMLHttpRequest') + self.assertEqual(response.data, {"code": 1, "data": u"请先登录"}) + + # 登陆后 + self.client.login(username="test", password="111111") + response = self.client.get("/super_admin_required_test/cbv/10086/") + self.assertEqual(response.content, "10086") + + class UserLogoutTest(TestCase): def setUp(self): self.client = Client() - user = User.objects.create(username="test") - user.admin_type = 1 - user.set_password("1") - user.save() + create_user() def test_logout_success(self): self.client = Client() - self.client.login(username="test", password="1") + self.client.login(username="test", password="111111") response = self.client.get("/logout/") self.assertEqual(response.status_code, 302) + + +class IndexPageTest(TestCase): + def setUp(self): + create_user() + self.client = Client() + + def test_not_login_user(self): + self.assertTemplateUsed(self.client.get("/"), "oj/index.html") + + def test_no_referer_redirect(self): + self.client.login(username="test", password="111111") + self.assertRedirects(self.client.get("/"), "/problems/") + + def test_visit_with_referer(self): + self.client.login(username="test", password="111111") + self.assertTemplateUsed(self.client.get("/", HTTP_REFERER="/about/"), "oj/index.html") diff --git a/account/views.py b/account/views.py index 03ff442..b50e0a3 100644 --- a/account/views.py +++ b/account/views.py @@ -6,21 +6,21 @@ from django.shortcuts import render from django.db.models import Q from django.conf import settings from django.core.exceptions import MultipleObjectsReturned +from django.utils.timezone import now from rest_framework.views import APIView from rest_framework.response import Response -from utils.shortcuts import serializer_invalid_response, error_response, success_response, paginate, rand_str +from utils.shortcuts import (serializer_invalid_response, error_response, + success_response, error_page, paginate, rand_str) from utils.captcha import Captcha from mail.tasks import send_email -from envelopes import Envelope - from .decorators import login_required from .models import User from .serializers import (UserLoginSerializer, UsernameCheckSerializer, UserRegisterSerializer, UserChangePasswordSerializer, EmailCheckSerializer, UserSerializer, EditUserSerializer, - ApplyResetPasswordSerializer) + ApplyResetPasswordSerializer, ResetPasswordSerializer) from .decorators import super_admin_required @@ -34,13 +34,9 @@ class UserLoginAPIView(APIView): serializer = UserLoginSerializer(data=request.data) if serializer.is_valid(): data = serializer.data - - if "captcha" not in data: - return error_response(u"请填写验证码！") captcha = Captcha(request) if not captcha.check(data["captcha"]): return error_response(u"验证码错误") - user = auth.authenticate(username=data["username"], password=data["password"]) # 用户名或密码错误的话 返回None if user: @@ -244,21 +240,59 @@ class ApplyResetPasswordAPIView(APIView): user = User.objects.get(username=data["username"], email=data["email"]) except User.DoesNotExist: return error_response(u"用户不存在") + if user.reset_password_token_create_time and (now() - user.reset_password_token_create_time).total_seconds() < 20 * 60: + return error_response(u"20分钟内只能找回一次密码") user.reset_password_token = rand_str() + user.reset_password_token_create_time = now() user.save() email_template = codecs.open(settings.TEMPLATES[0]["DIRS"][0] + "utils/reset_password_email.html", "r", "utf-8").read() - email_template = email_template.replace("{{ username }}", user.username).replace("{{ link }}", request.scheme + "://" + request.META['HTTP_HOST'] + "/reset_password/?token=" + user.reset_password_token) + email_template = email_template.replace("{{ username }}", user.username).\ + replace("{{ website_name }}", settings.WEBSITE_INFO["website_name"]).\ + replace("{{ link }}", request.scheme + "://" + request.META['HTTP_HOST'] + "/reset_password/?token=" + user.reset_password_token) - send_email(user.email, user.username, u"qduoj 密码找回邮件", email_template) - return success_response(u"邮件发生成功") + send_email(settings.WEBSITE_INFO["website_name"], + user.email, + user.username, + settings.WEBSITE_INFO["website_name"] + u" 密码找回邮件", + email_template) + return success_response(u"邮件发送成功") else: return serializer_invalid_response(serializer) class ResetPasswordAPIView(APIView): - pass + def post(self, request): + serializer = ResetPasswordSerializer(data=request.data) + if serializer.is_valid(): + data = serializer.data + captcha = Captcha(request) + if not captcha.check(data["captcha"]): + return error_response(u"验证码错误") + try: + user = User.objects.get(reset_password_token=data["token"]) + except User.DoesNotExist: + return error_response(u"token 不存在") + if (now() - user.reset_password_token_create_time).total_seconds() > 30 * 60: + return error_response(u"token 已经过期，请在30分钟内重置密码") + user.reset_password_token = None + user.set_password(data["password"]) + user.save() + return success_response(u"密码重置成功") + else: + return serializer_invalid_response(serializer) def user_index_page(request, username): return render(request, "oj/account/user_index.html") + + +def auth_page(request): + if not request.user.is_authenticated(): + return render(request, "oj/account/oauth.html") + callback = request.GET.get("callback", None) + if not callback: + return error_page(request, u"参数错误") + token = rand_str() + request.user.auth_token = token + return render(request, "oj/account/oauth.html", {"callback": callback, "token": token}) diff --git a/announcement/decorators.py b/announcement/decorators.py deleted file mode 100644 index 96df987..0000000 --- a/announcement/decorators.py +++ /dev/null @@ -1,43 +0,0 @@ -# coding=utf-8 -from functools import wraps - -from django.http import HttpResponse, HttpResponseRedirect -from django.shortcuts import render - -from utils.shortcuts import error_response, error_page - -from account.models import SUPER_ADMIN -from .models import Announcement - - -def check_user_announcement_permission(func): - @wraps(func) - def _check_user_announcement_permission(*args, **kwargs): - """ - 这个函数检测当前用户能否查看这个公告 - """ - # CBV 的情况，第一个参数是self，第二个参数是request - if len(args) == 2: - request = args[-1] - else: - request = args[0] - - if "announcement_id" not in kwargs: - return error_page(request, u"参数错误") - announcement_id = kwargs["announcement_id"] - - try: - announcement = Announcement.objects.get(id=announcement_id, visible=True) - except Announcement.DoesNotExist: - return error_page(request, u"公告不存在") - - # 如果公告是只有部分小组可见的 - if not announcement.is_global: - # 用户必须是登录状态的 - if not request.user.is_authenticated(): - return HttpResponseRedirect("/login/") - if not announcement.groups.filter(id__in=request.user.group_set.all()).exists(): - return error_page(request, u"公告不存在") - return func(*args, **kwargs) - - return _check_user_announcement_permission diff --git a/announcement/migrations/0004_auto_20151015_1555.py b/announcement/migrations/0004_auto_20151015_1555.py new file mode 100644 index 0000000..bb8e6e1 --- /dev/null +++ b/announcement/migrations/0004_auto_20151015_1555.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('announcement', '0003_auto_20150922_1703'), + ] + + operations = [ + migrations.RemoveField( + model_name='announcement', + name='groups', + ), + migrations.RemoveField( + model_name='announcement', + name='is_global', + ), + ] diff --git a/announcement/models.py b/announcement/models.py index 7442721..b097d6f 100644 --- a/announcement/models.py +++ b/announcement/models.py @@ -19,9 +19,6 @@ class Announcement(models.Model): last_update_time = models.DateTimeField(auto_now=True) # 是否可见 false的话相当于删除 visible = models.BooleanField(default=True) - # 公告可见范围 True 是全局可见 False 是部分小组可见，需要在下面的字段中存储可见的小组 - is_global = models.BooleanField() - groups = models.ManyToManyField(Group) class Meta: db_table = "announcement" diff --git a/announcement/serializers.py b/announcement/serializers.py index ec24116..75c395f 100644 --- a/announcement/serializers.py +++ b/announcement/serializers.py @@ -8,8 +8,6 @@ from .models import Announcement class CreateAnnouncementSerializer(serializers.Serializer): title = serializers.CharField(max_length=50) content = serializers.CharField(max_length=10000) - is_global = serializers.BooleanField() - groups = serializers.ListField(child=serializers.IntegerField(), required=False, default=[]) class AnnouncementSerializer(serializers.ModelSerializer): @@ -29,6 +27,4 @@ class EditAnnouncementSerializer(serializers.Serializer): id = serializers.IntegerField() title = serializers.CharField(max_length=50) content = serializers.CharField(max_length=10000) - visible = serializers.BooleanField() - is_global = serializers.BooleanField() - groups = serializers.ListField(child=serializers.IntegerField(), required=False, default=[]) + visible = serializers.BooleanField() \ No newline at end of file diff --git a/announcement/tests.py b/announcement/tests.py index e37c183..ff9ca0c 100644 --- a/announcement/tests.py +++ b/announcement/tests.py @@ -1,171 +1,64 @@ # coding=utf-8 from django.core.urlresolvers import reverse -from django.test import TestCase - +from django.test import TestCase, Client from rest_framework.test import APITestCase, APIClient from account.models import User +from account.tests import create_user from group.models import Group from announcement.models import Announcement -from account.models import REGULAR_USER, ADMIN, SUPER_ADMIN +from account.models import ADMIN, SUPER_ADMIN class AnnouncementAdminAPITest(APITestCase): - def setUp(self): - self.client = APIClient() - self.url = reverse("announcement_admin_api") - user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN) - user1.set_password("testaa") - user1.save() - user2 = User.objects.create(username="test2", admin_type=ADMIN) - user2.set_password("testbb") - user2.save() - self.group = Group.objects.create(name="group1", description="des0", - join_group_setting=0, visible=True, - admin=user2) - self.announcement = Announcement.objects.create(title="bb", - content="BB", - created_by=User.objects.get(username="test2"), - is_global=False) + def setUp(self): + self.client = APIClient() + self.url = reverse("announcement_admin_api") + self.user1 = create_user(admin_type=SUPER_ADMIN) - # 以下是发布公告的测试 - def test_invalid_format(self): - self.client.login(username="test1", password="testaa") - data = {"title": "test1"} - response = self.client.post(self.url, data=data) - self.assertEqual(response.data["code"], 1) + self.user2 = create_user(username="test1", email="test1@qq.com", admin_type=SUPER_ADMIN) - def test_group_at_least_one(self): - self.client.login(username="test1", password="testaa") - data = {"title": "title0", "content": "content0", "is_global": False} - response = self.client.post(self.url, data=data) - self.assertEqual(response.data, {"code": 1, "data": u"至少选择一个小组"}) + self.announcement = Announcement.objects.create(title="bb", + content="BB", + created_by=self.user1) - def test_global_announcement_successfully(self): - self.client.login(username="test1", password="testaa") - data = {"title": "title0", "content": "content0", "is_global": True} - response = self.client.post(self.url, data=data) - self.assertEqual(response.data, {"code": 0, "data": u"公告发布成功！"}) + def test_create_announcement_successfully(self): + self.client.login(username="test", password="111111") + data = {"title": "title0", "content": "content0"} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data, {"code": 0, "data": u"公告发布成功！"}) - def test_group_announcement_successfully(self): - self.client.login(username="test2", password="testbb") - data = {"title": "title0", "content": "content0", "is_global": False, "groups": [self.group.id]} - response = self.client.post(self.url, data=data) - self.assertEqual(response.data, {"code": 0, "data": u"公告发布成功！"}) - - def test_global_announcement_does_not_has_privileges(self): - self.client.login(username="test2", password="testbb") - data = {"title": "title0", "content": "content0", "is_global": True} - response = self.client.post(self.url, data=data) - self.assertEqual(response.data, {"code": 1, "data": u"只有超级管理员可以创建全局公告"}) - - # 以下是编辑公告的测试 - def test_put_invalid_data(self): - self.client.login(username="test1", password="testaa") - data = {"title": "test0", "content": "test0", "visible": "True"} - response = self.client.put(self.url, data=data) - self.assertEqual(response.data["code"], 1) - - def test_announcement_does_not_exist(self): - self.client.login(username="test1", password="testaa") - announcement = Announcement.objects.create(title="aa", - content="AA", - created_by=User.objects.get(username="test1"), - is_global=True) - data = {"id": announcement.id + 1, "title": "11", "content": "22", - "visible": True, "is_global": True} - response = self.client.put(self.url, data=data) - self.assertEqual(response.data, {"code": 1, "data": u"公告不存在"}) - - def test_edit_global_announcement_successfully(self): - self.client.login(username="test1", password="testaa") - data = {"id": self.announcement.id, "title": "11", "content": "22", - "visible": True, "is_global": True} - response = self.client.put(self.url, data=data) - self.assertEqual(response.data["code"], 0) - - def test_edit_group_announcement_successfully(self): - self.client.login(username="test2", password="testbb") - data = {"id": self.announcement.id, "title": "11", "content": "22", - "visible": True, "is_global": False, "groups": [self.group.id]} - response = self.client.put(self.url, data=data) - self.assertEqual(response.data["code"], 0) - self.assertEqual(response.data["data"]["title"], "11") - self.assertEqual(response.data["data"]["content"], "22") - - def test_edit_group_at_least_one(self): - self.client.login(username="test1", password="testaa") - data = {"id": self.announcement.id, "title": "title0", "content": "content0", - "visible": True, "is_global": False} - response = self.client.put(self.url, data=data) - self.assertEqual(response.data, {"code": 1, "data": u"至少选择一个小组"}) - - # 以下是公告分页的测试 - def test_get_data_successfully(self): - self.client.login(username="test1", password="testaa") - self.assertEqual(self.client.get(self.url).data["code"], 0) - - def test_keyword_global_announcement(self): - self.client.login(username="test1", password="testaa") - Announcement.objects.create(title="aa", - content="AA", - created_by=User.objects.get(username="test1"), - visible=True, - is_global=True) - - Announcement.objects.create(title="bb", - content="BB", - created_by=User.objects.get(username="test1"), - visible=False, - is_global=True) - - response = self.client.get(self.url + "?visible=true") - self.assertEqual(response.data["code"], 0) - for item in response.data["data"]: - self.assertEqual(item["visible"], True) - - def test_keyword_group_announcement(self): - self.client.login(username="test2", password="testbb") - Announcement.objects.create(title="aa", - content="AA", - created_by=User.objects.get(username="test2"), - visible=True, - is_global=False) - - Announcement.objects.create(title="cc", - content="CC", - created_by=User.objects.get(username="test2"), - visible=False, - is_global=False) - - response = self.client.get(self.url + "?visible=true") - self.assertEqual(response.data["code"], 0) - for item in response.data["data"]: - self.assertEqual(item["visible"], True) + def test_edit_announcement_successfully(self): + self.client.login(username="test", password="111111") + data = {"id": self.announcement.id, "title": "11", "content": "22", "visible": True} + response = self.client.put(self.url, data=data) + self.assertEqual(response.data["code"], 0) class AnnouncementPageTest(TestCase): def setUp(self): - user = User.objects.create(username="test") - user.set_password("testaa") - user.save() - Announcement.objects.create(title="aa", - content="AA", - created_by=User.objects.get(username="test"), - visible=True, - is_global=True) + self.client = Client() + user = create_user() + self.a1 = Announcement.objects.create(title="aa", + content="AA", + created_by=user, + visible=True, + ) - Announcement.objects.create(title="bb", - content="BB", - created_by=User.objects.get(username="test"), - visible=False, - is_global=True) + self.a2 = Announcement.objects.create(title="bb", + content="BB", + created_by=User.objects.get(username="test"), + visible=False + ) def test_visit_announcement_successfully(self): - response = self.client.get('/announcement/1/') - self.assertEqual(response.status_code, 200) + response = self.client.get('/announcement/' + str(self.a1.id) + "/") + self.assertTemplateUsed(response, "oj/announcement/announcement.html") def test_announcement_does_not_exist(self): - response = self.client.get('/announcement/3/') + response = self.client.get('/announcement/10086/') self.assertTemplateUsed(response, "utils/error.html") + def test_visit_hidden_announcement(self): + response = self.client.get('/announcement/' + str(self.a2.id) + "/") + self.assertTemplateUsed(response, "utils/error.html") diff --git a/announcement/views.py b/announcement/views.py index 3160d9e..17a9fe1 100644 --- a/announcement/views.py +++ b/announcement/views.py @@ -6,20 +6,26 @@ from utils.shortcuts import serializer_invalid_response, error_response, success from utils.shortcuts import paginate, error_page from account.models import SUPER_ADMIN, ADMIN +from account.decorators import super_admin_required from group.models import Group from .models import Announcement from .serializers import (CreateAnnouncementSerializer, AnnouncementSerializer, EditAnnouncementSerializer) -from .decorators import check_user_announcement_permission -@check_user_announcement_permission def announcement_page(request, announcement_id): - announcement = Announcement.objects.get(id=announcement_id, visible=True) + """ + 公告的详情页面 + """ + try: + announcement = Announcement.objects.get(id=announcement_id, visible=True) + except Announcement.DoesNotExist: + return error_page(request, u"公告不存在") return render(request, "oj/announcement/announcement.html", {"announcement": announcement}) class AnnouncementAdminAPIView(APIView): + @super_admin_required def post(self, request): """ 公告发布json api接口 @@ -29,29 +35,12 @@ class AnnouncementAdminAPIView(APIView): serializer = CreateAnnouncementSerializer(data=request.data) if serializer.is_valid(): data = serializer.data - groups = [] - # 如果不是全局公告，就去查询一下小组的id 列表中的内容，注意用户身份 - if not data["is_global"]: - if request.user.admin_type == SUPER_ADMIN: - groups = Group.objects.filter(id__in=data["groups"]) - else: - groups = Group.objects.filter(id__in=data["groups"], admin=request.user) - if not groups.count(): - return error_response(u"至少选择一个小组") - else: - if request.user.admin_type != SUPER_ADMIN: - return error_response(u"只有超级管理员可以创建全局公告") - - announcement = Announcement.objects.create(title=data["title"], - content=data["content"], - created_by=request.user, - is_global=data["is_global"]) - - announcement.groups.add(*groups) + Announcement.objects.create(title=data["title"], content=data["content"], created_by=request.user) return success_response(u"公告发布成功！") else: return serializer_invalid_response(serializer) + @super_admin_required def put(self, request): """ 公告编辑json api接口 @@ -63,43 +52,27 @@ class AnnouncementAdminAPIView(APIView): if serializer.is_valid(): data = serializer.data try: - if request.user.admin_type == SUPER_ADMIN: - announcement = Announcement.objects.get(id=data["id"]) - else: - announcement = Announcement.objects.get(id=data["id"], created_by=request.user) + announcement = Announcement.objects.get(id=data["id"]) except Announcement.DoesNotExist: return error_response(u"公告不存在") - groups = [] - if not data["is_global"]: - if request.user.admin_type == SUPER_ADMIN: - groups = Group.objects.filter(id__in=data["groups"]) - else: - groups = Group.objects.filter(id__in=data["groups"], admin=request.user) - if not groups.count(): - return error_response(u"至少选择一个小组") + announcement.title = data["title"] announcement.content = data["content"] announcement.visible = data["visible"] - announcement.is_global = data["is_global"] announcement.save() - # 重建小组和公告的对应关系 - announcement.groups.clear() - announcement.groups.add(*groups) return success_response(AnnouncementSerializer(announcement).data) else: return serializer_invalid_response(serializer) + @super_admin_required def get(self, request): """ 公告分页json api接口 --- response_serializer: AnnouncementSerializer """ - if request.user.admin_type == SUPER_ADMIN: - announcement = Announcement.objects.all().order_by("-last_update_time") - else: - announcement = Announcement.objects.filter(created_by=request.user) + announcement = Announcement.objects.all().order_by("-create_time") visible = request.GET.get("visible", None) if visible: announcement = announcement.filter(visible=(visible == "true")) diff --git a/contest/decorators.py b/contest/decorators.py index 600d98b..d08783c 100644 --- a/contest/decorators.py +++ b/contest/decorators.py @@ -32,11 +32,13 @@ def check_user_contest_permission(func): else: return HttpResponseRedirect("/login/") - # kwargs 就包含了url 里面的播或参数 + # kwargs 就包含了 url 里面的参数 if "contest_id" in kwargs: contest_id = kwargs["contest_id"] elif "contest_id" in request.data: contest_id = request.data["contest_id"] + elif "contest_id" in request.GET: + contest_id = request.GET["contest_id"] else: if request.is_ajax(): return error_response(u"参数错误") @@ -54,6 +56,13 @@ def check_user_contest_permission(func): if request.user.admin_type == SUPER_ADMIN or request.user == contest.created_by: return func(*args, **kwargs) + # 管理员可见隐藏的比赛，已经先判断了身份 + if not contest.visible: + if request.is_ajax(): + return error_response(u"比赛不存在") + else: + return error_page(request, u"比赛不存在") + # 有密码的公开赛 if contest.contest_type == PASSWORD_PROTECTED_CONTEST: # 没有输入过密码 diff --git a/contest/migrations/0013_auto_20151017_1511.py b/contest/migrations/0013_auto_20151017_1511.py new file mode 100644 index 0000000..ba3b201 --- /dev/null +++ b/contest/migrations/0013_auto_20151017_1511.py @@ -0,0 +1,64 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import utils.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('contest', '0012_auto_20151008_1124'), + ] + + operations = [ + migrations.RemoveField( + model_name='contestproblemtestcase', + name='problem', + ), + migrations.RemoveField( + model_name='contestsubmission', + name='contest', + ), + migrations.RemoveField( + model_name='contestsubmission', + name='problem', + ), + migrations.RemoveField( + model_name='contestsubmission', + name='user', + ), + migrations.RemoveField( + model_name='contest', + name='mode', + ), + migrations.RemoveField( + model_name='contest', + name='show_user_submission', + ), + migrations.RemoveField( + model_name='contestproblem', + name='score', + ), + migrations.AddField( + model_name='contestproblem', + name='is_public', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='contestproblem', + name='last_update_time', + field=models.DateTimeField(null=True, blank=True), + ), + migrations.AlterField( + model_name='contestproblem', + name='hint', + field=utils.models.RichTextField(null=True, blank=True), + ), + migrations.DeleteModel( + name='ContestProblemTestCase', + ), + migrations.DeleteModel( + name='ContestSubmission', + ), + ] diff --git a/contest/models.py b/contest/models.py index 2708bcf..2213f43 100644 --- a/contest/models.py +++ b/contest/models.py @@ -22,12 +22,8 @@ CONTEST_UNDERWAY = 0 class Contest(models.Model): title = models.CharField(max_length=40, unique=True) description = RichTextField() - # 比赛模式：0 即为是acm模式，1 即为是按照总的 ac 题目数量排名模式 - mode = models.IntegerField() # 是否显示实时排名结果 real_time_rank = models.BooleanField() - # 是否显示别人的提交记录 - show_user_submission = models.BooleanField() # 只能超级管理员创建公开赛，管理员只能创建小组内部的比赛 # 如果这一项不为空，即为有密码的公开赛，没有密码的可以为小组赛或者是公开赛（此时用比赛的类型来表示） password = models.CharField(max_length=30, blank=True, null=True) @@ -68,46 +64,13 @@ class ContestProblem(AbstractProblem): contest = models.ForeignKey(Contest) # 比如A B 或者1 2 或者 a b 将按照这个排序 sort_index = models.CharField(max_length=30) - score = models.IntegerField(default=0) + # 是否已经公开了题目，防止重复公开 + is_public = models.BooleanField(default=False) class Meta: db_table = "contest_problem" -class ContestProblemTestCase(models.Model): - """ - 如果比赛是按照通过的测试用例总分计算的话，就需要这个model 记录每个测试用例的分数 - """ - # 测试用例的id 这个还在测试用例的配置文件里面有对应 - id = models.CharField(max_length=40, primary_key=True, db_index=True) - problem = models.ForeignKey(ContestProblem) - score = models.IntegerField() - - class Meta: - db_table = "contest_problem_test_case" - - -class ContestSubmission(models.Model): - """ - 用于保存比赛提交和排名的一些数据，加快检索速度 - """ - user = models.ForeignKey(User) - problem = models.ForeignKey(ContestProblem) - contest = models.ForeignKey(Contest) - total_submission_number = models.IntegerField(default=1) - # 这道题是 AC 还是没过 - ac = models.BooleanField() - # ac 用时以秒计 - ac_time = models.IntegerField(default=0) - # 总的时间，用于acm 类型的，也需要保存罚时 - total_time = models.IntegerField(default=0) - # 第一个解出此题目 - first_achieved = models.BooleanField(default=False) - - class Meta: - db_table = "contest_submission" - - class ContestRank(models.Model): user = models.ForeignKey(User) contest = models.ForeignKey(Contest) diff --git a/contest/tests.py b/contest/tests.py index 8875997..51fca4f 100644 --- a/contest/tests.py +++ b/contest/tests.py @@ -8,8 +8,7 @@ from rest_framework.test import APITestCase, APIClient from account.models import User from group.models import Group from contest.models import Contest, ContestProblem -from .models import ContestSubmission -from .models import GROUP_CONTEST, PASSWORD_PROTECTED_CONTEST +from .models import GROUP_CONTEST, PASSWORD_PROTECTED_CONTEST, PUBLIC_CONTEST from account.models import REGULAR_USER, ADMIN, SUPER_ADMIN @@ -582,5 +581,39 @@ class ContestListPageTest(TestCase): self.assertEqual(response.status_code, 200) +class ContestProblemMySubmissionListTest(TestCase): + # 以下是我比赛单个题目的提交列表的测试 + def setUp(self): + self.client = Client() + self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN) + self.user1.set_password("testaa") + self.user1.save() + self.user2 = User.objects.create(username="test2", admin_type=REGULAR_USER) + self.user2.set_password("testbb") + self.user2.save() + self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, + contest_type=PUBLIC_CONTEST, show_rank=True, + show_user_submission=True, + start_time="2015-08-15T10:00:00.000Z", + end_time="2015-08-30T12:00:00.000Z", + created_by=User.objects.get(username="test1")) + self.contest_problem = ContestProblem.objects.create(title="titlex", + description="descriptionx", + input_description="input1_description", + output_description="output1_description", + test_case_id="1", + samples=json.dumps([{"input": "1 1", "output": "2"}]), + time_limit=100, + memory_limit=1000, + hint="hint1", + created_by=self.user1, + contest=self.global_contest, + sort_index="a") + + def test_contestsList_page_not_exist(self): + self.client.login(username="test1", password="testaa") + response = self.client.get('/contest/1/submissions/999/') + self.assertTemplateUsed(response, "utils/error.html") + diff --git a/contest/views.py b/contest/views.py index cdf9397..d9eee7b 100644 --- a/contest/views.py +++ b/contest/views.py @@ -19,7 +19,8 @@ from account.models import SUPER_ADMIN, User from account.decorators import login_required from group.models import Group from utils.cache import get_cache_redis -from .models import (Contest, ContestProblem, ContestSubmission, CONTEST_ENDED, +from submission.models import Submission +from .models import (Contest, ContestProblem, CONTEST_ENDED, CONTEST_NOT_START, CONTEST_UNDERWAY, ContestRank) from .models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PROTECTED_CONTEST from .decorators import check_user_contest_permission @@ -293,7 +294,6 @@ def contest_page(request, contest_id): 单个比赛的详情页 """ contest = Contest.objects.get(id=contest_id) - return render(request, "oj/contest/contest_index.html", {"contest": contest}) @@ -304,15 +304,17 @@ def contest_problem_page(request, contest_id, contest_problem_id): """ contest = Contest.objects.get(id=contest_id) try: - contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True) + problem = ContestProblem.objects.get(id=contest_problem_id, visible=True) except ContestProblem.DoesNotExist: return error_page(request, u"比赛题目不存在") warning = u"您已经提交过本题的正确答案，重复提交可能造成时间累计。" show_warning = False + try: - submission = ContestSubmission.objects.get(user=request.user, contest=contest, problem=contest_problem) - show_warning = submission.ac - except ContestSubmission.DoesNotExist: + rank = ContestRank.objects.get(user=request.user, contest=contest) + # 提示已经 ac 过这道题了 + show_warning = rank.submission_info.get(str(problem.id), {"is_ac": False})["is_ac"] + except ContestRank.DoesNotExist: pass # 已经结束 @@ -324,14 +326,16 @@ def contest_problem_page(request, contest_id, contest_problem_id): warning = u"比赛没有开始，您是管理员，可以提交和测试题目，但是目前的提交不会计入排名。" show_submit_code_area = False - if contest.status == CONTEST_UNDERWAY: - show_submit_code_area = True - if request.user.admin_type == SUPER_ADMIN or request.user == contest.created_by: + if contest.status == CONTEST_UNDERWAY or \ + request.user.admin_type == SUPER_ADMIN or \ + request.user == contest.created_by: show_submit_code_area = True - return render(request, "oj/contest/contest_problem.html", {"contest_problem": contest_problem, "contest": contest, - "samples": json.loads(contest_problem.samples), - "show_warning": show_warning, "warning": warning, + return render(request, "oj/problem/contest_problem.html", {"problem": problem, + "contest": contest, + "samples": json.loads(problem.samples), + "show_warning": show_warning, + "warning": warning, "show_submit_code_area": show_submit_code_area}) @@ -441,4 +445,94 @@ class ContestTimeAPIView(APIView): return error_response(u"比赛不存在") return success_response({"start": int((contest.start_time - now()).total_seconds() * 1000), "end": int((contest.end_time - now()).total_seconds() * 1000), - "status": contest.status}) \ No newline at end of file + "status": contest.status}) + + +@login_required +def contest_problem_my_submissions_list_page(request, contest_id, contest_problem_id): + """ + 我比赛单个题目的所有提交列表 + """ + try: + Contest.objects.get(id=contest_id) + except Contest.DoesNotExist: + return error_page(request, u"比赛不存在") + try: + contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True) + except ContestProblem.DoesNotExist: + return error_page(request, u"比赛问题不存在") + submissions = Submission.objects.filter(user_id=request.user.id, problem_id=contest_problem.id).\ + order_by("-create_time").\ + values("id", "result", "create_time", "accepted_answer_time", "language") + return render(request, "oj/submission/problem_my_submissions_list.html", + {"submissions": submissions, "problem": contest_problem}) + + +@check_user_contest_permission +def contest_problem_submissions_list_page(request, contest_id, page=1): + """ + 单个比赛中的所有提交（包含自己和别人，自己可查提交结果，其他人不可查） + """ + try: + contest = Contest.objects.get(id=contest_id) + except Contest.DoesNotExist: + return error_page(request, u"比赛不存在") + + submissions = Submission.objects.filter(contest_id=contest_id).\ + values("id", "contest_id", "problem_id", "result", "create_time", + "accepted_answer_time", "language", "user_id").order_by("-create_time") + + user_id = request.GET.get("user_id", None) + if user_id: + submissions = submissions.filter(user_id=request.GET.get("user_id")) + + # 封榜的时候只能看到自己的提交 + if not contest.real_time_rank: + if not (request.user.admin_type == SUPER_ADMIN or request.user == contest.created_by): + submissions = submissions.filter(user_id=request.user.id) + + language = request.GET.get("language", None) + filter = None + if language: + submissions = submissions.filter(language=int(language)) + filter = {"name": "language", "content": language} + result = request.GET.get("result", None) + if result: + submissions = submissions.filter(result=int(result)) + filter = {"name": "result", "content": result} + paginator = Paginator(submissions, 20) + + # 为查询题目标题创建新字典 + title = {} + contest_problems = ContestProblem.objects.filter(contest=contest) + for item in contest_problems: + title[item.id] = item.title + for item in submissions: + item['title'] = title[item['problem_id']] + + try: + current_page = paginator.page(int(page)) + except Exception: + return error_page(request, u"不存在的页码") + previous_page = next_page = None + try: + previous_page = current_page.previous_page_number() + except Exception: + pass + try: + next_page = current_page.next_page_number() + except Exception: + pass + + for item in current_page: + # 自己提交的 管理员和创建比赛的可以看到所有的提交链接 + if item["user_id"] == request.user.id or request.user.admin_type == SUPER_ADMIN or \ + request.user == contest.created_by: + item["show_link"] = True + else: + item["show_link"] = False + + return render(request, "oj/contest/submissions_list.html", + {"submissions": current_page, "page": int(page), + "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20, + "contest": contest, "filter": filter, "user_id": user_id}) \ No newline at end of file diff --git a/contest_submission/__init__.py b/contest_submission/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/contest_submission/admin.py b/contest_submission/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/contest_submission/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/contest_submission/migrations/__init__.py b/contest_submission/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/contest_submission/models.py b/contest_submission/models.py deleted file mode 100644 index 71a8362..0000000 --- a/contest_submission/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/contest_submission/serializers.py b/contest_submission/serializers.py deleted file mode 100644 index eb9a860..0000000 --- a/contest_submission/serializers.py +++ /dev/null @@ -1,11 +0,0 @@ -# coding=utf-8 -from rest_framework import serializers - -from account.models import User - - -class CreateContestSubmissionSerializer(serializers.Serializer): - contest_id = serializers.IntegerField() - problem_id = serializers.IntegerField() - language = serializers.IntegerField() - code = serializers.CharField(max_length=3000) diff --git a/contest_submission/tests.py b/contest_submission/tests.py deleted file mode 100644 index cb44331..0000000 --- a/contest_submission/tests.py +++ /dev/null @@ -1,172 +0,0 @@ -# coding=utf-8 -import json - -from django.test import TestCase, Client -from django.core.urlresolvers import reverse -from rest_framework.test import APITestCase, APIClient - -from account.models import User, REGULAR_USER, ADMIN, SUPER_ADMIN -from contest.models import Contest, ContestProblem -from contest.models import PUBLIC_CONTEST, PASSWORD_PROTECTED_CONTEST -from submission.models import Submission - - -class ContestSubmissionAPITest(APITestCase): - def setUp(self): - self.client = APIClient() - self.url = reverse('contest_submission_api') - self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN) - self.user1.set_password("testaa") - self.user1.save() - self.user2 = User.objects.create(username="test2", admin_type=REGULAR_USER) - self.user2.set_password("testbb") - self.user2.save() - self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, - contest_type=PUBLIC_CONTEST, show_rank=True, - show_user_submission=True, - start_time="2015-08-15T10:00:00.000Z", - end_time="2015-08-30T12:00:00.000Z", - created_by=User.objects.get(username="test1")) - self.contest_problem = ContestProblem.objects.create(title="titlex", - description="descriptionx", - input_description="input1_description", - output_description="output1_description", - test_case_id="1", - samples=json.dumps([{"input": "1 1", "output": "2"}]), - time_limit=100, - memory_limit=1000, - hint="hint1", - created_by=User.objects.get(username="test1"), - contest=Contest.objects.get(title="titlex"), - sort_index="a") - - # 以下是创建比赛的提交 - def test_invalid_format(self): - self.client.login(username="test1", password="testaa") - data = {"contest_id": self.global_contest.id, "language": 1} - response = self.client.post(self.url, data=data) - self.assertEqual(response.data["code"], 1) - - def test_contest_submission_successfully(self): - self.client.login(username="test1", password="testaa") - data = {"contest_id": self.global_contest.id, "problem_id": self.contest_problem.id, - "language": 1, "code": '#include "stdio.h"\nint main(){\n\treturn 0;\n}'} - response = self.client.post(self.url, data=data) - self.assertEqual(response.data["code"], 0) - - def test_contest_problem_does_not_exist(self): - self.client.login(username="test1", password="testaa") - data = {"contest_id": self.global_contest.id, "problem_id": self.contest_problem.id + 10, - "language": 1, "code": '#include "stdio.h"\nint main(){\n\treturn 0;\n}'} - response = self.client.post(self.url, data=data) - self.assertEqual(response.data, {"code": 1, "data": u"题目不存在"}) - - -class ContestProblemMySubmissionListTest(TestCase): - # 以下是我比赛单个题目的提交列表的测试 - def setUp(self): - self.client = Client() - self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN) - self.user1.set_password("testaa") - self.user1.save() - self.user2 = User.objects.create(username="test2", admin_type=REGULAR_USER) - self.user2.set_password("testbb") - self.user2.save() - self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, - contest_type=PUBLIC_CONTEST, show_rank=True, - show_user_submission=True, - start_time="2015-08-15T10:00:00.000Z", - end_time="2015-08-30T12:00:00.000Z", - created_by=User.objects.get(username="test1")) - self.contest_problem = ContestProblem.objects.create(title="titlex", - description="descriptionx", - input_description="input1_description", - output_description="output1_description", - test_case_id="1", - samples=json.dumps([{"input": "1 1", "output": "2"}]), - time_limit=100, - memory_limit=1000, - hint="hint1", - created_by=self.user1, - contest=self.global_contest, - sort_index="a") - - def test_contestsList_page_not_exist(self): - self.client.login(username="test1", password="testaa") - response = self.client.get('/contest/1/submissions/999/') - self.assertTemplateUsed(response, "utils/error.html") - - -class SubmissionAPITest(APITestCase): - def setUp(self): - self.client = APIClient() - self.url = reverse('contest_submission_admin_api_view') - self.userA = User.objects.create(username="test1", admin_type=ADMIN) - self.userA.set_password("testaa") - self.userA.save() - self.userS = User.objects.create(username="test2", admin_type=SUPER_ADMIN) - self.userS.set_password("testbb") - self.userS.save() - self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, - contest_type=PASSWORD_PROTECTED_CONTEST, show_rank=True, - show_user_submission=True, - start_time="2015-08-15T10:00:00.000Z", - end_time="2015-08-15T12:00:00.000Z", - password="aacc", created_by=self.userS - ) - self.problem = ContestProblem.objects.create(title="title1", - description="description1", - input_description="input1_description", - output_description="output1_description", - test_case_id="1", - sort_index="1", - samples=json.dumps([{"input": "1 1", "output": "2"}]), - time_limit=100, - memory_limit=1000, - hint="hint1", - contest=self.global_contest, - created_by=self.userS) - self.submission = Submission.objects.create(user_id=self.userA.id, - language=1, - code='#include "stdio.h"\nint main(){\n\treturn 0;\n}', - problem_id=self.problem.id) - self.submissionS = Submission.objects.create(user_id=self.userS.id, - language=2, - code='#include "stdio.h"\nint main(){\n\treturn 0;\n}', - problem_id=self.problem.id) - - def test_submission_contest_does_not_exist(self): - self.client.login(username="test2", password="testbb") - response = self.client.get(self.url + "?contest_id=99") - self.assertEqual(response.data["code"], 1) - - def test_submission_contest_parameter_error(self): - self.client.login(username="test2", password="testbb") - response = self.client.get(self.url) - self.assertEqual(response.data["code"], 1) - - def test_submission_access_denied(self): - self.client.login(username="test1", password="testaa") - response = self.client.get(self.url + "?problem_id=" + str(self.problem.id)) - self.assertEqual(response.data["code"], 1) - - def test_submission_access_denied_with_contest_id(self): - self.client.login(username="test1", password="testaa") - response = self.client.get(self.url + "?contest_id=" + str(self.global_contest.id)) - self.assertEqual(response.data["code"], 1) - - def test_get_submission_successfully(self): - self.client.login(username="test2", password="testbb") - response = self.client.get( - self.url + "?contest_id=" + str(self.global_contest.id) + "&problem_id=" + str(self.problem.id)) - self.assertEqual(response.data["code"], 0) - - def test_get_submission_successfully_problem(self): - self.client.login(username="test2", password="testbb") - response = self.client.get(self.url + "?problem_id=" + str(self.problem.id)) - self.assertEqual(response.data["code"], 0) - - def test_get_submission_problem_do_not_exist(self): - self.client.login(username="test2", password="testbb") - response = self.client.get(self.url + "?problem_id=9999") - self.assertEqual(response.data["code"], 1) diff --git a/contest_submission/views.py b/contest_submission/views.py deleted file mode 100644 index d47302f..0000000 --- a/contest_submission/views.py +++ /dev/null @@ -1,186 +0,0 @@ -# coding=utf-8 -import json -from datetime import datetime -import redis -import pytz -from django.shortcuts import render -from django.core.paginator import Paginator -from django.utils import timezone -from rest_framework.views import APIView - -from judge.judger_controller.tasks import judge - -from account.decorators import login_required -from account.models import SUPER_ADMIN - -from contest.decorators import check_user_contest_permission -from contest.models import Contest, ContestProblem - -from utils.shortcuts import serializer_invalid_response, error_response, success_response, error_page, paginate -from utils.cache import get_cache_redis -from submission.models import Submission -from .serializers import CreateContestSubmissionSerializer -from submission.serializers import SubmissionSerializer - - -class ContestSubmissionAPIView(APIView): - @check_user_contest_permission - def post(self, request): - """ - 创建比赛的提交 - --- - request_serializer: CreateContestSubmissionSerializer - """ - serializer = CreateContestSubmissionSerializer(data=request.data) - if serializer.is_valid(): - data = serializer.data - contest = Contest.objects.get(id=data["contest_id"]) - try: - problem = ContestProblem.objects.get(contest=contest, id=data["problem_id"]) - # 更新题目提交计数器 - problem.total_submit_number += 1 - problem.save() - except ContestProblem.DoesNotExist: - return error_response(u"题目不存在") - submission = Submission.objects.create(user_id=request.user.id, language=int(data["language"]), - contest_id=contest.id, code=data["code"], problem_id=problem.id) - try: - judge.delay(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id) - except Exception: - return error_response(u"提交判题任务失败") - # 修改用户解题状态 - problems_status = request.user.problems_status - if "contest_problems" not in problems_status: - problems_status["contest_problems"] = {} - problems_status["contest_problems"][str(data["problem_id"])] = 2 - request.user.problems_status = problems_status - request.user.save() - # 增加redis 中判题队列长度的计数器 - r = get_cache_redis() - r.incr("judge_queue_length") - return success_response({"submission_id": submission.id}) - else: - return serializer_invalid_response(serializer) - - -@login_required -def contest_problem_my_submissions_list_page(request, contest_id, contest_problem_id): - """ - 我比赛单个题目的所有提交列表 - """ - try: - Contest.objects.get(id=contest_id) - except Contest.DoesNotExist: - return error_page(request, u"比赛不存在") - try: - contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True) - except ContestProblem.DoesNotExist: - return error_page(request, u"比赛问题不存在") - submissions = Submission.objects.filter(user_id=request.user.id, problem_id=contest_problem.id).order_by( - "-create_time"). \ - values("id", "result", "create_time", "accepted_answer_time", "language") - return render(request, "oj/contest/my_submissions_list.html", - {"submissions": submissions, "problem": contest_problem}) - - -@check_user_contest_permission -def contest_problem_submissions_list_page(request, contest_id, page=1): - """ - 单个比赛中的所有提交（包含自己和别人，自己可查提交结果，其他人不可查） - """ - try: - contest = Contest.objects.get(id=contest_id) - except Contest.DoesNotExist: - return error_page(request, u"比赛不存在") - - submissions = Submission.objects.filter(contest_id=contest_id).\ - values("id", "contest_id", "problem_id", "result", "create_time", - "accepted_answer_time", "language", "user_id").order_by("-create_time") - - user_id = request.GET.get("user_id", None) - if user_id: - submissions = submissions.filter(user_id=request.GET.get("user_id")) - - # 封榜的时候只能看到自己的提交 - if not contest.real_time_rank: - if not (request.user.admin_type == SUPER_ADMIN or request.user == contest.created_by): - submissions = submissions.filter(user_id=request.user.id) - - language = request.GET.get("language", None) - filter = None - if language: - submissions = submissions.filter(language=int(language)) - filter = {"name": "language", "content": language} - result = request.GET.get("result", None) - if result: - submissions = submissions.filter(result=int(result)) - filter = {"name": "result", "content": result} - paginator = Paginator(submissions, 20) - - # 为查询题目标题创建新字典 - title = {} - contest_problems = ContestProblem.objects.filter(contest=contest) - for item in contest_problems: - title[item.id] = item.title - for item in submissions: - item['title'] = title[item['problem_id']] - - try: - current_page = paginator.page(int(page)) - except Exception: - return error_page(request, u"不存在的页码") - previous_page = next_page = None - try: - previous_page = current_page.previous_page_number() - except Exception: - pass - try: - next_page = current_page.next_page_number() - except Exception: - pass - - for item in current_page: - # 自己提交的 管理员和创建比赛的可以看到所有的提交链接 - if item["user_id"] == request.user.id or request.user.admin_type == SUPER_ADMIN or \ - request.user == contest.created_by: - item["show_link"] = True - else: - item["show_link"] = False - - return render(request, "oj/contest/submissions_list.html", - {"submissions": current_page, "page": int(page), - "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20, - "contest": contest, "filter": filter, "user_id": user_id}) - - -class ContestSubmissionAdminAPIView(APIView): - def get(self, request): - """ - 查询比赛提交,单个比赛题目提交的adminAPI - --- - response_serializer: SubmissionSerializer - """ - problem_id = request.GET.get("problem_id", None) - contest_id = request.GET.get("contest_id", None) - if contest_id: - try: - contest = Contest.objects.get(pk=contest_id) - except Contest.DoesNotExist: - return error_response(u"比赛不存在!") - if request.user.admin_type != SUPER_ADMIN and contest.created_by != request.user: - return error_response(u"您无权查看该信息!") - submissions = Submission.objects.filter(contest_id=contest_id).order_by("-create_time") - else: - if problem_id: - try: - contest_problem = ContestProblem.objects.get(pk=problem_id) - except ContestProblem.DoesNotExist: - return error_response(u"问题不存在!") - if request.user.admin_type != SUPER_ADMIN and contest_problem.contest.created_by != request.user: - return error_response(u"您无权查看该信息!") - submissions = Submission.objects.filter(contest_id=contest_problem.contest_id).order_by("-create_time") - else: - return error_response(u"参数错误!") - if problem_id: - submissions = submissions.filter(problem_id=problem_id) - return paginate(request, submissions, SubmissionSerializer) diff --git a/mail/tasks.py b/mail/tasks.py index c314548..490472b 100644 --- a/mail/tasks.py +++ b/mail/tasks.py @@ -1,14 +1,19 @@ # coding=utf-8 +import os +from envelopes import Envelope + +SMTP_CONFIG = {"smtp_server": "smtp.mxhichina.com", + "email": "noreply@qduoj.com", + "password": os.environ.get("smtp_password", "111111"), + "tls": False} -def send_email(*args, **kwargs): - pass - - -''' -envelope = Envelope(from_addr=("noreply@qduoj.com", u"qduoj 密码找回邮件", email_template), - to_addr=(user.email, user.username), - subject=u"qduoj 密码找回邮件", - html_body=email_template) -envelope.send("smtp.mxhichina.com", login="noreply@qduoj.com", password="092122302Zarpe2015", tls=False) -''' \ No newline at end of file +def send_email(from_name, to_email, to_name, subject, content): + envelope = Envelope(from_addr=(SMTP_CONFIG["email"], from_name), + to_addr=(to_email, to_name), + subject=subject, + html_body=content) + envelope.send(SMTP_CONFIG["smtp_server"], + login=SMTP_CONFIG["email"], + password=SMTP_CONFIG["password"], + tls=SMTP_CONFIG["tls"]) diff --git a/oj/settings.py b/oj/settings.py index dd437a9..2e86e75 100644 --- a/oj/settings.py +++ b/oj/settings.py @@ -50,7 +50,6 @@ INSTALLED_APPS = ( 'submission', 'mq', 'contest', - 'contest_submission', 'mail', 'django_extensions', @@ -59,7 +58,7 @@ INSTALLED_APPS = ( if DEBUG: INSTALLED_APPS += ( - 'debug_toolbar', + # 'debug_toolbar', 'rest_framework_swagger', ) diff --git a/oj/urls.py b/oj/urls.py index 59db3b4..f95fa2b 100644 --- a/oj/urls.py +++ b/oj/urls.py @@ -19,13 +19,12 @@ from group.views import (GroupAdminAPIView, GroupMemberAdminAPIView, from admin.views import AdminTemplateView from problem.views import TestCaseUploadAPIView, ProblemTagAdminAPIView, ProblemAdminAPIView -from submission.views import (SubmissionAPIView, SubmissionAdminAPIView, - SubmissionShareAPIView, SubmissionRejudgeAdminAPIView) -from contest_submission.views import ContestSubmissionAPIView, ContestSubmissionAdminAPIView +from submission.views import (SubmissionAPIView, SubmissionAdminAPIView, ContestSubmissionAPIView, + SubmissionShareAPIView, SubmissionRejudgeAdminAPIView, + ContestSubmissionAdminAPIView) from monitor.views import QueueLengthMonitorAPIView from utils.views import SimditorImageUploadAPIView -from contest_submission.views import contest_problem_my_submissions_list_page urlpatterns = [ @@ -78,16 +77,16 @@ urlpatterns = [ url(r'^contest/(?P\d+)/problem/(?P\d+)/$', "contest.views.contest_problem_page", name="contest_problem_page"), url(r'^contest/(?P\d+)/problem/(?P\d+)/submissions/$', - "contest_submission.views.contest_problem_my_submissions_list_page", + "contest.views.contest_problem_my_submissions_list_page", name="contest_problem_my_submissions_list_page"), url(r'^contest/(?P\d+)/$', "contest.views.contest_page", name="contest_page"), url(r'^contest/(?P\d+)/problems/$', "contest.views.contest_problems_list_page", name="contest_problems_list_page"), - url(r'^contest/(?P\d+)/submissions/$', "contest_submission.views.contest_problem_submissions_list_page", + url(r'^contest/(?P\d+)/submissions/$', "contest.views.contest_problem_submissions_list_page", name="contest_problem_submissions_list_page"), url(r'^contest/(?P\d+)/submissions/(?P\d+)/$', - "contest_submission.views.contest_problem_submissions_list_page", name="contest_problem_submissions_list_page"), + "contest.views.contest_problem_submissions_list_page", name="contest_problem_submissions_list_page"), url(r'^contests/$', "contest.views.contest_list_page", name="contest_list_page"), url(r'^contests/(?P\d+)/$', "contest.views.contest_list_page", name="contest_list_page"), @@ -128,6 +127,7 @@ urlpatterns = [ url(r'^account/settings/$', TemplateView.as_view(template_name="oj/account/settings.html"), name="account_setting_page"), url(r'^account/settings/avatar/$', TemplateView.as_view(template_name="oj/account/avatar.html"), name="avatar_settings_page"), + url(r'^account/auth/$', "account.views.auth_page", name="auth_login_page"), ] diff --git a/problem/decorators.py b/problem/decorators.py index 762c54a..cc2ac2a 100644 --- a/problem/decorators.py +++ b/problem/decorators.py @@ -17,12 +17,16 @@ def check_user_problem_permission(func): request = args[0] # 这是在后台使用的url middleware 已经确保用户是登录状态的了 - if request.user.admin_type == SUPER_ADMIN: - return func(*args, **kwargs) try: - Problem.objects.get(id=request.data.get("problem_id", -1), created_by=request.user) + problem = Problem.objects.get(id=request.data.get("id", -1)) except Problem.DoesNotExist: return error_response(u"问题不存在") - return func(*args, **kwargs) + + if request.user.admin_type == SUPER_ADMIN: + return func(*args, **kwargs) + else: + if problem.created_by != request.user: + return error_response(u"问题不存在") + return func(*args, **kwargs) return check diff --git a/problem/migrations/0010_auto_20151017_1226.py b/problem/migrations/0010_auto_20151017_1226.py new file mode 100644 index 0000000..743497d --- /dev/null +++ b/problem/migrations/0010_auto_20151017_1226.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('problem', '0009_auto_20151008_1125'), + ] + + operations = [ + migrations.AddField( + model_name='problem', + name='last_update_time', + field=models.DateTimeField(null=True, blank=True), + ), + migrations.AlterField( + model_name='problem', + name='source', + field=models.CharField(max_length=200, null=True, blank=True), + ), + ] diff --git a/problem/migrations/0011_auto_20151017_1227.py b/problem/migrations/0011_auto_20151017_1227.py new file mode 100644 index 0000000..ae8b7d0 --- /dev/null +++ b/problem/migrations/0011_auto_20151017_1227.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import utils.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('problem', '0010_auto_20151017_1226'), + ] + + operations = [ + migrations.AlterField( + model_name='problem', + name='hint', + field=utils.models.RichTextField(null=True, blank=True), + ), + ] diff --git a/problem/models.py b/problem/models.py index a9e8f74..5944ca6 100644 --- a/problem/models.py +++ b/problem/models.py @@ -26,11 +26,12 @@ class AbstractProblem(models.Model): # 测试用例id 这个id 可以用来拼接得到测试用例的文件存储位置 test_case_id = models.CharField(max_length=40) # 提示 - hint = models.TextField(blank=True, null=True) + hint = RichTextField(blank=True, null=True) # 创建时间 create_time = models.DateTimeField(auto_now_add=True) - # 最后更新时间 - # last_update_time = models.DateTimeField(auto_now=True) + # 最后更新时间，不适用auto_now，因为本 model 里面的提交数量是变化的，导致每次 last_update_time 也更新了 + # 需要每次编辑后手动赋值 + last_update_time = models.DateTimeField(blank=True, null=True) # 这个题是谁创建的 created_by = models.ForeignKey(User) # 时间限制 单位是毫秒 @@ -63,4 +64,4 @@ class Problem(AbstractProblem): # 标签 tags = models.ManyToManyField(ProblemTag) # 来源 - source = models.CharField(max_length=30, blank=True, null=True) + source = models.CharField(max_length=200, blank=True, null=True) diff --git a/problem/serizalizers.py b/problem/serizalizers.py index afa7f43..0865b8f 100644 --- a/problem/serizalizers.py +++ b/problem/serizalizers.py @@ -25,13 +25,13 @@ class CreateProblemSerializer(serializers.Serializer): # [{"input": "1 1", "output": "2"}] samples = ProblemSampleSerializer() test_case_id = serializers.CharField(max_length=40) - source = serializers.CharField(max_length=30, required=False, default=None) time_limit = serializers.IntegerField(min_value=1) memory_limit = serializers.IntegerField(min_value=1) difficulty = serializers.IntegerField() tags = serializers.ListField(child=serializers.CharField(max_length=10)) hint = serializers.CharField(max_length=3000, allow_blank=True) - visible = visible = serializers.BooleanField() + source = serializers.CharField(max_length=100, required=False, default=None) + visible = serializers.BooleanField() class ProblemTagSerializer(serializers.ModelSerializer): @@ -61,15 +61,11 @@ class EditProblemSerializer(serializers.Serializer): input_description = serializers.CharField(max_length=10000) output_description = serializers.CharField(max_length=10000) test_case_id = serializers.CharField(max_length=40) - source = serializers.CharField(max_length=30) + source = serializers.CharField(max_length=100) time_limit = serializers.IntegerField(min_value=1) memory_limit = serializers.IntegerField(min_value=1) difficulty = serializers.IntegerField() tags = serializers.ListField(child=serializers.CharField(max_length=20)) samples = ProblemSampleSerializer() hint = serializers.CharField(max_length=3000, allow_blank=True) - visible = serializers.BooleanField() - - -class CreateProblemTagSerializer(serializers.Serializer): - name = serializers.CharField(max_length=10) + visible = serializers.BooleanField() \ No newline at end of file diff --git a/problem/tests.py b/problem/tests.py index 9819486..e168ef8 100644 --- a/problem/tests.py +++ b/problem/tests.py @@ -7,16 +7,15 @@ from django.core.urlresolvers import reverse from rest_framework.test import APITestCase, APIClient from account.models import User, SUPER_ADMIN +from account.tests import create_user from problem.models import Problem, ProblemTag class ProblemPageTest(TestCase): def setUp(self): self.client = APIClient() - self.user = User.objects.create(username="test", admin_type=SUPER_ADMIN) - self.user.set_password("testaa") - self.user.save() - self.client.login(username="test", password="testaa") + self.user = create_user() + self.client.login(username="test", password="111111") self.problem = Problem.objects.create(title="title1", description="description1", input_description="input1_description", @@ -31,11 +30,11 @@ class ProblemPageTest(TestCase): created_by=User.objects.get(username="test")) def test_visit_problem_successfully(self): - response = self.client.get('/problem/1/') - self.assertEqual(response.status_code, 200) + response = self.client.get('/problem/' + str(self.problem.id) + "/") + self.assertTemplateUsed(response, "oj/problem/problem.html") def test_problem_does_not_exist(self): - response = self.client.get('/problem/3/') + response = self.client.get('/problem/3000/') self.assertTemplateUsed(response, "utils/error.html") @@ -60,10 +59,8 @@ class ProblemAdminTest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse("problem_admin_api") - self.user = User.objects.create(username="test", admin_type=SUPER_ADMIN) - self.user.set_password("testaa") - self.user.save() - self.client.login(username="test", password="testaa") + self.user = create_user(admin_type=SUPER_ADMIN) + self.client.login(username="test", password="111111") ProblemTag.objects.create(name="tag1") ProblemTag.objects.create(name="tag2") self.problem = Problem.objects.create(title="title1", @@ -77,15 +74,9 @@ class ProblemAdminTest(APITestCase): memory_limit=1000, difficulty=1, hint="hint1", - created_by=User.objects.get(username="test")) + created_by=self.user) - # 以下是发布题目的测试 - def test_invalid_format(self): - data = {"title": "test1"} - response = self.client.post(self.url, data=data) - self.assertEqual(response.data["code"], 1) - - def test_release_problem_successfully(self): + def test_create_problem_successfully(self): data = {"title": "title2", "description": "description2", "input_description": "input_description2", @@ -97,30 +88,15 @@ class ProblemAdminTest(APITestCase): "memory_limit": "1000", "difficulty": "1", "hint": "hint1", + "visible": True, "tags": [1]} response = self.client.post(self.url, data=json.dumps(data), content_type="application/json") self.assertEqual(response.data["code"], 0) - # 以下是编辑题目的测试 - def test_invalid_data(self): - data = {"title": "test0"} - response = self.client.put(self.url, data=data) - self.assertEqual(response.data["code"], 1) - - def test_problem_does_not_exist(self): - tags = ProblemTag.objects.filter(id__in=[1]) - self.problem.tags.add(*tags) - data = self._create_data(2, False, [1]) - response = self.client.put(self.url, data=json.dumps(data), content_type="application/json") - self.assertEqual(response.data, {"code": 1, "data": u"该题目不存在！"}) - def test_edit_problem_successfully(self): tags = ProblemTag.objects.filter(id__in=[1]) self.problem.tags.add(*tags) - data = self._create_data(1, True, [1, 2]) - problem = Problem.objects.get(id=data["id"]) - problem.tags.remove(*problem.tags.all()) - problem.tags.add(*ProblemTag.objects.filter(id__in=data["tags"])) + data = self._create_data(self.problem.id, True, [1, 2]) response = self.client.put(self.url, data=json.dumps(data), content_type="application/json") self.assertEqual(response.data["code"], 0) @@ -139,11 +115,11 @@ class ProblemAdminTest(APITestCase): self.assertEqual(item["visible"], True) def test_query_problem_does_not_exist(self): - data = {"problem_id": 2} + data = {"problem_id": 200} response = self.client.get(self.url, data=data) self.assertEqual(response.data, {"code": 1, "data": u"题目不存在"}) - def test_query_problem_exists(self): + def test_query_existed_problem(self): data = {"problem_id": self.problem.id} response = self.client.get(self.url, data=data) self.assertEqual(response.data["code"], 0) @@ -153,10 +129,8 @@ class ProblemTagAdminAPITest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse('problem_tag_admin_api') - self.user = User.objects.create(username="testx", admin_type=SUPER_ADMIN) - self.user.set_password("testxx") - self.user.save() - self.client.login(username="testx", password="testxx") + self.user = create_user(admin_type=SUPER_ADMIN) + self.client.login(username="test", password="111111") ProblemTag.objects.create(name="tag1") # 以下是返回所有的问题的标签 @@ -168,10 +142,8 @@ class ProblemListPageTest(TestCase): def setUp(self): self.client = Client() self.url = reverse('problem_list_page', kwargs={"page": 1}) - self.user = User.objects.create(username="test", admin_type=SUPER_ADMIN) - self.user.set_password("testaa") - self.user.save() - self.client.login(username="test", password="testaa") + self.user = create_user(admin_type=SUPER_ADMIN) + self.client.login(username="test", password="111111") ProblemTag.objects.create(name="tag1") ProblemTag.objects.create(name="tag2") self.problem = Problem.objects.create(title="title1", @@ -185,7 +157,7 @@ class ProblemListPageTest(TestCase): memory_limit=1000, difficulty=1, hint="hint1", - created_by=User.objects.get(username="test")) + created_by=self.user) def test_problemListPage_not_exist(self): response = self.client.get('/problems/999/') diff --git a/problem/views.py b/problem/views.py index 6b2c19f..e48b8a5 100644 --- a/problem/views.py +++ b/problem/views.py @@ -9,21 +9,19 @@ import logging from django.shortcuts import render from django.db.models import Q, Count from django.core.paginator import Paginator - -from rest_framework.views import APIView - +from django.utils.timezone import now from django.conf import settings +from rest_framework.views import APIView from account.models import SUPER_ADMIN from account.decorators import super_admin_required from utils.shortcuts import (serializer_invalid_response, error_response, success_response, paginate, rand_str, error_page) from .serizalizers import (CreateProblemSerializer, EditProblemSerializer, ProblemSerializer, - ProblemTagSerializer, CreateProblemTagSerializer) + ProblemTagSerializer) from .models import Problem, ProblemTag from .decorators import check_user_problem_permission - logger = logging.getLogger("app_info") @@ -59,7 +57,7 @@ class ProblemAdminAPIView(APIView): if serializer.is_valid(): data = serializer.data try: - Problem.objects.get(title=data["title"], description=data["description"]) + Problem.objects.get(title=data["title"]) return error_response(u"添加失败，存在重复的题目") except Problem.DoesNotExist: pass @@ -110,6 +108,7 @@ class ProblemAdminAPIView(APIView): problem.samples = json.dumps(data["samples"]) problem.hint = data["hint"] problem.visible = data["visible"] + problem.last_update_time = now() # 删除原有的标签的对应关系 problem.tags.remove(*problem.tags.all()) @@ -155,7 +154,7 @@ class ProblemAdminAPIView(APIView): keyword = request.GET.get("keyword", None) if keyword: problems = problems.filter(Q(title__contains=keyword) | - Q(description__contains=keyword)) + Q(description__contains=keyword)) return paginate(request, problems, ProblemSerializer) @@ -164,6 +163,7 @@ class TestCaseUploadAPIView(APIView): """ 上传题目的测试用例 """ + def _is_legal_test_case_file_name(self, file_name): # 正整数开头的 .in 或者.out 结尾的 regex = r"^[1-9]\d*\.(in|out)$" @@ -183,17 +183,16 @@ class TestCaseUploadAPIView(APIView): except IOError as e: logger.error(e) return error_response(u"上传失败") - - test_case_file = zipfile.ZipFile(tmp_zip, 'r') + try: + test_case_file = zipfile.ZipFile(tmp_zip, 'r') + except Exception: + return error_response(u"解压失败") name_list = test_case_file.namelist() l = [] # 如果文件是直接打包的，那么name_list 就是["1.in", "1.out"]这样的 - # 如果文件还有一层文件夹test_case，那么name_list就是["test_case/", "test_case/1.in", "test_case/1.out"] - # 现在暂时只支持第一种，先判断一下是什么格式的 - # 第一种格式的 if "1.in" in name_list and "1.out" in name_list: for file_name in name_list: if self._is_legal_test_case_file_name(file_name): @@ -251,7 +250,8 @@ class TestCaseUploadAPIView(APIView): "striped_output_md5": striped_md5.hexdigest(), "output_size": os.path.getsize(test_case_dir + str(i + 1) + ".out")} # 写入配置文件 - open(test_case_dir + "info", "w").write(json.dumps(file_info)) + with open(test_case_dir + "info", "w") as f: + f.write(json.dumps(file_info)) return success_response({"test_case_id": problem_test_dir, "file_list": {"input": l[0::2], @@ -311,7 +311,8 @@ def problem_list_page(request, page=1): pass # 右侧标签列表 按照关联的题目的数量排序 排除题目数量为0的 - tags = ProblemTag.objects.annotate(problem_number=Count("problem")).filter(problem_number__gt=0).order_by("-problem_number") + tags = ProblemTag.objects.annotate(problem_number=Count("problem")).filter(problem_number__gt=0).order_by( + "-problem_number") return render(request, "oj/problem/problem_list.html", {"problems": current_page, "page": int(page), diff --git a/static/src/css/fonts/source_code_pro/EOT/SourceCodePro-Regular.eot b/static/src/css/fonts/source_code_pro/EOT/SourceCodePro-Regular.eot new file mode 100755 index 0000000..09e9473 Binary files /dev/null and b/static/src/css/fonts/source_code_pro/EOT/SourceCodePro-Regular.eot differ diff --git a/static/src/css/fonts/source_code_pro/OTF/SourceCodePro-Regular.otf b/static/src/css/fonts/source_code_pro/OTF/SourceCodePro-Regular.otf new file mode 100755 index 0000000..4e3b9d0 Binary files /dev/null and b/static/src/css/fonts/source_code_pro/OTF/SourceCodePro-Regular.otf differ diff --git a/static/src/css/fonts/source_code_pro/TTF/SourceCodePro-Regular.ttf b/static/src/css/fonts/source_code_pro/TTF/SourceCodePro-Regular.ttf new file mode 100755 index 0000000..437f472 Binary files /dev/null and b/static/src/css/fonts/source_code_pro/TTF/SourceCodePro-Regular.ttf differ diff --git a/static/src/css/fonts/source_code_pro/WOFF/OTF/SourceCodePro-Regular.otf.woff b/static/src/css/fonts/source_code_pro/WOFF/OTF/SourceCodePro-Regular.otf.woff new file mode 100755 index 0000000..395436e Binary files /dev/null and b/static/src/css/fonts/source_code_pro/WOFF/OTF/SourceCodePro-Regular.otf.woff differ diff --git a/static/src/css/fonts/source_code_pro/WOFF/TTF/SourceCodePro-Regular.ttf.woff b/static/src/css/fonts/source_code_pro/WOFF/TTF/SourceCodePro-Regular.ttf.woff new file mode 100755 index 0000000..0af792a Binary files /dev/null and b/static/src/css/fonts/source_code_pro/WOFF/TTF/SourceCodePro-Regular.ttf.woff differ diff --git a/static/src/css/fonts/source_code_pro/WOFF2/OTF/SourceCodePro-Regular.otf.woff2 b/static/src/css/fonts/source_code_pro/WOFF2/OTF/SourceCodePro-Regular.otf.woff2 new file mode 100755 index 0000000..65cd591 Binary files /dev/null and b/static/src/css/fonts/source_code_pro/WOFF2/OTF/SourceCodePro-Regular.otf.woff2 differ diff --git a/static/src/css/fonts/source_code_pro/WOFF2/TTF/SourceCodePro-Regular.ttf.woff2 b/static/src/css/fonts/source_code_pro/WOFF2/TTF/SourceCodePro-Regular.ttf.woff2 new file mode 100755 index 0000000..18d2199 Binary files /dev/null and b/static/src/css/fonts/source_code_pro/WOFF2/TTF/SourceCodePro-Regular.ttf.woff2 differ diff --git a/static/src/css/global.css b/static/src/css/global.css index 0e7d357..339c0d6 100644 --- a/static/src/css/global.css +++ b/static/src/css/global.css @@ -1,5 +1,17 @@ +@font-face{ + font-family: 'source_code_pro'; + font-weight: 500; + font-style: normal; + font-stretch: normal; + src: url('/static/css/fonts/source_code_pro/EOT/SourceCodePro-Regular.eot') format('embedded-opentype'), + url('/static/css/fonts/source_code_pro/WOFF2/TTF/SourceCodePro-Regular.ttf.woff2') format('woff2'), + url('/static/css/fonts/source_code_pro/WOFF/OTF/SourceCodePro-Regular.otf.woff') format('woff'), + url('/static/css/fonts/source_code_pro/OTF/SourceCodePro-Regular.otf') format('opentype'), + url('/static/css/fonts/source_code_pro/TTF/SourceCodePro-Regular.ttf') format('truetype'); +} + body, button, input, select, textarea, h1, h2, h3, h4, h5, h6 { - font-family: Georgia, STHeiti, "Microsoft Yahei", SimSun, "Droid Sans"; + font-family: "source_code_pro", Georgia, STHeiti, "Microsoft Yahei", SimSun, "Droid Sans"; } html { @@ -39,12 +51,14 @@ label { } -pre { - font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace; +pre, code { + font-family: "source_code_pro"; background-color: white; + white-space: pre-wrap; + word-wrap: break-word; } .CodeMirror-code{ - font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace; + font-family: "source_code_pro"; background-color: white; } diff --git a/static/src/js/app/admin/admin.js b/static/src/js/app/admin/admin.js index d68dba1..6ef30f6 100644 --- a/static/src/js/app/admin/admin.js +++ b/static/src/js/app/admin/admin.js @@ -1,4 +1,4 @@ -require(["jquery", "avalon", "bootstrap"], function ($, avalon) { +require(["jquery", "avalon", "csrfToken", "bsAlert", "bootstrap"], function ($, avalon, csrfTokenHeader, bsAlert) { avalon.ready(function () { @@ -109,24 +109,10 @@ require(["jquery", "avalon", "bootstrap"], function ($, avalon) { vm.template_url = "template/group/group_detail.html"; }); - vm.$watch("showEditProblemPage", function (problemId) { - vm.problemId = problemId; - vm.template_url = "template/problem/edit_problem.html"; - }); - - vm.$watch("showProblemListPage", function () { - vm.template_url = "template/problem/problem_list.html"; - }); - vm.$watch("showGroupListPage", function () { vm.template_url = "template/group/group.html"; }); - vm.$watch("showProblemSubmissionPage", function (problemId) { - vm.problemId = problemId; - vm.template_url = "template/problem/submission_list.html"; - }); - vm.$watch("showContestProblemPage", function (problemId, contestId, contestMode) { vm.$problemId = problemId; vm.$contestId = contestId; @@ -155,7 +141,15 @@ require(["jquery", "avalon", "bootstrap"], function ($, avalon) { show_template("template/" + hash + ".html"); } }; - setTimeout(function(){li_active("#li-" + hash.replace("/", "-"));}, 500) + setTimeout(function(){li_active("#li-" + hash.replace("/", "-"));}, 500); + + $.ajaxSetup({ + beforeSend: csrfTokenHeader, + dataType: "json", + error: function(){ + bsAlert("请求失败"); + } + }); }); diff --git a/static/src/js/app/admin/announcement/announcement.js b/static/src/js/app/admin/announcement/announcement.js index df73769..c10741e 100644 --- a/static/src/js/app/admin/announcement/announcement.js +++ b/static/src/js/app/admin/announcement/announcement.js @@ -1,112 +1,73 @@ -require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "validator"], +require(["jquery", "avalon", "csrfToken", "bsAlert", "validator", "pager", "editorComponent"], function ($, avalon, csrfTokenHeader, bsAlert, editor) { avalon.ready(function () { - var createAnnouncementEditor = editor("#create-announcement-editor"); - var editAnnouncementEditor = editor("#edit-announcement-editor"); if (avalon.vmodels.announcement){ var vm = avalon.vmodels.announcement; - announcementList = []; } else { - var vm = avalon.define({ $id: "announcement", - //通用变量 - announcementList: [], // 公告列表数据项 - previousPage: 0, // 之前的页数 - nextPage: 0, // 之后的页数 - page: 1, // 当前页数 - editingAnnouncementId: 0, // 正在编辑的公告的ID， 为零说明未在编辑 - totalPage: 1, // 总页数 - showVisibleOnly: false, //仅显示可见公告 - // 编辑 + announcementList: [], + isEditing: false, + showVisibleOnly: false, + + //编辑器同步变量 + announcementId: -1, newTitle: "", - announcementVisible: 0, - showGlobalViewRadio: true, - isGlobal: true, - allGroups: [], - getNext: function () { - if (!vm.nextPage) - return; - getPageData(vm.page + 1); - }, - getPrevious: function () { - if (!vm.previousPage) - return; - getPageData(vm.page - 1); - }, - getBtnClass: function (btnType) { - if (btnType == "next") { - return vm.nextPage ? "btn btn-primary" : "btn btn-primary disabled"; - } - else { - return vm.previousPage ? "btn btn-primary" : "btn btn-primary disabled"; + announcementVisible: false, + + pager: { + getPage: function(page){ + getPage(page); } }, + + createAnnouncementEditor: { + editorId: "create-announcement-editor", + placeholder: "公告内容" + }, + + editAnnouncementEditor: { + editorId: "edit-announcement-editor", + placeholder: "公告内容" + }, + editAnnouncement: function (announcement) { vm.newTitle = announcement.title; - editAnnouncementEditor.setValue(announcement.content); + vm.announcementId = announcement.id; + avalon.vmodels.editAnnouncementEditor.content = announcement.content; vm.announcementVisible = announcement.visible; - if (vm.editingAnnouncementId == announcement.id) - vm.editingAnnouncementId = 0; - else - vm.editingAnnouncementId = announcement.id; - vm.isGlobal = announcement.is_global; - for (var i = 0; i < announcement.groups.length; i++) { - for (var j = 0; j < vm.allGroups.length; j++) { - if (announcement.groups[i] == vm.allGroups[j].id) { - vm.allGroups[j].isSelected = true; - } - } - } - editAnnouncementEditor.focus(); + vm.isEditing = true; }, cancelEdit: function () { - vm.editingAnnouncementId = 0; + vm.isEditing = false; }, submitChange: function () { var title = vm.newTitle; - var content = editAnnouncementEditor.getValue(); + var content = avalon.vmodels.editAnnouncementEditor.content; if (content == "" || title == "") { bsAlert("标题和内容都不能为空"); return false; } - var selectedGroups = []; - if (!vm.isGlobal) { - for (var i = 0; i < vm.allGroups.length; i++) { - if (vm.allGroups[i].isSelected) { - selectedGroups.push(vm.allGroups[i].id); - } - } - } - - if (!vm.isGlobal && !selectedGroups.length) { - bsAlert("请至少选择一个小组"); - return false; - } - $.ajax({ - beforeSend: csrfTokenHeader, url: "/api/admin/announcement/", contentType: "application/json;charset=UTF-8", dataType: "json", method: "put", data: JSON.stringify({ - id: vm.editingAnnouncementId, + id: vm.announcementId, title: title, content: content, - visible: vm.announcementVisible, - is_global: vm.isGlobal, - groups: selectedGroups + visible: vm.announcementVisible }), success: function (data) { if (!data.code) { bsAlert("修改成功"); - vm.editingAnnouncementId = 0; - getPageData(1); + vm.isEditing = false; + getPage(1); } else { bsAlert(data.data); @@ -116,105 +77,47 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "validator"], } }); + vm.$watch("showVisibleOnly", function () { - getPageData(1); + getPage(1); + avalon.vmodels.announcementPager.currentPage = 1; }); } - getPageData(1); - - $.ajax({ - url: "/api/user/", - method: "get", - dataType: "json", - success: function (data) { - if (!data.code) { - var admin_type = data.data.admin_type; - if (data.data.admin_type == 1) { - vm.isGlobal = false; - vm.showGlobalViewRadio = false; - - } - } - $.ajax({ - url: "/api/admin/group/", - method: "get", - dataType: "json", - success: function (data) { - if (!data.code) { - if (!data.data.length) { - if (admin_type != 2) - bsAlert("您的用户权限只能创建组内公告，但是您还没有创建过小组"); - return; - } - for (var i = 0; i < data.data.length; i++) { - var item = data.data[i]; - item["isSelected"] = false; - vm.allGroups.push(item); - } - } - else { - bsAlert(data.data); - } - } - }); - } - }); - - function getPageData(page) { - var url = "/api/admin/announcement/?paging=true&page=" + page + "&page_size=10"; + function getPage(page) { + var url = "/api/admin/announcement/?paging=true&page=" + page + "&page_size=20"; if (vm.showVisibleOnly) url += "&visible=true"; $.ajax({ url: url, - dataType: "json", method: "get", success: function (data) { if (!data.code) { vm.announcementList = data.data.results; - vm.totalPage = data.data.total_page; - vm.previousPage = data.data.previous_page; - vm.nextPage = data.data.next_page; - vm.page = page; + avalon.vmodels.announcementPager.totalPage = data.data.total_page; } else { - bs_alert(data.data); + bsAlert(data.data); } } }); } //新建公告表单验证与数据提交 - $("#announcement-form").validator().on('submit', function (e) { + $("#announcement-form").validator().on('submit', function (e) { if (!e.isDefaultPrevented()) { var title = $("#title").val(); - var content = createAnnouncementEditor.getValue(); + var content = avalon.vmodels.createAnnouncementEditor.content; if (content == "") { bsAlert("请填写公告内容"); return false; } - var selectedGroups = []; - if (!vm.isGlobal) { - for (var i = 0; i < vm.allGroups.length; i++) { - if (vm.allGroups[i].isSelected) { - selectedGroups.push(vm.allGroups[i].id); - } - } - } - - if (!vm.isGlobal && !selectedGroups.length) { - bsAlert("请至少选择一个小组"); - return false; - } $.ajax({ - beforeSend: csrfTokenHeader, url: "/api/admin/announcement/", - contentType: "application/json;charset=UTF-8", + contentType: "application/json", data: JSON.stringify({ title: title, - content: content, - is_global: vm.isGlobal, - groups: selectedGroups + content: content }), dataType: "json", method: "post", @@ -222,8 +125,8 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "validator"], if (!data.code) { bsAlert("提交成功！"); $("#title").val(""); - createAnnouncementEditor.setValue(""); - getPageData(1); + avalon.vmodels.createAnnouncementEditor.content = ""; + getPage(1); } else { bsAlert(data.data); } diff --git a/static/src/js/app/admin/monitor/monitor.js b/static/src/js/app/admin/monitor/monitor.js index 0747618..1a0e46f 100644 --- a/static/src/js/app/admin/monitor/monitor.js +++ b/static/src/js/app/admin/monitor/monitor.js @@ -39,8 +39,8 @@ require(["jquery", "chart"], function ($, Chart) { $("#clear-chart-data").click(function(){ for(var i = 0;i < dataCounter;i++) { chart.removeData(); - dataCounter = 0; } + dataCounter = 0; }); var intervalId = setInterval(getMonitorData, 3000); diff --git a/static/src/js/app/admin/problem/addProblem.js b/static/src/js/app/admin/problem/addProblem.js index e67e9a7..61cb940 100644 --- a/static/src/js/app/admin/problem/addProblem.js +++ b/static/src/js/app/admin/problem/addProblem.js @@ -1,20 +1,20 @@ -require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagEditor", "validator", "jqueryUI"], +require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagEditor", "validator", "jqueryUI", "editorComponent"], function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) { avalon.ready(function () { $("#add-problem-form").validator() .on('submit', function (e) { - if (!e.isDefaultPrevented()){ + if (!e.isDefaultPrevented()) { if (vm.testCaseId == "") { bsAlert("你还没有上传测试数据!"); return false; } - if (vm.description == "") { + if (avalon.vmodels.problemDescriptionEditor.content == "") { bsAlert("题目描述不能为空!"); return false; } - if (vm.timeLimit < 100 || vm.timeLimit > 5000) { - bsAlert("保证时间限制是一个100-5000的合法整数"); + if (vm.timeLimit < 30 || vm.timeLimit > 5000) { + bsAlert("保证时间限制是一个30-5000的合法整数"); return false; } if (vm.samples.length == 0) { @@ -35,12 +35,12 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE var ajaxData = { id: avalon.vmodels.admin.problemId, title: vm.title, - description: vm.description, + description: avalon.vmodels.problemDescriptionEditor.content, time_limit: vm.timeLimit, memory_limit: vm.memoryLimit, samples: [], test_case_id: vm.testCaseId, - hint: vm.hint, + hint: avalon.vmodels.problemHintEditor.content, source: vm.source, visible: vm.visible, tags: tags, @@ -50,7 +50,10 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE }; for (var i = 0; i < vm.samples.$model.length; i++) { - ajaxData.samples.push({input: vm.samples.$model[i].input, output: vm.samples.$model[i].output}); + ajaxData.samples.push({ + input: vm.samples.$model[i].input, + output: vm.samples.$model[i].output + }); } $.ajax({ @@ -74,56 +77,18 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE } }); - var testCaseUploader = uploader("#testCaseFile", "/api/admin/test_case_upload/", function (file, response) { - if (response.code) - bsAlert(response.data); - else { - vm.testCaseId = response.data.test_case_id; - vm.uploadSuccess = true; - vm.testCaseList = []; - for (var i = 0; i < response.data.file_list.input.length; i++) { - vm.testCaseList.push({ - input: response.data.file_list.input[i], - output: response.data.file_list.output[i] - }); - } - bsAlert("测试数据添加成功！共添加" + vm.testCaseList.length + "组测试数据"); - } - }); - - var hintEditor = editor("#hint"); - var problemDescription = editor("#problemDescription"); if (avalon.vmodels.addProblem) { var vm = avalon.vmodels.addProblem; - vm.title = ""; - vm.description = ""; - vm.timeLimit = 1000; - vm.memoryLimit = 256; - vm.samples = [{input: "", output: "", "visible": true}]; - vm.hint = ""; - vm.visible = true; - vm.difficulty = 0; - vm.tags = []; - vm.inputDescription = ""; - vm.outputDescription = ""; - vm.testCaseId = ""; - vm.testCaseList = []; - vm.uploadSuccess = false; - vm.source = ""; - hintEditor.setValue(""); - problemDescription.setValue(""); } else var vm = avalon.define({ $id: "addProblem", title: "", - description: "", timeLimit: 1000, - memoryLimit: 256, + memoryLimit: 128, samples: [{input: "", output: "", "visible": true}], - hint: "", visible: true, - difficulty: 0, + difficulty: "1", tags: [], inputDescription: "", outputDescription: "", @@ -131,6 +96,17 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE testCaseList: [], uploadSuccess: false, source: "", + uploadProgress: 0, + + problemDescriptionEditor: { + editorId: "problem-description-editor", + placeholder: "题目描述" + }, + problemHintEditor: { + editorId: "problem-hint-editor", + placeholder: "提示" + }, + addSample: function () { vm.samples.push({input: "", output: "", "visible": true}); }, @@ -149,6 +125,29 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE } }); + var testCaseUploader = uploader("#testCaseFile", "/api/admin/test_case_upload/", + function (file, response) { + if (response.code) { + vm.uploadProgress = 0; + bsAlert(response.data); + } + else { + vm.testCaseId = response.data.test_case_id; + vm.uploadSuccess = true; + vm.testCaseList = []; + for (var i = 0; i < response.data.file_list.input.length; i++) { + vm.testCaseList.push({ + input: response.data.file_list.input[i], + output: response.data.file_list.output[i] + }); + } + bsAlert("测试数据添加成功！共添加" + vm.testCaseList.length + "组测试数据"); + } + }, + function (file, percentage) { + vm.uploadProgress = percentage; + }); + var tagAutoCompleteList = []; $.ajax({ diff --git a/static/src/js/app/admin/problem/editProblem.js b/static/src/js/app/admin/problem/editProblem.js index 9036178..4b936e0 100644 --- a/static/src/js/app/admin/problem/editProblem.js +++ b/static/src/js/app/admin/problem/editProblem.js @@ -1,16 +1,16 @@ -require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagEditor", "validator", "jqueryUI"], +require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagEditor", "validator", "jqueryUI", "editorComponent"], function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) { avalon.ready(function () { $("#edit-problem-form").validator() .on('submit', function (e) { - if (!e.isDefaultPrevented()){ + if (!e.isDefaultPrevented()) { if (vm.testCaseId == "") { bsAlert("你还没有上传测试数据!"); return false; } - if (vm.description == "") { + if (avalon.vmodels.problemDescriptionEditor.content == "") { bsAlert("题目描述不能为空!"); return false; } @@ -36,12 +36,12 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE var ajaxData = { id: avalon.vmodels.admin.problemId, title: vm.title, - description: vm.description, + description: avalon.vmodels.problemDescriptionEditor.content, time_limit: vm.timeLimit, memory_limit: vm.memoryLimit, samples: [], test_case_id: vm.testCaseId, - hint: vm.hint, + hint: avalon.vmodels.problemHintEditor.content, source: vm.source, visible: vm.visible, tags: tags, @@ -51,7 +51,10 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE }; for (var i = 0; i < vm.samples.$model.length; i++) { - ajaxData.samples.push({input: vm.samples.$model[i].input, output: vm.samples.$model[i].output}); + ajaxData.samples.push({ + input: vm.samples.$model[i].input, + output: vm.samples.$model[i].output + }); } $.ajax({ @@ -75,78 +78,78 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE return false; } }); - if (avalon.vmodels.editProblem) { - var vm = avalon.vmodels.editProblem; - vm.title= "", - vm.description= ""; - vm.timeLimit= -1; - vm.memoryLimit= -1; - vm.samples= []; - vm.hint= ""; - vm.visible= true; - vm.difficulty= 0; - vm.inputDescription= ""; - vm.outputDescription= ""; - vm.testCaseIdd= ""; - vm.uploadSuccess= false; - vm.source= ""; - vm.testCaseList= []; - } - else - var vm = avalon.define({ - $id: "editProblem", - title: "", - description: "", - timeLimit: -1, - memoryLimit: -1, - samples: [], - hint: "", - visible: true, - difficulty: 0, - inputDescription: "", - outputDescription: "", - testCaseIdd: "", - uploadSuccess: false, - source: "", - testCaseList: [], - addSample: function () { - vm.samples.push({input: "", output: "", "visible": true}); - }, - delSample: function (sample) { - if (confirm("你确定要删除么?")) { - vm.samples.remove(sample); + if (avalon.vmodels.editProblem) { + var vm = avalon.vmodels.editProblem; + } + else + var vm = avalon.define({ + $id: "editProblem", + title: "", + timeLimit: -1, + memoryLimit: -1, + samples: [], + visible: true, + difficulty: "1", + inputDescription: "", + outputDescription: "", + testCaseIdd: "", + uploadSuccess: false, + source: "", + testCaseList: [], + uploadProgress: 0, + + problemDescriptionEditor: { + editorId: "problem-description-editor", + placeholder: "题目描述" + }, + problemHintEditor: { + editorId: "problem-hint-editor", + placeholder: "提示" + }, + + addSample: function () { + vm.samples.push({input: "", output: "", "visible": true}); + }, + delSample: function (sample) { + if (confirm("你确定要删除么?")) { + vm.samples.remove(sample); + } + }, + toggleSample: function (sample) { + sample.visible = !sample.visible; + }, + getBtnContent: function (item) { + if (item.visible) + return "折叠"; + return "展开"; + }, + showProblemListPage: function () { + avalon.vmodels.admin.template_url = "template/problem/problem_list.html"; + } + }); + var testCaseUploader = uploader("#testCaseFile", "/api/admin/test_case_upload/", + function (file, response) { + if (response.code) { + vm.uploadProgress = 0; + bsAlert(response.data); + } + else { + vm.testCaseId = response.data.test_case_id; + vm.uploadSuccess = true; + vm.testCaseList = []; + for (var i = 0; i < response.data.file_list.input.length; i++) { + vm.testCaseList.push({ + input: response.data.file_list.input[i], + output: response.data.file_list.output[i] + }); + } + bsAlert("测试数据添加成功！共添加" + vm.testCaseList.length + "组测试数据"); } }, - toggleSample: function (sample) { - sample.visible = !sample.visible; - }, - getBtnContent: function (item) { - if (item.visible) - return "折叠"; - return "展开"; - }, - showProblemListPage: function(){ - vm.$fire("up!showProblemListPage"); + function (file, percentage) { + vm.uploadProgress = percentage; } - }); - var hintEditor = editor("#hint"); - var descriptionEditor = editor("#problemDescription"); - var testCaseUploader = uploader("#testCaseFile", "/api/admin/test_case_upload/", function (file, response) { - if (response.code) - bsAlert(response.data); - else { - vm.testCaseId = response.data.test_case_id; - vm.uploadSuccess = true; - vm.testCaseList = []; - for (var i = 0; i < response.data.file_list.input.length; i++) { - vm.testCaseList.push({ - input: response.data.file_list.input[i], - output: response.data.file_list.output[i] - }); - } - bsAlert("测试数据添加成功！共添加" + vm.testCaseList.length + "组测试数据"); - } - }); + ); $.ajax({ url: "/api/admin/problem/?problem_id=" + avalon.vmodels.admin.problemId, @@ -159,7 +162,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE else { var problem = data.data; vm.title = problem.title; - vm.description = problem.description; + avalon.vmodels.problemDescriptionEditor.content = problem.description; vm.timeLimit = problem.time_limit; vm.memoryLimit = problem.memory_limit; for (var i = 0; i < problem.samples.length; i++) { @@ -169,7 +172,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE visible: false }) } - vm.hint = problem.hint; + avalon.vmodels.problemHintEditor.content = problem.hint; vm.visible = problem.visible; vm.difficulty = problem.difficulty; vm.inputDescription = problem.input_description; @@ -177,8 +180,6 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE vm.testCaseId = problem.test_case_id; vm.source = problem.source; var problemTags = problem.tags; - hintEditor.setValue(vm.hint); - descriptionEditor.setValue(vm.description); $.ajax({ url: "/api/admin/tag/", dataType: "json", diff --git a/static/src/js/app/admin/problem/problem.js b/static/src/js/app/admin/problem/problem.js index 9fe56df..53d8a76 100644 --- a/static/src/js/app/admin/problem/problem.js +++ b/static/src/js/app/admin/problem/problem.js @@ -1,54 +1,44 @@ -require(["jquery", "avalon", "csrfToken", "bsAlert"], function ($, avalon, csrfTokenHeader, bsAlert) { +require(["jquery", "avalon", "csrfToken", "bsAlert", "pager"], function ($, avalon, csrfTokenHeader, bsAlert) { avalon.ready(function () { if(avalon.vmodels.problemList){ vm = avalon.vmodels.problemList; - problemList = []; } else { var vm = avalon.define({ $id: "problemList", problemList: [], - previousPage: 0, - nextPage: 0, - page: 1, - totalPage: 1, + keyword: "", showVisibleOnly: false, - getNext: function () { - if (!vm.nextPage) - return; - getPageData(vm.page + 1); - }, - getPrevious: function () { - if (!vm.previousPage) - return; - getPageData(vm.page - 1); - }, - getBtnClass: function (btn) { - if (btn == "next") { - return vm.nextPage ? "btn btn-primary" : "btn btn-primary disabled"; - } - else { - return vm.previousPage ? "btn btn-primary" : "btn btn-primary disabled"; + + pager: { + getPage: function (page) { + getPage(page); } }, - getPage: function (page_index) { - getPageData(page_index); - }, + showEditProblemPage: function (problemId) { - vm.$fire("up!showEditProblemPage", problemId); + avalon.vmodels.admin.problemId = problemId; + avalon.vmodels.admin.template_url = "template/problem/edit_problem.html"; }, showProblemSubmissionPage: function(problemId){ - vm.$fire("up!showProblemSubmissionPage", problemId); + avalon.vmodels.admin.problemId = problemId; + avalon.vmodels.admin.template_url = "template/problem/submission_list.html"; + }, + + search: function(){ + getPage(1); + avalon.vmodels.problemPager.currentPage = 1; } }); vm.$watch("showVisibleOnly", function () { - getPageData(1); + getPage(1); + avalon.vmodels.problemPager.currentPage = 1; }); } - getPageData(1); - function getPageData(page) { + + function getPage(page) { var url = "/api/admin/problem/?paging=true&page=" + page + "&page_size=10"; if (vm.keyword != "") url += "&keyword=" + vm.keyword; @@ -61,10 +51,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert"], function ($, avalon, csrfT success: function (data) { if (!data.code) { vm.problemList = data.data.results; - vm.totalPage = data.data.total_page; - vm.previousPage = data.data.previous_page; - vm.nextPage = data.data.next_page; - vm.page = page; + avalon.vmodels.problemPager.totalPage = data.data.total_page; } else { bsAlert(data.data); diff --git a/static/src/js/app/admin/problem/submissionList.js b/static/src/js/app/admin/problem/submissionList.js index e8d00bb..98c228e 100644 --- a/static/src/js/app/admin/problem/submissionList.js +++ b/static/src/js/app/admin/problem/submissionList.js @@ -1,12 +1,11 @@ -require(["jquery", "avalon", "csrfToken", "bsAlert"], function ($, avalon, csrfTokenHeader, bsAlert) { +require(["jquery", "avalon", "csrfToken", "bsAlert", "pager"], function ($, avalon, csrfTokenHeader, bsAlert) { avalon.ready(function () { - if (avalon.vmodels.submissionList){ + if (avalon.vmodels.submissionList) { var vm = avalon.vmodels.submissionList; } else { - var vm = avalon.define({ $id: "submissionList", submissionList: [], @@ -14,65 +13,43 @@ require(["jquery", "avalon", "csrfToken", "bsAlert"], function ($, avalon, csrfT nextPage: 0, page: 1, totalPage: 1, - results : { - 0: "Accepted", - 1: "Runtime Error", - 2: "Time Limit Exceeded", - 3: "Memory Limit Exceeded", - 4: "Compile Error", - 5: "Format Error", - 6: "Wrong Answer", - 7: "System Error", - 8: "Waiting" - }, - getNext: function () { - if (!vm.nextPage) - return; - getPageData(vm.page + 1); + results: { + 0: "Accepted", + 1: "Runtime Error", + 2: "Time Limit Exceeded", + 3: "Memory Limit Exceeded", + 4: "Compile Error", + 5: "Format Error", + 6: "Wrong Answer", + 7: "System Error", + 8: "Waiting" }, - getPrevious: function () { - if (!vm.previousPage) - return; - getPageData(vm.page - 1); - }, - getBtnClass: function (btn) { - if (btn == "next") { - return vm.nextPage ? "btn btn-primary" : "btn btn-primary disabled"; - } - else { - return vm.previousPage ? "btn btn-primary" : "btn btn-primary disabled"; + pager: { + getPage: function (page) { + getPage(page); } }, - getPage: function (page_index) { - getPageData(page_index); + showProblemListPage: function () { + avalon.vmodels.admin.template_url = "template/problem/problem_list.html"; }, - showSubmissionDetailPage: function (submissionId) { - }, - showProblemListPage: function(){ - vm.$fire("up!showProblemListPage"); - }, - rejudge: function(submission_id){ + rejudge: function (submission_id) { $.ajax({ - beforeSend: csrfTokenHeader, url: "/api/admin/rejudge/", method: "post", data: {"submission_id": submission_id}, - success: function(data){ - if(!data.code){ + success: function (data) { + if (!data.code) { bsAlert("重判任务提交成功"); } } - }) } }); } - getPageData(1); - - function getPageData(page) { - var url = "/api/admin/submission/?paging=true&page=" + page + "&page_size=10&problem_id=" + avalon.vmodels.admin.problemId; + function getPage(page) { + var url = "/api/admin/submission/?paging=true&page=" + page + "&page_size=20&problem_id=" + avalon.vmodels.admin.problemId; $.ajax({ url: url, dataType: "json", @@ -84,6 +61,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert"], function ($, avalon, csrfT vm.previousPage = data.data.previous_page; vm.nextPage = data.data.next_page; vm.page = page; + avalon.vmodels.submissionsListPager.totalPage = data.data.total_page; } else { bsAlert(data.data); diff --git a/static/src/js/app/admin/user/userList.js b/static/src/js/app/admin/user/userList.js index d2949f0..f468b55 100644 --- a/static/src/js/app/admin/user/userList.js +++ b/static/src/js/app/admin/user/userList.js @@ -1,133 +1,106 @@ -require(["jquery", "avalon", "csrfToken", "bsAlert", "validator"], function ($, avalon, csrfTokenHeader, bsAlert) { +require(["jquery", "avalon", "csrfToken", "bsAlert", "pager", "validator"], + function ($, avalon, csrfTokenHeader, bsAlert) { + avalon.ready(function () { + if (avalon.vmodels.userList) { + var vm = avalon.vmodels.userList; + } + else { + var vm = avalon.define({ + $id: "userList", + userList: [], + userType: ["一般用户", "管理员", "超级管理员"], - // avalon:定义模式 userList - avalon.ready(function () { + keyword: "", + showAdminOnly: false, + isEditing: false, - if (avalon.vmodels.userList) { - var vm = avalon.vmodels.userList; - // initialize avalon object - userList = []; //previousPage= 0; nextPage= 0; page = 1; - //editingUserId= 0; totalPage = 1; keyword= ""; showAdminOnly= false; - //user editor fields - username= ""; realName= ""; email= ""; adminType= 0; id= 0; - } - else { - var vm = avalon.define({ - $id: "userList", - //通用变量 - userList: [], - previousPage: 0, - nextPage: 0, - page: 1, - editingUserId: 0, - totalPage: 1, - userType: ["一般用户", "管理员", "超级管理员"], - keyword: "", - showAdminOnly: false, - //编辑区域同步变量 - username: "", - realName: "", - email: "", - adminType: 0, - id: 0, - getNext: function () { - if (!vm.nextPage) - return; - getPageData(vm.page + 1); - }, - getPrevious: function () { - if (!vm.previousPage) - return; - getPageData(vm.page - 1); - }, - getBtnClass: function (btn) { //上一页/下一页按钮启用禁用逻辑 - if (btn == "next") { - return vm.nextPage ? "btn btn-primary" : "btn btn-primary disabled"; + username: "", + realName: "", + email: "", + adminType: 0, + userId: -1, + + pager: { + getPage: function (page) { + getPage(page); + } + }, + editUser: function (user) { + vm.username = user.username; + vm.realName = user.real_name; + vm.adminType = user.admin_type; + vm.email = user.email; + vm.userId = user.id; + + vm.isEditing = true; + }, + search: function () { + getPage(1); + avalon.vmodels.userPager.currentPage = 1; } - else { - return vm.previousPage ? "btn btn-primary" : "btn btn-primary disabled"; - } - }, - editUser: function (user) { //点击编辑按钮的事件,显示/隐藏编辑区 - vm.username = user.username; - vm.realName = user.real_name; - vm.adminType = user.admin_type; - vm.email = user.email; - vm.id = user.id; - if (vm.editingUserId == user.id) - vm.editingUserId = 0; - else - vm.editingUserId = user.id; - }, - search: function () { - getPageData(1); - } + }); + } + vm.$watch("showAdminOnly", function () { + getPage(1); + avalon.vmodels.userPager.currentPage = 1; }); - } - vm.$watch("showAdminOnly", function () { - getPageData(1); + + function getPage(page) { + var url = "/api/admin/user/?paging=true&page=" + page + "&page_size=10"; + if (vm.showAdminOnly == true) + url += "&admin_type=1"; + if (vm.keyword != "") + url += "&keyword=" + vm.keyword; + $.ajax({ + beforeSend: csrfTokenHeader, + url: url, + dataType: "json", + method: "get", + success: function (data) { + if (!data.code) { + vm.userList = data.data.results; + avalon.vmodels.userPager.totalPage = data.data.total_page; + } + else { + bsAlert(data.data); + } + } + }); + } + + $("#edit-user-form").validator() + .on('submit', function (e) { + if (!e.isDefaultPrevented()) { + var data = { + username: vm.username, + real_name: vm.realName, + email: vm.email, + id: vm.userId, + admin_type: vm.adminType + }; + if ($("#password").val() !== "") + data.password = $("#password").val(); + $.ajax({ + url: "/api/admin/user/", + data: data, + dataType: "json", + method: "put", + success: function (data) { + if (!data.code) { + bsAlert("编辑成功！"); + getPage(1); + $("#password").val(""); + vm.isEditing = false; + } else { + bsAlert(data.data); + } + } + }); + return false; + } + }); }); avalon.scan(); - getPageData(1); //用户列表初始化 - //Ajax get数据 - function getPageData(page) { - var url = "/api/admin/user/?paging=true&page=" + page + "&page_size=10"; - if (vm.showAdminOnly == true) - url += "&admin_type=1"; - if (vm.keyword != "") - url += "&keyword=" + vm.keyword; - $.ajax({ - beforeSend: csrfTokenHeader, - url: url, - dataType: "json", - method: "get", - success: function (data) { - if (!data.code) { - vm.userList = data.data.results; - vm.totalPage = data.data.total_page; - vm.previousPage = data.data.previous_page; - vm.nextPage = data.data.next_page; - vm.page = page; - } - else { - bsAlert(data.data); - } - } - }); - } - $("#edit_user-form").validator() - .on('submit', function (e) { - if (!e.isDefaultPrevented()) { - var data = { - username: vm.username, - real_name: vm.realName, - email: vm.email, - id: vm.id, - admin_type: vm.adminType - }; - if ($("#password").val() !== "") - data.password = $("#password").val(); - $.ajax({ - beforeSend: csrfTokenHeader, - url: "/api/admin/user/", - data: data, - dataType: "json", - method: "put", - success: function (data) { - if (!data.code) { - bsAlert("编辑成功！"); - getPageData(1); - $("#password").val(""); - } else { - bsAlert(data.data); - } - } - }); - return false; - } - }); - }); - -}) \ No newline at end of file + }); \ No newline at end of file diff --git a/static/src/js/app/oj/problem/problem.js b/static/src/js/app/oj/problem/problem.js index cdb1460..ea78e70 100644 --- a/static/src/js/app/oj/problem/problem.js +++ b/static/src/js/app/oj/problem/problem.js @@ -27,14 +27,41 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert", "ZeroClipboard"], return; } + function getLanguage(){ + return $("input[name='language'][checked]").val(); + } + var codeEditor = codeMirror(codeEditorSelector, "text/x-csrc"); - var language = $("input[name='language'][checked]").val(); + var language = getLanguage(); var submissionId; + function setLanguage(language){ + var languageTypes = {"1": "text/x-csrc", "2": "text/x-c++src", "3": "text/x-java"}; + codeEditor.setOption("mode", languageTypes[language]); + } + + function saveCode(code){ + localStorage.setItem(location.href, JSON.stringify({code: code, language: language})) + } + + if(window.localStorage){ + var data = localStorage[location.href]; + if(data){ + data = JSON.parse(data); + $("input[name='language'][value='" + data.language + "']").prop("checked", true); + language = data.language; + codeEditor.setValue(data.code); + setLanguage(data.language); + } + + setInterval(function(){ + saveCode(codeEditor.getValue()) + }, 3000); + } + $("input[name='language']").change(function () { language = this.value; - var languageTypes = {"1": "text/x-csrc", "2": "text/x-c++src", "3": "text/x-java"}; - codeEditor.setOption("mode", languageTypes[language]); + setLanguage(language); }); $("#show-more-btn").click(function () { diff --git a/static/src/js/build.js b/static/src/js/build.js index ba08615..96247c1 100644 --- a/static/src/js/build.js +++ b/static/src/js/build.js @@ -23,12 +23,16 @@ validator: "lib/validator/validator", ZeroClipboard: "lib/ZeroClipboard/ZeroClipboard", + // ------ admin web 组件 ---------- + pager: "components/pager", + // ------ 下面写的都不要直接用，而是使用上面的封装版本 ------ //富文本编辑器simditor -> editor simditor: "lib/simditor/simditor", "simple-module": "lib/simditor/module", "simple-hotkeys": "lib/simditor/hotkeys", "simple-uploader": "lib/simditor/uploader", + "simditor-autosave": "lib/simditor/simditor-autosave", //code mirror 代码编辑器 ->codeMirror _codeMirror: "lib/codeMirror/codemirror", @@ -69,6 +73,11 @@ group_20_pack: "app/admin/group/group", submissionList_21_pack: "app/admin/contest/submissionList" }, + shim: { + avalon: { + exports: "avalon" + } + }, findNestedDependencies: true, appDir: "../", dir: "../../release/", @@ -76,6 +85,9 @@ { name: "bootstrap", }, + { + name: "codeMirror" + }, { name: "announcement_0_pack" }, diff --git a/static/src/js/components/editorComponent.js b/static/src/js/components/editorComponent.js new file mode 100644 index 0000000..706f289 --- /dev/null +++ b/static/src/js/components/editorComponent.js @@ -0,0 +1,16 @@ +define("editorComponent", ["jquery", "avalon", "editor"], function ($, avalon, editor) { + avalon.component("ms:editor", { + $template: "", + editorId: "editorId", + content: "", + placeholder: "", + $editor: {}, + $ready: function (vm, el) { + el.msRetain = true; + vm.$editor = editor($("#" + vm.editorId)); + vm.$watch("content", function (oldValue, newValue) { + vm.$editor.setValue(oldValue); + }) + } + }) +}); diff --git a/static/src/js/components/pager.js b/static/src/js/components/pager.js new file mode 100644 index 0000000..b6918f7 --- /dev/null +++ b/static/src/js/components/pager.js @@ -0,0 +1,32 @@ +define("pager", ["avalon"], function (avalon) { + var _interface = function () { + }; + avalon.component("ms:pager", { + $template: "页数: {{ currentPage }}/{{ totalPage }} " + + " " + + " ", + currentPage: 1, + totalPage: 1, + _getPrevPage: _interface, + _getNextPage: _interface, + $init: function (vm, el) { + vm._getPrevPage = function () { + if (vm.currentPage > 1) { + vm.currentPage--; + vm.getPage(vm.currentPage); + } + }; + vm._getNextPage = function () { + if (vm.currentPage < vm.totalPage) { + vm.currentPage++; + vm.getPage(vm.currentPage); + } + }; + }, + $ready: function(vm, el){ + el.msRetain = true; + vm.getPage(1); + + } + }) +}); \ No newline at end of file diff --git a/static/src/js/config.js b/static/src/js/config.js index c543f5f..2e744a5 100644 --- a/static/src/js/config.js +++ b/static/src/js/config.js @@ -6,6 +6,7 @@ var require = { jquery: "lib/jquery/jquery", jcountdown: "lib/jcountdown/jcountdown", avalon: "lib/avalon/avalon", + //avalon15: "lib/avalon/avalon15", editor: "utils/editor", uploader: "utils/uploader", formValidation: "utils/formValidation", @@ -23,6 +24,10 @@ var require = { validator: "lib/validator/validator", ZeroClipboard: "lib/ZeroClipboard/ZeroClipboard", + // ------ admin web 组件 ---------- + pager: "components/pager", + editorComponent: "components/editorComponent", + // ------ 下面写的都不要直接用，而是使用上面的封装版本 ------ //富文本编辑器simditor -> editor @@ -30,6 +35,7 @@ var require = { "simple-module": "lib/simditor/module", "simple-hotkeys": "lib/simditor/hotkeys", "simple-uploader": "lib/simditor/uploader", + "simditor-autosave": "lib/simditor/simditor-autosave", //code mirror 代码编辑器 ->codeMirror _codeMirror: "lib/codeMirror/codemirror", @@ -69,5 +75,10 @@ var require = { contestPassword_19_pack: "app/oj/contest/contestPassword", group_20_pack: "app/admin/group/group", submissionList_21_pack: "app/admin/contest/submissionList" + }, + shim: { + avalon: { + exports: "avalon" + } } }; \ No newline at end of file diff --git a/static/src/js/lib/avalon/avalon.js b/static/src/js/lib/avalon/avalon.js index 9f41e82..48c2021 100644 --- a/static/src/js/lib/avalon/avalon.js +++ b/static/src/js/lib/avalon/avalon.js @@ -5,7 +5,7 @@ http://weibo.com/jslouvre/ Released under the MIT license - avalon.js 1.44 built in 2015.6.25 + avalon.shim.js 1.5.4 built in 2015.10.18 support IE6+ and other browsers ==================================================*/ (function(global, factory) { @@ -30,561 +30,547 @@ // Pass this if window is not defined yet }(typeof window !== "undefined" ? window : this, function(window, noGlobal){ - /********************************************************************* - * 全局变量及方法 * - **********************************************************************/ - var expose = new Date() - 0 +/********************************************************************* + * 全局变量及方法 * + **********************************************************************/ +var expose = new Date() - 0 //http://stackoverflow.com/questions/7290086/javascript-use-strict-and-nicks-find-global-function - var DOC = window.document - var head = DOC.getElementsByTagName("head")[0] //HEAD元素 - var ifGroup = head.insertBefore(document.createElement("avalon"), head.firstChild) //避免IE6 base标签BUG - ifGroup.innerHTML = "X" - ifGroup.setAttribute("ms-skip", "1") - ifGroup.className = "avalonHide" - var rnative = /\[native code\]/ //判定是否原生函数 - function log() { - if (window.console && avalon.config.debug) { - // http://stackoverflow.com/questions/8785624/how-to-safely-wrap-console-log - Function.apply.call(console.log, console, arguments) - } +var DOC = window.document +var head = DOC.getElementsByTagName("head")[0] //HEAD元素 +var ifGroup = head.insertBefore(document.createElement("avalon"), head.firstChild) //避免IE6 base标签BUG +ifGroup.innerHTML = "X" +ifGroup.setAttribute("ms-skip", "1") +ifGroup.className = "avalonHide" +var rnative = /\[native code\]/ //判定是否原生函数 +function log() { + if (window.console && avalon.config.debug) { + // http://stackoverflow.com/questions/8785624/how-to-safely-wrap-console-log + Function.apply.call(console.log, console, arguments) } +} - var subscribers = "$" + expose - var otherRequire = window.require - var otherDefine = window.define - var innerRequire - var stopRepeatAssign = false - var rword = /[^, ]+/g //切割字符串为一个个小块，以空格或豆号分开它们，结合replace实现字符串的forEach - var rcomplexType = /^(?:object|array)$/ - var rsvg = /^\[object SVG\w*Element\]$/ - var rwindow = /^\[object (?:Window|DOMWindow|global)\]$/ - var oproto = Object.prototype - var ohasOwn = oproto.hasOwnProperty - var serialize = oproto.toString - var ap = Array.prototype - var aslice = ap.slice - var Registry = {} //将函数曝光到此对象上，方便访问器收集依赖 - var W3C = window.dispatchEvent - var root = DOC.documentElement - var avalonFragment = DOC.createDocumentFragment() - var cinerator = DOC.createElement("div") - var class2type = {} - "Boolean Number String Function Array Date RegExp Object Error".replace(rword, function (name) { - class2type["[object " + name + "]"] = name.toLowerCase() - }) +var subscribers = "$" + expose +var stopRepeatAssign = false +var nullObject = {} //作用类似于noop，只用于代码防御，千万不要在它上面添加属性 +var rword = /[^, ]+/g //切割字符串为一个个小块，以空格或豆号分开它们，结合replace实现字符串的forEach +var rw20g = /\w+/g +var rcomplexType = /^(?:object|array)$/ +var rsvg = /^\[object SVG\w*Element\]$/ +var rwindow = /^\[object (?:Window|DOMWindow|global)\]$/ +var oproto = Object.prototype +var ohasOwn = oproto.hasOwnProperty +var serialize = oproto.toString +var ap = Array.prototype +var aslice = ap.slice +var W3C = window.dispatchEvent +var root = DOC.documentElement +var avalonFragment = DOC.createDocumentFragment() +var cinerator = DOC.createElement("div") +var class2type = {} +"Boolean Number String Function Array Date RegExp Object Error".replace(rword, function (name) { + class2type["[object " + name + "]"] = name.toLowerCase() +}) +function scpCompile(array){ + return Function.apply(noop,array) +} +function noop(){} - function noop() { +function oneObject(array, val) { + if (typeof array === "string") { + array = array.match(rword) || [] } - - - function oneObject(array, val) { - if (typeof array === "string") { - array = array.match(rword) || [] - } - var result = {}, + var result = {}, value = val !== void 0 ? val : 1 - for (var i = 0, n = array.length; i < n; i++) { - result[array[i]] = value - } - return result + for (var i = 0, n = array.length; i < n; i++) { + result[array[i]] = value } + return result +} //生成UUID http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript - var generateID = function (prefix) { - prefix = prefix || "avalon" - return String(Math.random() + Math.random()).replace(/\d\.\d{4}/, prefix) +var generateID = function (prefix) { + prefix = prefix || "avalon" + return String(Math.random() + Math.random()).replace(/\d\.\d{4}/, prefix) +} +function IE() { + if (window.VBArray) { + var mode = document.documentMode + return mode ? mode : window.XMLHttpRequest ? 7 : 6 + } else { + return NaN } - function IE() { - if (window.VBArray) { - var mode = document.documentMode - return mode ? mode : window.XMLHttpRequest ? 7 : 6 - } else { - return 0 - } - } - var IEVersion = IE() +} +var IEVersion = IE() - avalon = function (el) { //创建jQuery式的无new 实例化结构 - return new avalon.init(el) +avalon = function (el) { //创建jQuery式的无new 实例化结构 + return new avalon.init(el) +} + + +/*视浏览器情况采用最快的异步回调*/ +avalon.nextTick = new function () {// jshint ignore:line + var tickImmediate = window.setImmediate + var tickObserver = window.MutationObserver + if (tickImmediate) { + return tickImmediate.bind(window) } - avalon.profile = function () { - if (window.console && avalon.config.profile) { - Function.apply.call(console.log, console, arguments) + var queue = [] + function callback() { + var n = queue.length + for (var i = 0; i < n; i++) { + queue[i]() } + queue = queue.slice(n) } - /*视浏览器情况采用最快的异步回调*/ - avalon.nextTick = new function () {// jshint ignore:line - var tickImmediate = window.setImmediate - var tickObserver = window.MutationObserver - var tickPost = W3C && window.postMessage - if (tickImmediate) { - return tickImmediate.bind(window) - } - - var queue = [] - function callback() { - var n = queue.length - for (var i = 0; i < n; i++) { - queue[i]() - } - queue = queue.slice(n) - } - - if (tickObserver) { - var node = document.createTextNode("avalon") - new tickObserver(callback).observe(node, {characterData: true})// jshint ignore:line - return function (fn) { - queue.push(fn) - node.data = Math.random() - } - } - - if (tickPost) { - window.addEventListener("message", function (e) { - var source = e.source - if ((source === window || source === null) && e.data === "process-tick") { - e.stopPropagation() - callback() - } - }) - - return function (fn) { - queue.push(fn) - window.postMessage('process-tick', '*') - } - } - + if (tickObserver) { + var node = document.createTextNode("avalon") + new tickObserver(callback).observe(node, {characterData: true})// jshint ignore:line + var bool = false return function (fn) { - setTimeout(fn, 0) + queue.push(fn) + bool = !bool + node.data = bool } - }// jshint ignore:line - /********************************************************************* - * avalon的静态方法定义区 * - **********************************************************************/ - avalon.init = function(el) { - this[0] = this.element = el } - avalon.fn = avalon.prototype = avalon.init.prototype - avalon.type = function(obj) { //取得目标的类型 - if (obj == null) { - return String(obj) - } - // 早期的webkit内核浏览器实现了已废弃的ecma262v4标准，可以将正则字面量当作函数使用，因此typeof在判定正则时会返回function - return typeof obj === "object" || typeof obj === "function" ? - class2type[serialize.call(obj)] || "object" : + + return function (fn) { + setTimeout(fn, 4) + } +}// jshint ignore:line +/********************************************************************* + * avalon的静态方法定义区 * + **********************************************************************/ +avalon.init = function (el) { + this[0] = this.element = el +} +avalon.fn = avalon.prototype = avalon.init.prototype + +avalon.type = function (obj) { //取得目标的类型 + if (obj == null) { + return String(obj) + } + // 早期的webkit内核浏览器实现了已废弃的ecma262v4标准，可以将正则字面量当作函数使用，因此typeof在判定正则时会返回function + return typeof obj === "object" || typeof obj === "function" ? + class2type[serialize.call(obj)] || "object" : typeof obj - } +} - var isFunction = typeof alert === "object" ? function(fn) { - try { - return /^\s*\bfunction\b/.test(fn + "") - } catch (e) { - return false - } - } : function(fn) { - return serialize.call(fn) === "[object Function]" +var isFunction = typeof alert === "object" ? function (fn) { + try { + return /^\s*\bfunction\b/.test(fn + "") + } catch (e) { + return false } - avalon.isFunction = isFunction +} : function (fn) { + return serialize.call(fn) === "[object Function]" +} +avalon.isFunction = isFunction - avalon.isWindow = function(obj) { - if (!obj) - return false - // 利用IE678 window == document为true,document == window竟然为false的神奇特性 - // 标准浏览器及IE9，IE10等使用 正则检测 - return obj == obj.document && obj.document != obj //jshint ignore:line - } +avalon.isWindow = function (obj) { + if (!obj) + return false + // 利用IE678 window == document为true,document == window竟然为false的神奇特性 + // 标准浏览器及IE9，IE10等使用 正则检测 + return obj == obj.document && obj.document != obj //jshint ignore:line +} - function isWindow(obj) { - return rwindow.test(serialize.call(obj)) +function isWindow(obj) { + return rwindow.test(serialize.call(obj)) +} +if (isWindow(window)) { + avalon.isWindow = isWindow +} +var enu +for (enu in avalon({})) { + break +} +var enumerateBUG = enu !== "0" //IE6下为true, 其他为false +/*判定是否是一个朴素的javascript对象（Object），不是DOM对象，不是BOM对象，不是自定义类的实例*/ +avalon.isPlainObject = function (obj, key) { + if (!obj || avalon.type(obj) !== "object" || obj.nodeType || avalon.isWindow(obj)) { + return false; } - if (isWindow(window)) { - avalon.isWindow = isWindow - } - var enu - for (enu in avalon({})) { - break - } - var enumerateBUG = enu !== "0" //IE6下为true, 其他为false - /*判定是否是一个朴素的javascript对象（Object），不是DOM对象，不是BOM对象，不是自定义类的实例*/ - avalon.isPlainObject = function(obj, key) { - if (!obj || avalon.type(obj) !== "object" || obj.nodeType || avalon.isWindow(obj)) { + try { //IE内置对象没有constructor + if (obj.constructor && !ohasOwn.call(obj, "constructor") && !ohasOwn.call(obj.constructor.prototype, "isPrototypeOf")) { return false; } - try { //IE内置对象没有constructor - if (obj.constructor && !ohasOwn.call(obj, "constructor") && !ohasOwn.call(obj.constructor.prototype, "isPrototypeOf")) { - return false; - } - } catch (e) { //IE8 9会在这里抛错 - return false; - } - if (enumerateBUG) { - for (key in obj) { - return ohasOwn.call(obj, key) - } - } + } catch (e) { //IE8 9会在这里抛错 + return false; + } + if (enumerateBUG) { for (key in obj) { - } - return key === void 0 || ohasOwn.call(obj, key) - } - if (rnative.test(Object.getPrototypeOf)) { - avalon.isPlainObject = function(obj) { - // 简单的 typeof obj === "object"检测，会致使用isPlainObject(window)在opera下通不过 - return serialize.call(obj) === "[object Object]" && Object.getPrototypeOf(obj) === oproto + return ohasOwn.call(obj, key) } } + for (key in obj) { + } + return key === void 0 || ohasOwn.call(obj, key) +} +if (rnative.test(Object.getPrototypeOf)) { + avalon.isPlainObject = function (obj) { + // 简单的 typeof obj === "object"检测，会致使用isPlainObject(window)在opera下通不过 + return serialize.call(obj) === "[object Object]" && Object.getPrototypeOf(obj) === oproto + } +} //与jQuery.extend方法，可用于浅拷贝，深拷贝 - avalon.mix = avalon.fn.mix = function() { - var options, name, src, copy, copyIsArray, clone, +avalon.mix = avalon.fn.mix = function () { + var options, name, src, copy, copyIsArray, clone, target = arguments[0] || {}, i = 1, length = arguments.length, deep = false - // 如果第一个参数为布尔,判定是否深拷贝 - if (typeof target === "boolean") { - deep = target - target = arguments[1] || {} - i++ - } + // 如果第一个参数为布尔,判定是否深拷贝 + if (typeof target === "boolean") { + deep = target + target = arguments[1] || {} + i++ + } - //确保接受方为一个复杂的数据类型 - if (typeof target !== "object" && !isFunction(target)) { - target = {} - } + //确保接受方为一个复杂的数据类型 + if (typeof target !== "object" && !isFunction(target)) { + target = {} + } - //如果只有一个参数，那么新成员添加于mix所在的对象上 - if (i === length) { - target = this - i-- - } + //如果只有一个参数，那么新成员添加于mix所在的对象上 + if (i === length) { + target = this + i-- + } - for (; i < length; i++) { - //只处理非空参数 - if ((options = arguments[i]) != null) { - for (name in options) { - src = target[name] - try { - copy = options[name] //当options为VBS对象时报错 - } catch (e) { - continue + for (; i < length; i++) { + //只处理非空参数 + if ((options = arguments[i]) != null) { + for (name in options) { + src = target[name] + try { + copy = options[name] //当options为VBS对象时报错 + } catch (e) { + continue + } + + // 防止环引用 + if (target === copy) { + continue + } + if (deep && copy && (avalon.isPlainObject(copy) || (copyIsArray = Array.isArray(copy)))) { + + if (copyIsArray) { + copyIsArray = false + clone = src && Array.isArray(src) ? src : [] + + } else { + clone = src && avalon.isPlainObject(src) ? src : {} } - // 防止环引用 - if (target === copy) { - continue - } - if (deep && copy && (avalon.isPlainObject(copy) || (copyIsArray = Array.isArray(copy)))) { - - if (copyIsArray) { - copyIsArray = false - clone = src && Array.isArray(src) ? src : [] - - } else { - clone = src && avalon.isPlainObject(src) ? src : {} - } - - target[name] = avalon.mix(deep, clone, copy) - } else if (copy !== void 0) { - target[name] = copy - } + target[name] = avalon.mix(deep, clone, copy) + } else if (copy !== void 0) { + target[name] = copy } } } - return target } + return target +} - function _number(a, len) { //用于模拟slice, splice的效果 - a = Math.floor(a) || 0 - return a < 0 ? Math.max(len + a, 0) : Math.min(a, len); - } - avalon.mix({ - rword: rword, - subscribers: subscribers, - version: 1.44, - ui: {}, - log: log, - slice: W3C ? function(nodes, start, end) { - return aslice.call(nodes, start, end) - } : function(nodes, start, end) { - var ret = [] - var len = nodes.length - if (end === void 0) - end = len - if (typeof end === "number" && isFinite(end)) { - start = _number(start, len) - end = _number(end, len) - for (var i = start; i < end; ++i) { - ret[i - start] = nodes[i] - } +function _number(a, len) { //用于模拟slice, splice的效果 + a = Math.floor(a) || 0 + return a < 0 ? Math.max(len + a, 0) : Math.min(a, len); +} +avalon.mix({ + rword: rword, + subscribers: subscribers, + version: 1.54, + ui: {}, + log: log, + slice: W3C ? function (nodes, start, end) { + return aslice.call(nodes, start, end) + } : function (nodes, start, end) { + var ret = [] + var len = nodes.length + if (end === void 0) + end = len + if (typeof end === "number" && isFinite(end)) { + start = _number(start, len) + end = _number(end, len) + for (var i = start; i < end; ++i) { + ret[i - start] = nodes[i] } - return ret - }, - noop: noop, - /*如果不用Error对象封装一下，str在控制台下可能会乱码*/ - error: function(str, e) { - throw (e || Error)(str) - }, - /*将一个以空格或逗号隔开的字符串或数组,转换成一个键值都为1的对象*/ - oneObject: oneObject, - /* avalon.range(10) - => [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - avalon.range(1, 11) - => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] - avalon.range(0, 30, 5) - => [0, 5, 10, 15, 20, 25] - avalon.range(0, -10, -1) - => [0, -1, -2, -3, -4, -5, -6, -7, -8, -9] - avalon.range(0) - => []*/ - range: function(start, end, step) { // 用于生成整数数组 - step || (step = 1) - if (end == null) { - end = start || 0 - start = 0 - } - var index = -1, + } + return ret + }, + noop: noop, + /*如果不用Error对象封装一下，str在控制台下可能会乱码*/ + error: function (str, e) { + throw (e || Error)(str) + }, + /*将一个以空格或逗号隔开的字符串或数组,转换成一个键值都为1的对象*/ + oneObject: oneObject, + /* avalon.range(10) + => [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + avalon.range(1, 11) + => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] + avalon.range(0, 30, 5) + => [0, 5, 10, 15, 20, 25] + avalon.range(0, -10, -1) + => [0, -1, -2, -3, -4, -5, -6, -7, -8, -9] + avalon.range(0) + => []*/ + range: function (start, end, step) { // 用于生成整数数组 + step || (step = 1) + if (end == null) { + end = start || 0 + start = 0 + } + var index = -1, length = Math.max(0, Math.ceil((end - start) / step)), result = new Array(length) - while (++index < length) { - result[index] = start - start += step + while (++index < length) { + result[index] = start + start += step + } + return result + }, + eventHooks: {}, + /*绑定事件*/ + bind: function (el, type, fn, phase) { + var hooks = avalon.eventHooks + var hook = hooks[type] + if (typeof hook === "object") { + type = hook.type || type + phase = hook.phase || !!phase + fn = hook.fn ? hook.fn(el, fn) : fn + } + var callback = W3C ? fn : function (e) { + fn.call(el, fixEvent(e)); + } + if (W3C) { + el.addEventListener(type, callback, phase) + } else { + el.attachEvent("on" + type, callback) + } + return callback + }, + /*卸载事件*/ + unbind: function (el, type, fn, phase) { + var hooks = avalon.eventHooks + var hook = hooks[type] + var callback = fn || noop + if (typeof hook === "object") { + type = hook.type || type + phase = hook.phase || !!phase + } + if (W3C) { + el.removeEventListener(type, callback, phase) + } else { + el.detachEvent("on" + type, callback) + } + }, + /*读写删除元素节点的样式*/ + css: function (node, name, value) { + if (node instanceof avalon) { + node = node[0] + } + var prop = /[_-]/.test(name) ? camelize(name) : name, + fn + name = avalon.cssName(prop) || prop + if (value === void 0 || typeof value === "boolean") { //获取样式 + fn = cssHooks[prop + ":get"] || cssHooks["@:get"] + if (name === "background") { + name = "backgroundColor" } - return result - }, - eventHooks: {}, - /*绑定事件*/ - bind: function(el, type, fn, phase) { - var hooks = avalon.eventHooks - var hook = hooks[type] - if (typeof hook === "object") { - type = hook.type - if (hook.deel) { - fn = hook.deel(el, type, fn, phase) + var val = fn(node, name) + return value === true ? parseFloat(val) || 0 : val + } else if (value === "") { //请除样式 + node.style[name] = "" + } else { //设置样式 + if (value == null || value !== value) { + return + } + if (isFinite(value) && !avalon.cssNumber[prop]) { + value += "px" + } + fn = cssHooks[prop + ":set"] || cssHooks["@:set"] + fn(node, name, value) + } + }, + /*遍历数组与对象,回调的第一个参数为索引或键名,第二个或元素或键值*/ + each: function (obj, fn) { + if (obj) { //排除null, undefined + var i = 0 + if (isArrayLike(obj)) { + for (var n = obj.length; i < n; i++) { + if (fn(i, obj[i]) === false) + break } - } - var callback = W3C ? fn : function(e) { - fn.call(el, fixEvent(e)); - } - if (W3C) { - el.addEventListener(type, callback, !!phase) } else { - el.attachEvent("on" + type, callback) - } - return callback - }, - /*卸载事件*/ - unbind: function(el, type, fn, phase) { - var hooks = avalon.eventHooks - var hook = hooks[type] - var callback = fn || noop - if (typeof hook === "object") { - type = hook.type - if (hook.deel) { - fn = hook.deel(el, type, fn, false) - } - } - if (W3C) { - el.removeEventListener(type, callback, !!phase) - } else { - el.detachEvent("on" + type, callback) - } - }, - /*读写删除元素节点的样式*/ - css: function(node, name, value) { - if (node instanceof avalon) { - node = node[0] - } - var prop = /[_-]/.test(name) ? camelize(name) : name, fn - name = avalon.cssName(prop) || prop - if (value === void 0 || typeof value === "boolean") { //获取样式 - fn = cssHooks[prop + ":get"] || cssHooks["@:get"] - if (name === "background") { - name = "backgroundColor" - } - var val = fn(node, name) - return value === true ? parseFloat(val) || 0 : val - } else if (value === "") { //请除样式 - node.style[name] = "" - } else { //设置样式 - if (value == null || value !== value) { - return - } - if (isFinite(value) && !avalon.cssNumber[prop]) { - value += "px" - } - fn = cssHooks[prop + ":set"] || cssHooks["@:set"] - fn(node, name, value) - } - }, - /*遍历数组与对象,回调的第一个参数为索引或键名,第二个或元素或键值*/ - each: function(obj, fn) { - if (obj) { //排除null, undefined - var i = 0 - if (isArrayLike(obj)) { - for (var n = obj.length; i < n; i++) { - if (fn(i, obj[i]) === false) - break - } - } else { - for (i in obj) { - if (obj.hasOwnProperty(i) && fn(i, obj[i]) === false) { - break - } + for (i in obj) { + if (obj.hasOwnProperty(i) && fn(i, obj[i]) === false) { + break } } } - }, - //收集元素的data-{{prefix}}-*属性，并转换为对象 - getWidgetData: function(elem, prefix) { - var raw = avalon(elem).data() - var result = {} - for (var i in raw) { - if (i.indexOf(prefix) === 0) { - result[i.replace(prefix, "").replace(/\w/, function(a) { - return a.toLowerCase() - })] = raw[i] - } - } - return result - }, - Array: { - /*只有当前数组不存在此元素时只添加它*/ - ensure: function(target, item) { - if (target.indexOf(item) === -1) { - return target.push(item) - } - }, - /*移除数组中指定位置的元素，返回布尔表示成功与否*/ - removeAt: function(target, index) { - return !!target.splice(index, 1).length - }, - /*移除数组中第一个匹配传参的那个元素，返回布尔表示成功与否*/ - remove: function(target, item) { - var index = target.indexOf(item) - if (~index) - return avalon.Array.removeAt(target, index) - return false - } } - }) - - var bindingHandlers = avalon.bindingHandlers = {} - var bindingExecutors = avalon.bindingExecutors = {} - - /*判定是否类数组，如节点集合，纯数组，arguments与拥有非负整数的length属性的纯JS对象*/ - function isArrayLike(obj) { - if (!obj) + }, + //收集元素的data-{{prefix}}-*属性，并转换为对象 + getWidgetData: function (elem, prefix) { + var raw = avalon(elem).data() + var result = {} + for (var i in raw) { + if (i.indexOf(prefix) === 0) { + result[i.replace(prefix, "").replace(/\w/, function (a) { + return a.toLowerCase() + })] = raw[i] + } + } + return result + }, + Array: { + /*只有当前数组不存在此元素时只添加它*/ + ensure: function (target, item) { + if (target.indexOf(item) === -1) { + return target.push(item) + } + }, + /*移除数组中指定位置的元素，返回布尔表示成功与否*/ + removeAt: function (target, index) { + return !!target.splice(index, 1).length + }, + /*移除数组中第一个匹配传参的那个元素，返回布尔表示成功与否*/ + remove: function (target, item) { + var index = target.indexOf(item) + if (~index) + return avalon.Array.removeAt(target, index) return false - var n = obj.length - if (n === (n >>> 0)) { //检测length属性是否为非负整数 - var type = serialize.call(obj).slice(8, -1) - if (/(?:regexp|string|function|window|global)$/i.test(type)) - return false - if (type === "Array") - return true - try { - if ({}.propertyIsEnumerable.call(obj, "length") === false) { //如果是原生对象 - return /^\s?function/.test(obj.item || obj.callee) - } - return true - } catch (e) { //IE的NodeList直接抛错 - return !obj.window //IE6-8 window - } } - return false } +}) + +var bindingHandlers = avalon.bindingHandlers = {} +var bindingExecutors = avalon.bindingExecutors = {} + +var directives = avalon.directives = {} +avalon.directive = function (name, obj) { + bindingHandlers[name] = obj.init = (obj.init || noop) + bindingExecutors[name] = obj.update = (obj.update || noop) + + return directives[name] = obj +} +/*判定是否类数组，如节点集合，纯数组，arguments与拥有非负整数的length属性的纯JS对象*/ +function isArrayLike(obj) { + if (!obj) + return false + var n = obj.length + if (n === (n >>> 0)) { //检测length属性是否为非负整数 + var type = serialize.call(obj).slice(8, -1) + if (/(?:regexp|string|function|window|global)$/i.test(type)) + return false + if (type === "Array") + return true + try { + if ({}.propertyIsEnumerable.call(obj, "length") === false) { //如果是原生对象 + return /^\s?function/.test(obj.item || obj.callee) + } + return true + } catch (e) { //IE的NodeList直接抛错 + return !obj.window //IE6-8 window + } + } + return false +} // https://github.com/rsms/js-lru - var Cache = new function() {// jshint ignore:line - function LRU(maxLength) { - this.size = 0 - this.limit = maxLength - this.head = this.tail = void 0 - this._keymap = {} +var Cache = new function() {// jshint ignore:line + function LRU(maxLength) { + this.size = 0 + this.limit = maxLength + this.head = this.tail = void 0 + this._keymap = {} + } + + var p = LRU.prototype + + p.put = function(key, value) { + var entry = { + key: key, + value: value } - - var p = LRU.prototype - - p.put = function(key, value) { - var entry = { - key: key, - value: value - } - this._keymap[key] = entry - if (this.tail) { - this.tail.newer = entry - entry.older = this.tail - } else { - this.head = entry - } - this.tail = entry - if (this.size === this.limit) { - this.shift() - } else { - this.size++ - } - return value + this._keymap[key] = entry + if (this.tail) { + this.tail.newer = entry + entry.older = this.tail + } else { + this.head = entry } + this.tail = entry + if (this.size === this.limit) { + this.shift() + } else { + this.size++ + } + return value + } - p.shift = function() { - var entry = this.head - if (entry) { - this.head = this.head.newer - this.head.older = + p.shift = function() { + var entry = this.head + if (entry) { + this.head = this.head.newer + this.head.older = entry.newer = - entry.older = - this._keymap[entry.key] = void 0 - } - } - p.get = function(key) { - var entry = this._keymap[key] - if (entry === void 0) - return - if (entry === this.tail) { - return entry.value - } - // HEAD--------------TAIL - // <.older .newer> - // <--- add direction -- - // A B C E - if (entry.newer) { - if (entry === this.head) { - this.head = entry.newer - } - entry.newer.older = entry.older // C <-- E. - } - if (entry.older) { - entry.older.newer = entry.newer // C. --> E - } - entry.newer = void 0 // D --x - entry.older = this.tail // D. --> E - if (this.tail) { - this.tail.newer = entry // E. <-- D - } - this.tail = entry - return entry.value - } - return LRU - }// jshint ignore:line - - /********************************************************************* - * javascript 底层补丁 * - **********************************************************************/ - if (!"司徒正美".trim) { - var rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g - String.prototype.trim = function () { - return this.replace(rtrim, "") + entry.older = + this._keymap[entry.key] = void 0 + delete this._keymap[entry.key] //#1029 } } - var hasDontEnumBug = !({ - 'toString': null - }).propertyIsEnumerable('toString'), + p.get = function(key) { + var entry = this._keymap[key] + if (entry === void 0) + return + if (entry === this.tail) { + return entry.value + } + // HEAD--------------TAIL + // <.older .newer> + // <--- add direction -- + // A B C E + if (entry.newer) { + if (entry === this.head) { + this.head = entry.newer + } + entry.newer.older = entry.older // C <-- E. + } + if (entry.older) { + entry.older.newer = entry.newer // C. --> E + } + entry.newer = void 0 // D --x + entry.older = this.tail // D. --> E + if (this.tail) { + this.tail.newer = entry // E. <-- D + } + this.tail = entry + return entry.value + } + return LRU +}// jshint ignore:line + +/********************************************************************* + * javascript 底层补丁 * + **********************************************************************/ +if (!"司徒正美".trim) { + var rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g + String.prototype.trim = function () { + return this.replace(rtrim, "") + } +} +var hasDontEnumBug = !({ + 'toString': null +}).propertyIsEnumerable('toString'), hasProtoEnumBug = (function () { }).propertyIsEnumerable('prototype'), dontEnums = [ @@ -597,869 +583,916 @@ "constructor" ], dontEnumsLength = dontEnums.length; - if (!Object.keys) { - Object.keys = function (object) { //ecma262v5 15.2.3.14 - var theKeys = [] - var skipProto = hasProtoEnumBug && typeof object === "function" - if (typeof object === "string" || (object && object.callee)) { - for (var i = 0; i < object.length; ++i) { - theKeys.push(String(i)) - } - } else { - for (var name in object) { - if (!(skipProto && name === "prototype") && ohasOwn.call(object, name)) { - theKeys.push(String(name)) - } +if (!Object.keys) { + Object.keys = function (object) { //ecma262v5 15.2.3.14 + var theKeys = [] + var skipProto = hasProtoEnumBug && typeof object === "function" + if (typeof object === "string" || (object && object.callee)) { + for (var i = 0; i < object.length; ++i) { + theKeys.push(String(i)) + } + } else { + for (var name in object) { + if (!(skipProto && name === "prototype") && ohasOwn.call(object, name)) { + theKeys.push(String(name)) } } + } - if (hasDontEnumBug) { - var ctor = object.constructor, + if (hasDontEnumBug) { + var ctor = object.constructor, skipConstructor = ctor && ctor.prototype === object - for (var j = 0; j < dontEnumsLength; j++) { - var dontEnum = dontEnums[j] - if (!(skipConstructor && dontEnum === "constructor") && ohasOwn.call(object, dontEnum)) { - theKeys.push(dontEnum) - } + for (var j = 0; j < dontEnumsLength; j++) { + var dontEnum = dontEnums[j] + if (!(skipConstructor && dontEnum === "constructor") && ohasOwn.call(object, dontEnum)) { + theKeys.push(dontEnum) } } - return theKeys } + return theKeys } - if (!Array.isArray) { - Array.isArray = function (a) { - return serialize.call(a) === "[object Array]" - } +} +if (!Array.isArray) { + Array.isArray = function (a) { + return serialize.call(a) === "[object Array]" } +} - if (!noop.bind) { - Function.prototype.bind = function (scope) { - if (arguments.length < 2 && scope === void 0) - return this - var fn = this, +if (!noop.bind) { + Function.prototype.bind = function (scope) { + if (arguments.length < 2 && scope === void 0) + return this + var fn = this, argv = arguments - return function () { - var args = [], + return function () { + var args = [], i - for (i = 1; i < argv.length; i++) - args.push(argv[i]) - for (i = 0; i < arguments.length; i++) - args.push(arguments[i]) - return fn.apply(scope, args) - } + for (i = 1; i < argv.length; i++) + args.push(argv[i]) + for (i = 0; i < arguments.length; i++) + args.push(arguments[i]) + return fn.apply(scope, args) } } +} - function iterator(vars, body, ret) { - var fun = 'for(var ' + vars + 'i=0,n = this.length; i < n; i++){' + body.replace('_', '((i in this) && fn.call(scope,this[i],i,this))') + '}' + ret - /* jshint ignore:start */ - return Function("fn,scope", fun) - /* jshint ignore:end */ - } - if (!rnative.test([].map)) { - avalon.mix(ap, { - //定位操作，返回数组中第一个等于给定参数的元素的索引值。 - indexOf: function (item, index) { - var n = this.length, +function iterator(vars, body, ret) { + var fun = 'for(var ' + vars + 'i=0,n = this.length; i < n; i++){' + body.replace('_', '((i in this) && fn.call(scope,this[i],i,this))') + '}' + ret + /* jshint ignore:start */ + return Function("fn,scope", fun) + /* jshint ignore:end */ +} +if (!rnative.test([].map)) { + avalon.mix(ap, { + //定位操作，返回数组中第一个等于给定参数的元素的索引值。 + indexOf: function (item, index) { + var n = this.length, i = ~~index - if (i < 0) - i += n - for (; i < n; i++) - if (this[i] === item) - return i - return -1 - }, - //定位操作，同上，不过是从后遍历。 - lastIndexOf: function (item, index) { - var n = this.length, + if (i < 0) + i += n + for (; i < n; i++) + if (this[i] === item) + return i + return -1 + }, + //定位操作，同上，不过是从后遍历。 + lastIndexOf: function (item, index) { + var n = this.length, i = index == null ? n - 1 : index - if (i < 0) - i = Math.max(0, n + i) - for (; i >= 0; i--) - if (this[i] === item) - return i - return -1 - }, - //迭代操作，将数组的元素挨个儿传入一个函数中执行。Prototype.js的对应名字为each。 - forEach: iterator("", '_', ""), - //迭代类 在数组中的每个项上运行一个函数，如果此函数的值为真，则此元素作为新数组的元素收集起来，并返回新数组 - filter: iterator('r=[],j=0,', 'if(_)r[j++]=this[i]', 'return r'), - //收集操作，将数组的元素挨个儿传入一个函数中执行，然后把它们的返回值组成一个新数组返回。Prototype.js的对应名字为collect。 - map: iterator('r=[],', 'r[i]=_', 'return r'), - //只要数组中有一个元素满足条件（放进给定函数返回true），那么它就返回true。Prototype.js的对应名字为any。 - some: iterator("", 'if(_)return true', 'return false'), - //只有数组中的元素都满足条件（放进给定函数返回true），它才返回true。Prototype.js的对应名字为all。 - every: iterator("", 'if(!_)return false', 'return true') - }) - } - /********************************************************************* - * DOM 底层补丁 * - **********************************************************************/ + if (i < 0) + i = Math.max(0, n + i) + for (; i >= 0; i--) + if (this[i] === item) + return i + return -1 + }, + //迭代操作，将数组的元素挨个儿传入一个函数中执行。Prototype.js的对应名字为each。 + forEach: iterator("", '_', ""), + //迭代类 在数组中的每个项上运行一个函数，如果此函数的值为真，则此元素作为新数组的元素收集起来，并返回新数组 + filter: iterator('r=[],j=0,', 'if(_)r[j++]=this[i]', 'return r'), + //收集操作，将数组的元素挨个儿传入一个函数中执行，然后把它们的返回值组成一个新数组返回。Prototype.js的对应名字为collect。 + map: iterator('r=[],', 'r[i]=_', 'return r'), + //只要数组中有一个元素满足条件（放进给定函数返回true），那么它就返回true。Prototype.js的对应名字为any。 + some: iterator("", 'if(_)return true', 'return false'), + //只有数组中的元素都满足条件（放进给定函数返回true），它才返回true。Prototype.js的对应名字为all。 + every: iterator("", 'if(!_)return false', 'return true') + }) +} +/********************************************************************* + * DOM 底层补丁 * + **********************************************************************/ - function fixContains(root, el) { - try { //IE6-8,游离于DOM树外的文本节点，访问parentNode有时会抛错 - while ((el = el.parentNode)) - if (el === root) - return true - return false - } catch (e) { - return false - } +function fixContains(root, el) { + try { //IE6-8,游离于DOM树外的文本节点，访问parentNode有时会抛错 + while ((el = el.parentNode)) + if (el === root) + return true + return false + } catch (e) { + return false } - avalon.contains = fixContains +} +avalon.contains = fixContains //IE6-11的文档对象没有contains - if (!DOC.contains) { - DOC.contains = function (b) { - return fixContains(DOC, b) +if (!DOC.contains) { + DOC.contains = function (b) { + return fixContains(DOC, b) + } +} + +function outerHTML() { + return new XMLSerializer().serializeToString(this) +} + +if (window.SVGElement) { + //safari5+是把contains方法放在Element.prototype上而不是Node.prototype + if (!DOC.createTextNode("x").contains) { + Node.prototype.contains = function (arg) {//IE6-8没有Node对象 + return !!(this.compareDocumentPosition(arg) & 16) } } - - function outerHTML() { - return new XMLSerializer().serializeToString(this) - } - - if (window.SVGElement) { - //safari5+是把contains方法放在Element.prototype上而不是Node.prototype - if (!DOC.createTextNode("x").contains) { - Node.prototype.contains = function (arg) {//IE6-8没有Node对象 - return !!(this.compareDocumentPosition(arg) & 16) - } - } - var svgns = "http://www.w3.org/2000/svg" - var svg = DOC.createElementNS(svgns, "svg") - svg.innerHTML = '' - if (!rsvg.test(svg.firstChild)) { // #409 - function enumerateNode(node, targetNode) {// jshint ignore:line - if (node && node.childNodes) { - var nodes = node.childNodes - for (var i = 0, el; el = nodes[i++]; ) { - if (el.tagName) { - var svg = DOC.createElementNS(svgns, + var svgns = "http://www.w3.org/2000/svg" + var svg = DOC.createElementNS(svgns, "svg") + svg.innerHTML = '' + if (!rsvg.test(svg.firstChild)) { // #409 + function enumerateNode(node, targetNode) {// jshint ignore:line + if (node && node.childNodes) { + var nodes = node.childNodes + for (var i = 0, el; el = nodes[i++]; ) { + if (el.tagName) { + var svg = DOC.createElementNS(svgns, el.tagName.toLowerCase()) - ap.forEach.call(el.attributes, function (attr) { - svg.setAttribute(attr.name, attr.value) //复制属性 - })// jshint ignore:line - // 递归处理子节点 - enumerateNode(el, svg) - targetNode.appendChild(svg) - } + ap.forEach.call(el.attributes, function (attr) { + svg.setAttribute(attr.name, attr.value) //复制属性 + })// jshint ignore:line + // 递归处理子节点 + enumerateNode(el, svg) + targetNode.appendChild(svg) } } } - Object.defineProperties(SVGElement.prototype, { - "outerHTML": {//IE9-11,firefox不支持SVG元素的innerHTML,outerHTML属性 - enumerable: true, - configurable: true, - get: outerHTML, - set: function (html) { - var tagName = this.tagName.toLowerCase(), + } + Object.defineProperties(SVGElement.prototype, { + "outerHTML": {//IE9-11,firefox不支持SVG元素的innerHTML,outerHTML属性 + enumerable: true, + configurable: true, + get: outerHTML, + set: function (html) { + var tagName = this.tagName.toLowerCase(), par = this.parentNode, frag = avalon.parseHTML(html) - // 操作的svg，直接插入 - if (tagName === "svg") { - par.insertBefore(frag, this) - // svg节点的子节点类似 - } else { - var newFrag = DOC.createDocumentFragment() - enumerateNode(frag, newFrag) - par.insertBefore(newFrag, this) - } - par.removeChild(this) - } - }, - "innerHTML": { - enumerable: true, - configurable: true, - get: function () { - var s = this.outerHTML - var ropen = new RegExp("<" + this.nodeName + '\\b(?:(["\'])[^"]*?(\\1)|[^>])*>', "i") - var rclose = new RegExp("<\/" + this.nodeName + ">$", "i") - return s.replace(ropen, "").replace(rclose, "") - }, - set: function (html) { - if (avalon.clearHTML) { - avalon.clearHTML(this) - var frag = avalon.parseHTML(html) - enumerateNode(frag, this) - } + // 操作的svg，直接插入 + if (tagName === "svg") { + par.insertBefore(frag, this) + // svg节点的子节点类似 + } else { + var newFrag = DOC.createDocumentFragment() + enumerateNode(frag, newFrag) + par.insertBefore(newFrag, this) } + par.removeChild(this) } - }) - } - } - if (!root.outerHTML && window.HTMLElement) { //firefox 到11时才有outerHTML - HTMLElement.prototype.__defineGetter__("outerHTML", outerHTML); - } - -//============================= event binding ======================= - var rmouseEvent = /^(?:mouse|contextmenu|drag)|click/ - function fixEvent(event) { - var ret = {} - for (var i in event) { - ret[i] = event[i] - } - var target = ret.target = event.srcElement - if (event.type.indexOf("key") === 0) { - ret.which = event.charCode != null ? event.charCode : event.keyCode - } else if (rmouseEvent.test(event.type)) { - var doc = target.ownerDocument || DOC - var box = doc.compatMode === "BackCompat" ? doc.body : doc.documentElement - ret.pageX = event.clientX + (box.scrollLeft >> 0) - (box.clientLeft >> 0) - ret.pageY = event.clientY + (box.scrollTop >> 0) - (box.clientTop >> 0) - ret.wheelDeltaY = ret.wheelDelta - ret.wheelDeltaX = 0 - } - ret.timeStamp = new Date() - 0 - ret.originalEvent = event - ret.preventDefault = function () { //阻止默认行为 - event.returnValue = false - } - ret.stopPropagation = function () { //阻止事件在DOM树中的传播 - event.cancelBubble = true - } - return ret - } - - var eventHooks = avalon.eventHooks -//针对firefox, chrome修正mouseenter, mouseleave - if (!("onmouseenter" in root)) { - avalon.each({ - mouseenter: "mouseover", - mouseleave: "mouseout" - }, function (origType, fixType) { - eventHooks[origType] = { - type: fixType, - deel: function (elem, _, fn) { - return function (e) { - var t = e.relatedTarget - if (!t || (t !== elem && !(elem.compareDocumentPosition(t) & 16))) { - delete e.type - e.type = origType - return fn.call(elem, e) - } + }, + "innerHTML": { + enumerable: true, + configurable: true, + get: function () { + var s = this.outerHTML + var ropen = new RegExp("<" + this.nodeName + '\\b(?:(["\'])[^"]*?(\\1)|[^>])*>', "i") + var rclose = new RegExp("<\/" + this.nodeName + ">$", "i") + return s.replace(ropen, "").replace(rclose, "") + }, + set: function (html) { + if (avalon.clearHTML) { + avalon.clearHTML(this) + var frag = avalon.parseHTML(html) + enumerateNode(frag, this) } } } }) } -//针对IE9+, w3c修正animationend +} +if (!root.outerHTML && window.HTMLElement) { //firefox 到11时才有outerHTML + HTMLElement.prototype.__defineGetter__("outerHTML", outerHTML); +} + + +//============================= event binding ======================= +var rmouseEvent = /^(?:mouse|contextmenu|drag)|click/ +function fixEvent(event) { + var ret = {} + for (var i in event) { + ret[i] = event[i] + } + var target = ret.target = event.srcElement + if (event.type.indexOf("key") === 0) { + ret.which = event.charCode != null ? event.charCode : event.keyCode + } else if (rmouseEvent.test(event.type)) { + var doc = target.ownerDocument || DOC + var box = doc.compatMode === "BackCompat" ? doc.body : doc.documentElement + ret.pageX = event.clientX + (box.scrollLeft >> 0) - (box.clientLeft >> 0) + ret.pageY = event.clientY + (box.scrollTop >> 0) - (box.clientTop >> 0) + ret.wheelDeltaY = ret.wheelDelta + ret.wheelDeltaX = 0 + } + ret.timeStamp = new Date() - 0 + ret.originalEvent = event + ret.preventDefault = function () { //阻止默认行为 + event.returnValue = false + } + ret.stopPropagation = function () { //阻止事件在DOM树中的传播 + event.cancelBubble = true + } + return ret +} + +var eventHooks = avalon.eventHooks +//针对firefox, chrome修正mouseenter, mouseleave +if (!("onmouseenter" in root)) { avalon.each({ - AnimationEvent: "animationend", - WebKitAnimationEvent: "webkitAnimationEnd" - }, function (construct, fixType) { - if (window[construct] && !eventHooks.animationend) { - eventHooks.animationend = { - type: fixType - } - } - }) -//针对IE6-8修正input - if (!("oninput" in DOC.createElement("input"))) { - eventHooks.input = { - type: "propertychange", - deel: function (elem, _, fn) { + mouseenter: "mouseover", + mouseleave: "mouseout" + }, function (origType, fixType) { + eventHooks[origType] = { + type: fixType, + fn: function (elem, fn) { return function (e) { - if (e.propertyName === "value") { - e.type = "input" + var t = e.relatedTarget + if (!t || (t !== elem && !(elem.compareDocumentPosition(t) & 16))) { + delete e.type + e.type = origType return fn.call(elem, e) } } } } + }) +} +//针对IE9+, w3c修正animationend +avalon.each({ + AnimationEvent: "animationend", + WebKitAnimationEvent: "webkitAnimationEnd" +}, function (construct, fixType) { + if (window[construct] && !eventHooks.animationend) { + eventHooks.animationend = { + type: fixType + } } - if (DOC.onmousewheel === void 0) { - /* IE6-11 chrome mousewheel wheelDetla 下 -120 上 120 - firefox DOMMouseScroll detail 下3 上-3 - firefox wheel detlaY 下3 上-3 - IE9-11 wheel deltaY 下40 上-40 - chrome wheel deltaY 下100 上-100 */ - var fixWheelType = DOC.onwheel !== void 0 ? "wheel" : "DOMMouseScroll" - var fixWheelDelta = fixWheelType === "wheel" ? "deltaY" : "detail" - eventHooks.mousewheel = { - type: fixWheelType, - deel: function (elem, _, fn) { - return function (e) { - e.wheelDeltaY = e.wheelDelta = e[fixWheelDelta] > 0 ? -120 : 120 - e.wheelDeltaX = 0 - if (Object.defineProperty) { - Object.defineProperty(e, "type", { - value: "mousewheel" - }) - } - fn.call(elem, e) +}) +//针对IE6-8修正input +if (!("oninput" in DOC.createElement("input"))) { + eventHooks.input = { + type: "propertychange", + deel: function (elem, fn) { + return function (e) { + if (e.propertyName === "value") { + e.type = "input" + return fn.call(elem, e) } } } } - - - /********************************************************************* - * 配置系统 * - **********************************************************************/ - - function kernel(settings) { - for (var p in settings) { - if (!ohasOwn.call(settings, p)) - continue - var val = settings[p] - if (typeof kernel.plugins[p] === "function") { - kernel.plugins[p](val) - } else if (typeof kernel[p] === "object") { - avalon.mix(kernel[p], val) - } else { - kernel[p] = val - } - } - return this - } - var openTag, closeTag, rexpr, rexprg, rbind, rregexp = /[-.*+?^${}()|[\]\/\\]/g - - function escapeRegExp(target) { - //http://stevenlevithan.com/regex/xregexp/ - //将字符串安全格式化为正则表达式的源码 - return (target + "").replace(rregexp, "\\$&") - } - - var plugins = { - loader: function (builtin) { - var flag = innerRequire && builtin - window.require = flag ? innerRequire : otherRequire - window.define = flag ? innerRequire.define : otherDefine - }, - interpolate: function (array) { - openTag = array[0] - closeTag = array[1] - if (openTag === closeTag) { - throw new SyntaxError("openTag!==closeTag") - } else if (array + "" === "") { - kernel.commentInterpolate = true - } else { - var test = openTag + "test" + closeTag - cinerator.innerHTML = test - if (cinerator.innerHTML !== test && cinerator.innerHTML.indexOf("<") > -1) { - throw new SyntaxError("此定界符不合法") - } - cinerator.innerHTML = "" - } - var o = escapeRegExp(openTag), - c = escapeRegExp(closeTag) - rexpr = new RegExp(o + "(.*?)" + c) - rexprg = new RegExp(o + "(.*?)" + c, "g") - rbind = new RegExp(o + ".*?" + c + "|\\sms-") - } - } - - kernel.debug = true - kernel.plugins = plugins - kernel.plugins['interpolate'](["{{", "}}"]) - kernel.paths = {} - kernel.shim = {} - kernel.maxRepeatSize = 100 - avalon.config = kernel - var ravalon = /(\w+)\[(avalonctrl)="(\S+)"\]/ - var findNodes = DOC.querySelectorAll ? function(str) { - return DOC.querySelectorAll(str) - } : function(str) { - var match = str.match(ravalon) - var all = DOC.getElementsByTagName(match[1]) - var nodes = [] - for (var i = 0, el; el = all[i++]; ) { - if (el.getAttribute(match[2]) === match[3]) { - nodes.push(el) - } - } - return nodes - } - /********************************************************************* - * 事件总线 * - **********************************************************************/ - var EventBus = { - $watch: function (type, callback) { - if (typeof callback === "function") { - var callbacks = this.$events[type] - if (callbacks) { - callbacks.push(callback) - } else { - this.$events[type] = [callback] - } - } else { //重新开始监听此VM的第一重简单属性的变动 - this.$events = this.$watch.backup - } - return this - }, - $unwatch: function (type, callback) { - var n = arguments.length - if (n === 0) { //让此VM的所有$watch回调无效化 - this.$watch.backup = this.$events - this.$events = {} - } else if (n === 1) { - this.$events[type] = [] - } else { - var callbacks = this.$events[type] || [] - var i = callbacks.length - while (~--i < 0) { - if (callbacks[i] === callback) { - return callbacks.splice(i, 1) - } - } - } - return this - }, - $fire: function (type) { - var special, i, v, callback - if (/^(\w+)!(\S+)$/.test(type)) { - special = RegExp.$1 - type = RegExp.$2 - } - var events = this.$events - if (!events) - return - var args = aslice.call(arguments, 1) - var detail = [type].concat(args) - if (special === "all") { - for (i in avalon.vmodels) { - v = avalon.vmodels[i] - if (v !== this) { - v.$fire.apply(v, detail) - } - } - } else if (special === "up" || special === "down") { - var elements = events.expr ? findNodes(events.expr) : [] - if (elements.length === 0) - return - for (i in avalon.vmodels) { - v = avalon.vmodels[i] - if (v !== this) { - if (v.$events.expr) { - var eventNodes = findNodes(v.$events.expr) - if (eventNodes.length === 0) { - continue - } - //循环两个vmodel中的节点，查找匹配（向上匹配或者向下匹配）的节点并设置标识 - /* jshint ignore:start */ - ap.forEach.call(eventNodes, function (node) { - ap.forEach.call(elements, function (element) { - var ok = special === "down" ? element.contains(node) : //向下捕获 - node.contains(element) //向上冒泡 - if (ok) { - node._avalon = v //符合条件的加一个标识 - } - }); - }) - /* jshint ignore:end */ - } - } - } - var nodes = DOC.getElementsByTagName("*") //实现节点排序 - var alls = [] - ap.forEach.call(nodes, function (el) { - if (el._avalon) { - alls.push(el._avalon) - el._avalon = "" - el.removeAttribute("_avalon") - } - }) - if (special === "up") { - alls.reverse() - } - for (i = 0; callback = alls[i++]; ) { - if (callback.$fire.apply(callback, detail) === false) { - break - } - } - } else { - var callbacks = events[type] || [] - var all = events.$all || [] - for (i = 0; callback = callbacks[i++]; ) { - if (isFunction(callback)) - callback.apply(this, args) - } - for (i = 0; callback = all[i++]; ) { - if (isFunction(callback)) - callback.apply(this, arguments) +} +if (DOC.onmousewheel === void 0) { + /* IE6-11 chrome mousewheel wheelDetla 下 -120 上 120 + firefox DOMMouseScroll detail 下3 上-3 + firefox wheel detlaY 下3 上-3 + IE9-11 wheel deltaY 下40 上-40 + chrome wheel deltaY 下100 上-100 */ + var fixWheelType = DOC.onwheel !== void 0 ? "wheel" : "DOMMouseScroll" + var fixWheelDelta = fixWheelType === "wheel" ? "deltaY" : "detail" + eventHooks.mousewheel = { + type: fixWheelType, + fn: function (elem, fn) { + return function (e) { + e.wheelDeltaY = e.wheelDelta = e[fixWheelDelta] > 0 ? -120 : 120 + e.wheelDeltaX = 0 + if (Object.defineProperty) { + Object.defineProperty(e, "type", { + value: "mousewheel" + }) } + fn.call(elem, e) } } } +} - /********************************************************************* - * modelFactory * - **********************************************************************/ -//avalon最核心的方法的两个方法之一（另一个是avalon.scan），返回一个ViewModel(VM) - var VMODELS = avalon.vmodels = {} //所有vmodel都储存在这里 - avalon.define = function (id, factory) { - var $id = id.$id || id - if (!$id) { - log("warning: vm必须指定$id") - } - if (VMODELS[$id]) { - log("warning: " + $id + " 已经存在于avalon.vmodels中") - } - if (typeof id === "object") { - var model = modelFactory(id) + + +/********************************************************************* + * 配置系统 * + **********************************************************************/ + +function kernel(settings) { + for (var p in settings) { + if (!ohasOwn.call(settings, p)) + continue + var val = settings[p] + if (typeof kernel.plugins[p] === "function") { + kernel.plugins[p](val) + } else if (typeof kernel[p] === "object") { + avalon.mix(kernel[p], val) } else { - var scope = { - $watch: noop - } - factory(scope) //得到所有定义 - - model = modelFactory(scope) //偷天换日，将scope换为model - stopRepeatAssign = true - factory(model) - stopRepeatAssign = false + kernel[p] = val } - model.$id = $id - return VMODELS[$id] = model } + return this +} +var openTag, closeTag, rexpr, rexprg, rbind, rregexp = /[-.*+?^${}()|[\]\/\\]/g + +function escapeRegExp(target) { + //http://stevenlevithan.com/regex/xregexp/ + //将字符串安全格式化为正则表达式的源码 + return (target + "").replace(rregexp, "\\$&") +} + +var plugins = { + interpolate: function (array) { + openTag = array[0] + closeTag = array[1] + if (openTag === closeTag) { + throw new SyntaxError("openTag!==closeTag") + var test = openTag + "test" + closeTag + cinerator.innerHTML = test + if (cinerator.innerHTML !== test && cinerator.innerHTML.indexOf("<") > -1) { + throw new SyntaxError("此定界符不合法") + } + cinerator.innerHTML = "" + } + kernel.openTag = openTag + kernel.closeTag = closeTag + var o = escapeRegExp(openTag), + c = escapeRegExp(closeTag) + rexpr = new RegExp(o + "(.*?)" + c) + rexprg = new RegExp(o + "(.*?)" + c, "g") + rbind = new RegExp(o + ".*?" + c + "|\\sms-") + } +} +kernel.async =true +kernel.debug = true +kernel.plugins = plugins +kernel.plugins['interpolate'](["{{", "}}"]) +kernel.paths = {} +kernel.shim = {} +kernel.maxRepeatSize = 100 +avalon.config = kernel +function $watch(expr, binding) { + var $events = this.$events || (this.$events = {}) + var queue = $events[expr] || ($events[expr] = []) + if (typeof binding === "function") { + var backup = binding + backup.uniqueNumber = Math.random() + binding = { + element: root, + type: "user-watcher", + handler: noop, + vmodels: [this], + expr: expr, + uniqueNumber: backup.uniqueNumber + } + binding.wildcard = /\*/.test(expr) + } + + if (!binding.update) { + if (/\w\.*\B/.test(expr)) { + binding.getter = noop + var host = this + binding.update = function () { + var args = this.fireArgs || [] + if (args[2]) + binding.handler.apply(host, args) + delete this.fireArgs + } + queue.sync = true + avalon.Array.ensure(queue, binding) + } else { + avalon.injectBinding(binding) + } + if (backup) { + binding.handler = backup + } + } else if (!binding.oneTime) { + avalon.Array.ensure(queue, binding) + } + return function () { + binding.update = binding.getter = binding.handler = noop + binding.element = DOC.createElement("a") + } +} + +function $emit(key, args) { + var event = this.$events + if (event && event[key]) { + if (args) { + args[2] = key + } + notifySubscribers(event[key], args) + var parent = this.$up + if (parent) { + if (this.$pathname) { + $emit.call(parent, this.$pathname + "." + key, args)//以确切的值往上冒泡 + } + + $emit.call(parent, "*." + key, args)//以模糊的值往上冒泡 + } + } else { + parent = this.$up + if (parent) { + var path = this.$pathname + "." + key + var arr = path.split(".") + if (arr.indexOf("*") === -1) { + $emit.call(parent, path, args)//以确切的值往上冒泡 + arr[1] = "*" + $emit.call(parent, arr.join("."), args)//以确切的值往上冒泡 + } else { + $emit.call(parent, path, args)//以确切的值往上冒泡 + } + } + } +} + + +function collectDependency(el, key) { + do { + if (el.$watch) { + var e = el.$events || (el.$events = {}) + var array = e[key] || (e[key] = []) + dependencyDetection.collectDependency(array) + return + } + el = el.$up + if (el) { + key = el.$pathname + "." + key + } else { + break + } + + } while (true) +} + + +function notifySubscribers(subs, args) { + if (!subs) + return + if (new Date() - beginTime > 444 && typeof subs[0] === "object") { + rejectDisposeQueue() + } + var users = [], renders = [] + for (var i = 0, sub; sub = subs[i++]; ) { + if (sub.type === "user-watcher") { + users.push(sub) + } else { + renders.push(sub) + } + + } + if (kernel.async) { + buffer.render()//1 + for (i = 0; sub = renders[i++]; ) { + if (sub.update) { + var uuid = getUid(sub) + if (!buffer.queue[uuid]) { + buffer.queue[uuid] = 1 + buffer.queue.push(sub) + } + } + } + } else { + for (i = 0; sub = renders[i++]; ) { + if (sub.update) { + sub.update()//最小化刷新DOM树 + } + } + } + for (i = 0; sub = users[i++]; ) { + if (args && args[2] === sub.expr || sub.wildcard) { + sub.fireArgs = args + } + sub.update() + } +} +//avalon最核心的方法的两个方法之一（另一个是avalon.scan），返回一个ViewModel(VM) +var VMODELS = avalon.vmodels = {} //所有vmodel都储存在这里 +avalon.define = function (source) { + var $id = source.$id + if (!$id) { + log("warning: vm必须指定$id") + } + var vmodel = modelFactory(source) + vmodel.$id = $id + return VMODELS[$id] = vmodel +} //一些不需要被监听的属性 - var $$skipArray = String("$id,$watch,$unwatch,$fire,$events,$model,$skipArray,$proxy,$compute").match(rword) - var defineProperty = Object.defineProperty - var canHideOwn = true +var $$skipArray = oneObject("$id,$watch,$fire,$events,$model,$skipArray,$active,$pathname,$up,$track,$accessors") +var defineProperty = Object.defineProperty +var canHideOwn = true //如果浏览器不支持ecma262v5的Object.defineProperties或者存在BUG，比如IE8 //标准浏览器使用__defineGetter__, __defineSetter__实现 - try { - defineProperty({}, "_", { - value: "x" - }) - var defineProperties = Object.defineProperties - } catch (e) { - canHideOwn = false +try { + defineProperty({}, "_", { + value: "x" + }) + var defineProperties = Object.defineProperties +} catch (e) { + canHideOwn = false +} + +function modelFactory(source, options) { + options = options || {} + options.watch = true + return observeObject(source, options) +} + +//监听对象属性值的变化(注意,数组元素不是数组的属性),通过对劫持当前对象的访问器实现 +//监听对象或数组的结构变化, 对对象的键值对进行增删重排, 或对数组的进行增删重排,都属于这范畴 +// 通过比较前后代理VM顺序实现 +function Component() { +} + +function observeObject(source, options) { + if (!source || (source.$id && source.$accessors)) { + return source } - - function modelFactory(source, $special, $model) { - if (Array.isArray(source)) { - var arr = source.concat() - source.length = 0 - var collection = arrayFactory(source) - collection.pushArray(arr) - return collection - } - //0 null undefined || Node || VModel(fix IE6-8 createWithProxy $val: val引发的BUG) - if (!source || source.nodeType > 0 || (source.$id && source.$events)) { - return source - } - var $skipArray = Array.isArray(source.$skipArray) ? source.$skipArray : [] - $skipArray.$special = $special || {} //强制要监听的属性 - var $vmodel = {} //要返回的对象, 它在IE6-8下可能被偷龙转凤 - $model = $model || {} //vmodels.$model属性 - var $events = {} //vmodel.$events属性 - var accessors = {} //监控属性 - var computed = [] - $$skipArray.forEach(function (name) { - delete source[name] - }) - - for (var i in source) { - (function (name, val, accessor) { - $model[name] = val - if (!isObservable(name, val, $skipArray)) { - return //过滤所有非监控属性 - } - //总共产生三种accessor - $events[name] = [] - var valueType = avalon.type(val) - //总共产生三种accessor - if (valueType === "object" && isFunction(val.get) && Object.keys(val).length <= 2) { - accessor = makeComputedAccessor(name, val) - computed.push(accessor) - } else if (rcomplexType.test(valueType)) { - accessor = makeComplexAccessor(name, val, valueType, $events[name]) - } else { - accessor = makeSimpleAccessor(name, val) - } - accessors[name] = accessor - })(i, source[i])// jshint ignore:line - } - - $vmodel = defineProperties($vmodel, descriptorFactory(accessors), source) //生成一个空的ViewModel - for (var name in source) { - if (!accessors[name]) { - $vmodel[name] = source[name] - } - } - //添加$id, $model, $events, $watch, $unwatch, $fire - $vmodel.$id = generateID() - $vmodel.$model = $model - $vmodel.$events = $events - for (i in EventBus) { - var fn = EventBus[i] - if (!W3C) { //在IE6-8下，VB对象的方法里的this并不指向自身，需要用bind处理一下 - fn = fn.bind($vmodel) - } - $vmodel[i] = fn - } - if (canHideOwn) { - Object.defineProperty($vmodel, "hasOwnProperty", { - value: function (name) { - return name in this.$model - }, - writable: false, - enumerable: false, - configurable: true - }) - - } else { - /* jshint ignore:start */ - $vmodel.hasOwnProperty = function (name) { - return name in $vmodel.$model - } - /* jshint ignore:end */ - } - - $vmodel.$compute = function () { - computed.forEach(function (accessor) { - dependencyDetection.begin({ - callback: function (vm, dependency) {//dependency为一个accessor - var name = dependency._name - if (dependency !== accessor) { - var list = vm.$events[name] - accessor.vm = $vmodel - injectDependency(list, accessor.digest) - } - } - }) - try { - accessor.get.call($vmodel) - } finally { - dependencyDetection.end() - } - }) - } - $vmodel.$compute() - return $vmodel + //source为原对象,不能是元素节点或null + //options,可选,配置对象,里面有old, force, watch这三个属性 + options = options || nullObject + var force = options.force || nullObject + var old = options.old + var oldAccessors = old && old.$accessors || nullObject + var $vmodel = new Component() //要返回的对象, 它在IE6-8下可能被偷龙转凤 + var accessors = {} //监控属性 + var hasOwn = {} + var skip = [] + var simple = [] + var $skipArray = {} + if (source.$skipArray) { + $skipArray = oneObject(source.$skipArray) + delete source.$skipArray } -//创建一个简单访问器 - function makeSimpleAccessor(name, value) { - function accessor(value) { - var oldValue = accessor._value - if (arguments.length > 0) { - if (!stopRepeatAssign && !isEqual(value, oldValue)) { - accessor.updateValue(this, value) - accessor.notify(this, value, oldValue) - } - return this - } else { - dependencyDetection.collectDependency(this, accessor) - return oldValue - } - } - accessorFactory(accessor, name) - accessor._value = value - return accessor; - } - -//创建一个计算访问器 - function makeComputedAccessor(name, options) { - options.set = options.set || noop - function accessor(value) {//计算属性 - var oldValue = accessor._value - var init = "_value" in accessor - if (arguments.length > 0) { - if (stopRepeatAssign) { - return this - } - accessor.set.call(this, value) - return this - } else { - //将依赖于自己的高层访问器或视图刷新函数（以绑定对象形式）放到自己的订阅数组中 - value = accessor.get.call(this) - if (oldValue !== value) { - accessor.updateValue(this, value) - init && accessor.notify(this, value, oldValue) //触发$watch回调 - } - //将自己注入到低层访问器的订阅数组中 - return value - } - } - accessor.set = options.set || noop - accessor.get = options.get - accessorFactory(accessor, name) - var id - accessor.digest = function () { - accessor.updateValue = globalUpdateModelValue - accessor.notify = noop - accessor.call(accessor.vm) - clearTimeout(id)//如果计算属性存在多个依赖项，那么等它们都更新了才更新视图 - id = setTimeout(function () { - accessorFactory(accessor, accessor._name) - accessor.call(accessor.vm) - }) - } - return accessor - } - -//创建一个复杂访问器 - function makeComplexAccessor(name, initValue, valueType, list) { - function accessor(value) { - var oldValue = accessor._value - var son = accessor._vmodel - if (arguments.length > 0) { - if (stopRepeatAssign) { - return this - } - if (valueType === "array") { - var old = son._ - son._ = [] - son.clear() - son._ = old - son.pushArray(value) - } else if (valueType === "object") { - var $proxy = son.$proxy - var observes = this.$events[name] || [] - son = accessor._vmodel = modelFactory(value) - son.$events[subscribers] = observes - son.$proxy = $proxy - if (observes.length) { - observes.forEach(function (el) { - var fn = bindingHandlers[el.type] - if (fn) { //#753 - el.rollback && el.rollback() //还原 ms-with ms-on - fn(el, el.vmodels) + //处理计算属性 + var computed = source.$computed + if (computed) { + delete source.$computed + for (var name in computed) { + hasOwn[name] = true; + (function (key, value) { + var old + accessors[key] = { + get: function () { + return old = value.get.call(this) + }, + set: function (x) { + if (typeof value.set === "function") { + var older = old + value.set.call(this, x) + var newer = this[key] + if (this.$fire && (newer !== older)) { + this.$fire(key, newer, older) } - }) + } + }, + enumerable: true, + configurable: true + } + })(name, computed[name])// jshint ignore:line + } + } + + + for (name in source) { + var value = source[name] + if (!$$skipArray[name]) + hasOwn[name] = true + if (typeof value === "function" || (value && value.nodeType) || + (!force[name] && (name.charAt(0) === "$" || $$skipArray[name] || $skipArray[name]))) { + skip.push(name) + } else if (isComputed(value)) { + log("warning:计算属性建议放在$computed对象中统一定义"); + (function (key, value) { + var old + accessors[key] = { + get: function () { + return old = value.get.call(this) + }, + set: function (x) { + if (typeof value.set === "function") { + var older = old + value.set.call(this, x) + var newer = this[key] + if (this.$fire && (newer !== older)) { + this.$fire(key, newer, older) + } + } + }, + enumerable: true, + configurable: true + } + })(name, value)// jshint ignore:line + } else { + simple.push(name) + if (oldAccessors[name]) { + accessors[name] = oldAccessors[name] + } else { + accessors[name] = makeGetSet(name, value) + } + } + } + + + accessors["$model"] = $modelDescriptor + $vmodel = defineProperties($vmodel, accessors, source) + function trackBy(name) { + return hasOwn[name] === true + } + skip.forEach(function (name) { + $vmodel[name] = source[name] + }) + + /* jshint ignore:start */ + hideProperty($vmodel, "$id", "anonymous") + hideProperty($vmodel, "$up", old ? old.$up : null) + hideProperty($vmodel, "$track", Object.keys(hasOwn)) + hideProperty($vmodel, "$active", false) + hideProperty($vmodel, "$pathname", old ? old.$pathname : "") + hideProperty($vmodel, "$accessors", accessors) + hideProperty($vmodel, "hasOwnProperty", trackBy) + if (options.watch) { + hideProperty($vmodel, "$watch", function () { + return $watch.apply($vmodel, arguments) + }) + hideProperty($vmodel, "$fire", function (path, a) { + if(path.indexOf("all!") === 0 ){ + var ee = path.slice(4) + for(var i in avalon.vmodels){ + var v = avalon.vmodels[i] + v.$fire && v.$fire.apply(v, [ee, a]) + } + }else{ + $emit.call($vmodel, path, [a]) + } + }) + } + /* jshint ignore:end */ + + //必须设置了$active,$events + simple.forEach(function (name) { + var val = $vmodel[name] = source[name] + if (val && typeof val === "object") { + val.$up = $vmodel + val.$pathname = name + } + $emit.call($vmodel, name) + }) + for (name in computed) { + value = $vmodel[name] + } + $vmodel.$active = true + return $vmodel +} +/* + 新的VM拥有如下私有属性 + $id: vm.id + $events: 放置$watch回调与绑定对象 + $watch: 增强版$watch + $fire: 触发$watch回调 + $track:一个数组,里面包含用户定义的所有键名 + $active:boolean,false时防止依赖收集 + $model:返回一个纯净的JS对象 + $accessors:放置所有读写器的数据描述对象 + $up:返回其上级对象 + $pathname:返回此对象在上级对象的名字,注意,数组元素的$pathname为空字符串 + ============================= + $skipArray:用于指定不可监听的属性,但VM生成是没有此属性的 + */ +function isComputed(val) {//speed up! + if (val && typeof val === "object") { + for (var i in val) { + if (i !== "get" && i !== "set") { + return false + } + } + return typeof val.get === "function" + } +} +function makeGetSet(key, value) { + var childVm + value = NaN + return { + get: function () { + if (this.$active) { + collectDependency(this, key) + } + return value + }, + set: function (newVal) { + if (value === newVal) + return + var oldValue = value + childVm = observe(newVal, value) + if (childVm) { + value = childVm + } else { + childVm = void 0 + value = newVal + } + + if (Object(childVm) === childVm) { + childVm.$pathname = key + childVm.$up = this + } + if (this.$active) { + $emit.call(this, key, [value, oldValue]) + } + }, + enumerable: true, + configurable: true + } +} + +function observe(obj, old, hasReturn, watch) { + if (Array.isArray(obj)) { + return observeArray(obj, old, watch) + } else if (avalon.isPlainObject(obj)) { + if (old) { + var keys = getKeys(obj) + var keys2 = getKeys(old) + if (keys.join(";") === keys2.join(";")) { + for (var i in obj) { + if (obj.hasOwnProperty(i)) { + old[i] = obj[i] } } - accessor.updateValue(this, son.$model) - accessor.notify(this, this._value, oldValue) - return this - } else { - dependencyDetection.collectDependency(this, accessor) - return son + return old } + old.$active = false } - accessorFactory(accessor, name) - var son = accessor._vmodel = modelFactory(initValue) - son.$events[subscribers] = list - return accessor + return observeObject(obj, { + old: old, + watch: watch + }) } - - function globalUpdateValue(vmodel, value) { - vmodel.$model[this._name] = this._value = value + if (hasReturn) { + return obj } - function globalUpdateModelValue(vmodel, value) { - vmodel.$model[this._name] = value - } - function globalNotify(vmodel, value, oldValue) { - var name = this._name - var array = vmodel.$events[name] //刷新值 - if (array) { - fireDependencies(array) //同步视图 - EventBus.$fire.call(vmodel, name, value, oldValue) //触发$watch回调 +} +var getKeys = rnative.test(Object.key) ? Object.key : function (a) { + var ret = [] + for (var i in a) { + if (a.hasOwnProperty(i) && !$$skipArray[i]) { + ret.push(i) } } + return ret +} +function observeArray(array, old, watch) { + if (old) { + var args = [0, old.length].concat(array) + old.splice.apply(old, args) + return old + } else { + for (var i in newProto) { + array[i] = newProto[i] + } - function accessorFactory(accessor, name) { - accessor._name = name - //同时更新_value与model - accessor.updateValue = globalUpdateValue - accessor.notify = globalNotify - } + hideProperty(array, "$up", null) + hideProperty(array, "$pathname", "") + hideProperty(array, "$track", createTrack(array.length)) -//比较两个值是否相等 - var isEqual = Object.is || function (v1, v2) { - if (v1 === 0 && v2 === 0) { - return 1 / v1 === 1 / v2 - } else if (v1 !== v1) { - return v2 !== v2 - } else { - return v1 === v2 + array._ = observeObject({ + length: NaN + }, { + watch: true + }) + array._.length = array.length + array._.$watch("length", function (a, b) { + $emit.call(array.$up, array.$pathname + ".length", [a, b]) + }) + if (watch) { + hideProperty(array, "$watch", function () { + return $watch.apply(array, arguments) + }) + } + + if (W3C) { + Object.defineProperty(array, "$model", $modelDescriptor) + } else { + array.$model = toJson(array) + } + for (var j = 0, n = array.length; j < n; j++) { + var el = array[j] = observe(array[j], 0, 1, 1) + if (Object(el) === el) {//#1077 + el.$up = array } } - function isObservable(name, value, $skipArray) { - if (isFunction(value) || value && value.nodeType) { - return false - } - if ($skipArray.indexOf(name) !== -1) { - return false - } - var $special = $skipArray.$special - if (name && name.charAt(0) === "$" && !$special[name]) { - return false - } - return true + return array } +} - var descriptorFactory = W3C ? function (obj) { - var descriptors = {} - for (var i in obj) { - descriptors[i] = { - get: obj[i], - set: obj[i], - enumerable: true, - configurable: true +function hideProperty(host, name, value) { + if (canHideOwn) { + Object.defineProperty(host, name, { + value: value, + writable: true, + enumerable: false, + configurable: true + }) + } else { + host[name] = value + } +} + +function toJson(val) { + var xtype = avalon.type(val) + if (xtype === "array") { + var array = [] + for (var i = 0; i < val.length; i++) { + array[i] = toJson(val[i]) + } + return array + } else if (xtype === "object") { + var obj = {} + for (i in val) { + if(i === "__proxy__" || i === "__data__" || i === "__const__") + continue + if (val.hasOwnProperty(i)) { + var value = val[i] + obj[i] = value && value.nodeType ? value :toJson(value) } } - return descriptors - } : function (a) { - return a + return obj } + return val +} + +var $modelDescriptor = { + get: function () { + return toJson(this) + }, + set: noop, + enumerable: false, + configurable: true +} //===================修复浏览器对Object.defineProperties的支持================= - if (!canHideOwn) { - if ("__defineGetter__" in avalon) { - defineProperty = function (obj, prop, desc) { - if ('value' in desc) { - obj[prop] = desc.value - } - if ("get" in desc) { - obj.__defineGetter__(prop, desc.get) - } - if ('set' in desc) { - obj.__defineSetter__(prop, desc.set) - } - return obj +if (!canHideOwn) { + if ("__defineGetter__" in avalon) { + defineProperty = function (obj, prop, desc) { + if ('value' in desc) { + obj[prop] = desc.value } - defineProperties = function (obj, descs) { - for (var prop in descs) { - if (descs.hasOwnProperty(prop)) { - defineProperty(obj, prop, descs[prop]) - } + if ("get" in desc) { + obj.__defineGetter__(prop, desc.get) + } + if ('set' in desc) { + obj.__defineSetter__(prop, desc.set) + } + return obj + } + defineProperties = function (obj, descs) { + for (var prop in descs) { + if (descs.hasOwnProperty(prop)) { + defineProperty(obj, prop, descs[prop]) } - return obj + } + return obj + } + } + if (IEVersion) { + var VBClassPool = {} + window.execScript([// jshint ignore:line + "Function parseVB(code)", + "\tExecuteGlobal(code)", + "End Function" //转换一段文本为VB代码 + ].join("\n"), "VBScript") + function VBMediator(instance, accessors, name, value) {// jshint ignore:line + var accessor = accessors[name] + if (arguments.length === 4) { + accessor.set.call(instance, value) + } else { + return accessor.get.call(instance) } } - if (IEVersion) { - var VBClassPool = {} - window.execScript([// jshint ignore:line - "Function parseVB(code)", - "\tExecuteGlobal(code)", - "End Function" //转换一段文本为VB代码 - ].join("\n"), "VBScript") - function VBMediator(instance, accessors, name, value) {// jshint ignore:line - var accessor = accessors[name] - if (arguments.length === 4) { - accessor.call(instance, value) - } else { - return accessor.call(instance) - } - } - defineProperties = function (name, accessors, properties) { - // jshint ignore:line - var buffer = [] - buffer.push( + defineProperties = function (name, accessors, properties) { + // jshint ignore:line + var buffer = [] + buffer.push( "\r\n\tPrivate [__data__], [__proxy__]", - "\tPublic Default Function [__const__](d, p)", - "\t\tSet [__data__] = d: set [__proxy__] = p", + "\tPublic Default Function [__const__](d" + expose + ", p" + expose + ")", + "\t\tSet [__data__] = d" + expose + ": set [__proxy__] = p" + expose, "\t\tSet [__const__] = Me", //链式调用 "\tEnd Function") - //添加普通属性,因为VBScript对象不能像JS那样随意增删属性，必须在这里预先定义好 - for (name in properties) { - if (!accessors.hasOwnProperty(name)) { - buffer.push("\tPublic [" + name + "]") - } - } - $$skipArray.forEach(function (name) { - if (!accessors.hasOwnProperty(name)) { - buffer.push("\tPublic [" + name + "]") - } - }) - buffer.push("\tPublic [" + 'hasOwnProperty' + "]") - //添加访问器属性 - for (name in accessors) { - buffer.push( + //添加普通属性,因为VBScript对象不能像JS那样随意增删属性，必须在这里预先定义好 + var uniq = {} + + //添加访问器属性 + for (name in accessors) { + uniq[name] = true + buffer.push( //由于不知对方会传入什么,因此set, let都用上 "\tPublic Property Let [" + name + "](val" + expose + ")", //setter "\t\tCall [__proxy__](Me,[__data__], \"" + name + "\", val" + expose + ")", @@ -1476,698 +1509,614 @@ "\tOn Error Goto 0", "\tEnd Property") - } - - buffer.push("End Class") - var body = buffer.join("\r\n") - var className =VBClassPool[body] - if (!className) { - className = generateID("VBClass") - window.parseVB("Class " + className + body) - window.parseVB([ - "Function " + className + "Factory(a, b)", //创建实例并传入两个关键的参数 - "\tDim o", - "\tSet o = (New " + className + ")(a, b)", - "\tSet " + className + "Factory = o", - "End Function" - ].join("\r\n")) - VBClassPool[body] = className - } - var ret = window[className + "Factory"](accessors, VBMediator) //得到其产品 - return ret //得到其产品 } + for (name in properties) { + if (uniq[name] !== true) { + uniq[name] = true + buffer.push("\tPublic [" + name + "]") + } + } + for (name in $$skipArray) { + if (uniq[name] !== true) { + uniq[name] = true + buffer.push("\tPublic [" + name + "]") + } + } + buffer.push("\tPublic [" + 'hasOwnProperty' + "]") + buffer.push("End Class") + var body = buffer.join("\r\n") + var className = VBClassPool[body] + if (!className) { + className = generateID("VBClass") + window.parseVB("Class " + className + body) + window.parseVB([ + "Function " + className + "Factory(a, b)", //创建实例并传入两个关键的参数 + "\tDim o", + "\tSet o = (New " + className + ")(a, b)", + "\tSet " + className + "Factory = o", + "End Function" + ].join("\r\n")) + VBClassPool[body] = className + } + var ret = window[className + "Factory"](accessors, VBMediator) //得到其产品 + return ret //得到其产品 } } +} - /********************************************************************* - * 监控数组（与ms-each, ms-repeat配合使用） * - **********************************************************************/ +/********************************************************************* + * 监控数组（与ms-each, ms-repeat配合使用） * + **********************************************************************/ - function arrayFactory(model) { - var array = [] - array.$id = generateID() - array.$model = model //数据模型 - array.$events = {} - array.$events[subscribers] = [] - array._ = modelFactory({ - length: model.length - }) - array._.$watch("length", function (a, b) { - array.$fire("length", a, b) - }) - for (var i in EventBus) { - array[i] = EventBus[i] +var arrayMethods = ['push', 'pop', 'shift', 'unshift', 'splice'] +var arrayProto = Array.prototype +var newProto = { + notify: function () { + $emit.call(this.$up, this.$pathname) + }, + set: function (index, val) { + if (((index >>> 0) === index) && this[index] !== val) { + if (index > this.length) { + throw Error(index + "set方法的第一个参数不能大于原数组长度") + } + $emit.call(this.$up, this.$pathname + ".*", [val, this[index]]) + this.splice(index, 1, val) } - array.$map = { - el: 1 + }, + contains: function (el) { //判定是否包含 + return this.indexOf(el) !== -1 + }, + ensure: function (el) { + if (!this.contains(el)) { //只有不存在才push + this.push(el) } - array.$proxy = [] - avalon.mix(array, arrayPrototype) - return array - } + return this + }, + pushArray: function (arr) { + return this.push.apply(this, arr) + }, + remove: function (el) { //移除第一个等于给定值的元素 + return this.removeAt(this.indexOf(el)) + }, + removeAt: function (index) { //移除指定索引上的元素 + if ((index >>> 0) === index) { + return this.splice(index, 1) + } + return [] + }, + size: function () { //取得数组长度，这个函数可以同步视图，length不能 + return this._.length + }, + removeAll: function (all) { //移除N个元素 + if (Array.isArray(all)) { + for (var i = this.length - 1; i >= 0; i--) { + if (all.indexOf(this[i]) !== -1) { + _splice.call(this.$track, i, 1) + _splice.call(this, i, 1) - function mutateArray(method, pos, n, index, method2, pos2, n2) { - var oldLen = this.length, loop = 2 - while (--loop) { - switch (method) { - case "add": - /* jshint ignore:start */ - var m = pos + n - var array = this.$model.slice(pos, m).map(function (el) { - if (rcomplexType.test(avalon.type(el))) {//转换为VM - return el.$id ? el : modelFactory(el, 0, el) - } else { - return el - } - }) - _splice.apply(this, [pos, 0].concat(array)) - /* jshint ignore:end */ - for (var i = pos; i < m; i++) {//生成代理VM - var proxy = eachProxyAgent(i, this) - this.$proxy.splice(i, 0, proxy) - } - this._fire("add", pos, n) - break - case "del": - var ret = this._splice(pos, n) - var removed = this.$proxy.splice(pos, n) //回收代理VM - eachProxyRecycler(removed, "each") - this._fire("del", pos, n) - break - } - if (method2) { - method = method2 - pos = pos2 - n = n2 - loop = 2 - method2 = 0 - } - } - resetIndex(this.$proxy, index) - if (this.length !== oldLen) { - this._.length = this.length - } - return ret - } - - var _splice = ap.splice - var arrayPrototype = { - _splice: _splice, - _fire: function (method, a, b) { - fireDependencies(this.$events[subscribers], method, a, b) - }, - size: function () { //取得数组长度，这个函数可以同步视图，length不能 - return this._.length - }, - pushArray: function (array) { - var m = array.length, n = this.length - if (m) { - ap.push.apply(this.$model, array) - mutateArray.call(this, "add", n, m, Math.max(0, n - 1)) - } - return m + n - }, - push: function () { - //http://jsperf.com/closure-with-arguments - var array = [] - var i, n = arguments.length - for (i = 0; i < n; i++) { - array[i] = arguments[i] - } - return this.pushArray(array) - }, - unshift: function () { - var m = arguments.length, n = this.length - if (m) { - ap.unshift.apply(this.$model, arguments) - mutateArray.call(this, "add", 0, m, 0) - } - return m + n //IE67的unshift不会返回长度 - }, - shift: function () { - if (this.length) { - var el = this.$model.shift() - mutateArray.call(this, "del", 0, 1, 0) - return el //返回被移除的元素 - } - }, - pop: function () { - var n = this.length - if (n) { - var el = this.$model.pop() - mutateArray.call(this, "del", n - 1, 1, Math.max(0, n - 2)) - return el //返回被移除的元素 - } - }, - splice: function (start) { - var m = arguments.length, args = [], change - var removed = _splice.apply(this.$model, arguments) - if (removed.length) { //如果用户删掉了元素 - args.push("del", start, removed.length, 0) - change = true - } - if (m > 2) { //如果用户添加了元素 - if (change) { - args.splice(3, 1, 0, "add", start, m - 2) - } else { - args.push("add", start, m - 2, 0) } - change = true } - if (change) { //返回被移除的元素 - return mutateArray.apply(this, args) + } else if (typeof all === "function") { + for (i = this.length - 1; i >= 0; i--) { + var el = this[i] + if (all(el, i)) { + _splice.call(this.$track, i, 1) + _splice.call(this, i, 1) + + } + } + } else { + _splice.call(this.$track, 0, this.length) + _splice.call(this, 0, this.length) + + } + if (!W3C) { + this.$model = toJson(this) + } + this.notify() + this._.length = this.length + }, + clear: function () { + return this.removeAll() + } +} +var _splice = arrayProto.splice +arrayMethods.forEach(function (method) { + var original = arrayProto[method] + newProto[method] = function () { + // 继续尝试劫持数组元素的属性 + var args = [] + for (var i = 0, n = arguments.length; i < n; i++) { + args[i] = observe(arguments[i], 0, 1, 1) + } + var result = original.apply(this, args) + addTrack(this.$track, method, args) + if (!W3C) { + this.$model = toJson(this) + } + this.notify() + this._.length = this.length + return result + } +}) + +"sort,reverse".replace(rword, function (method) { + newProto[method] = function () { + var oldArray = this.concat() //保持原来状态的旧数组 + var newArray = this + var mask = Math.random() + var indexes = [] + var hasSort = false + arrayProto[method].apply(newArray, arguments) //排序 + for (var i = 0, n = oldArray.length; i < n; i++) { + var neo = newArray[i] + var old = oldArray[i] + if (neo === old) { + indexes.push(i) } else { - return [] + var index = oldArray.indexOf(neo) + indexes.push(index)//得到新数组的每个元素在旧数组对应的位置 + oldArray[index] = mask //屏蔽已经找过的元素 + hasSort = true } - }, - contains: function (el) { //判定是否包含 - return this.indexOf(el) !== -1 - }, - remove: function (el) { //移除第一个等于给定值的元素 - return this.removeAt(this.indexOf(el)) - }, - removeAt: function (index) { //移除指定索引上的元素 - if (index >= 0) { - this.$model.splice(index, 1) - return mutateArray.call(this, "del", index, 1, 0) + } + if (hasSort) { + sortByIndex(this.$track, indexes) + if (!W3C) { + this.$model = toJson(this) } - return [] - }, - clear: function () { - eachProxyRecycler(this.$proxy, "each") - this.$model.length = this.$proxy.length = this.length = this._.length = 0 //清空数组 - this._fire("clear", 0) - return this - }, - removeAll: function (all) { //移除N个元素 - if (Array.isArray(all)) { - for (var i = this.length - 1; i >= 0; i--) { - if (all.indexOf(this[i]) !== -1) { - this.removeAt(i) - } - } - } else if (typeof all === "function") { - for (i = this.length - 1; i >= 0; i--) { - if (all(this[i], i)) { - this.removeAt(i) - } - } - } else { - this.clear() - } - }, - ensure: function (el) { - if (!this.contains(el)) { //只有不存在才push - this.push(el) - } - return this - }, - set: function (index, val) { - if (index >= 0) { - var valueType = avalon.type(val) - if (val && val.$model) { - val = val.$model - } - var target = this[index] - if (valueType === "object") { - for (var i in val) { - if (target.hasOwnProperty(i)) { - target[i] = val[i] - } - } - } else if (valueType === "array") { - target.clear().push.apply(target, val) - } else if (target !== val) { - this[index] = val - this.$model[index] = val - var proxy = this.$proxy[index] - if (proxy) { - fireDependencies(proxy.$events.$index) - } - } - } - return this + this.notify() + } + return this + } +}) + +function sortByIndex(array, indexes) { + var map = {}; + for (var i = 0, n = indexes.length; i < n; i++) { + map[i] = array[i] + var j = indexes[i] + if (j in map) { + array[i] = map[j] + delete map[j] + } else { + array[i] = array[j] } } -//相当于原来bindingExecutors.repeat 的index分支 - function resetIndex(array, pos) { - var last = array.length - 1 - for (var el; el = array[pos]; pos++) { - el.$index = pos - el.$first = pos === 0 - el.$last = pos === last - } +} + +function createTrack(n) { + var ret = [] + for (var i = 0; i < n; i++) { + ret[i] = generateID("$proxy$each") } + return ret +} - function sortByIndex(array, indexes) { - var map = {}; - for (var i = 0, n = indexes.length; i < n; i++) { - map[i] = array[i] // preserve - var j = indexes[i] - if (j in map) { - array[i] = map[j] - delete map[j] - } else { - array[i] = array[j] +function addTrack(track, method, args) { + switch (method) { + case 'push': + case 'unshift': + args = createTrack(args.length) + break + case 'splice': + if (args.length > 2) { + // 0, 5, a, b, c --> 0, 2, 0 + // 0, 5, a, b, c, d, e, f, g--> 0, 0, 3 + var del = args[1] + var add = args.length - 2 + // args = [args[0], Math.max(del - add, 0)].concat(createTrack(Math.max(add - del, 0))) + args = [args[0], args[1]].concat(createTrack(args.length - 2)) } - } + break } - - "sort,reverse".replace(rword, function (method) { - arrayPrototype[method] = function () { - var newArray = this.$model//这是要排序的新数组 - var oldArray = newArray.concat() //保持原来状态的旧数组 - var mask = Math.random() - var indexes = [] - var hasSort - ap[method].apply(newArray, arguments) //排序 - for (var i = 0, n = oldArray.length; i < n; i++) { - var neo = newArray[i] - var old = oldArray[i] - if (isEqual(neo, old)) { - indexes.push(i) - } else { - var index = oldArray.indexOf(neo) - indexes.push(index)//得到新数组的每个元素在旧数组对应的位置 - oldArray[index] = mask //屏蔽已经找过的元素 - hasSort = true - } - } - if (hasSort) { - sortByIndex(this, indexes) - sortByIndex(this.$proxy, indexes) - this._fire("move", indexes) - resetIndex(this.$proxy, 0) - } - return this - } - }) - - var eachProxyPool = [] - - function eachProxyFactory() { - var source = { - $index: NaN, - $first: NaN, - $last: NaN, - $map: {}, - $host: {}, - $outer: {}, - $remove: avalon.noop, - el: { - get: function () { - //avalon1.4.4中，计算属性的订阅数组不再添加绑定对象 - return this.$host[this.$index] - }, - set: function (val) { - this.$host.set(this.$index, val) - } - } - } - - var second = { - $last: 1, - $first: 1, - $index: 1 - } - var proxy = modelFactory(source, second) - proxy.$id = generateID("$proxy$each") - return proxy - } - - function eachProxyAgent(index, host) { - var proxy = eachProxyPool.shift() - if (!proxy) { - proxy = eachProxyFactory( ) - }else{ - proxy.$compute() - } - var last = host.length - 1 - proxy.$host = host - proxy.$index = index - proxy.$first = index === 0 - proxy.$last = index === last - proxy.$map = host.$map - proxy.$remove = function () { - return host.removeAt(proxy.$index) - } - return proxy - } - - /********************************************************************* - * 依赖调度系统 * - **********************************************************************/ + Array.prototype[method].apply(track, args) +} +/********************************************************************* + * 依赖调度系统 * + **********************************************************************/ //检测两个对象间的依赖关系 - var dependencyDetection = (function () { - var outerFrames = [] - var currentFrame - return { - begin: function (accessorObject) { - //accessorObject为一个拥有callback的对象 - outerFrames.push(currentFrame) - currentFrame = accessorObject - }, - end: function () { - currentFrame = outerFrames.pop() - }, - collectDependency: function (vmodel, accessor) { - if (currentFrame) { - //被dependencyDetection.begin调用 - currentFrame.callback(vmodel, accessor); - } +var dependencyDetection = (function () { + var outerFrames = [] + var currentFrame + return { + begin: function (binding) { + //accessorObject为一个拥有callback的对象 + outerFrames.push(currentFrame) + currentFrame = binding + }, + end: function () { + currentFrame = outerFrames.pop() + }, + collectDependency: function (array) { + if (currentFrame) { + //被dependencyDetection.begin调用 + currentFrame.callback(array) } - }; - })() + } + }; +})() //将绑定对象注入到其依赖项的订阅数组中 - var ronduplex = /^(duplex|on)$/ - avalon.injectBinding = function (data) { - var fn = data.evaluator - if (fn) { //如果是求值函数 +var roneval = /^on$/ + +function returnRandom() { + return new Date() - 0 +} + +avalon.injectBinding = function (binding) { + + binding.handler = binding.handler || directives[binding.type].update || noop + binding.update = function () { + var begin = false + if (!binding.getter) { + begin = true dependencyDetection.begin({ - callback: function (vmodel, dependency) { - injectDependency(vmodel.$events[dependency._name], data) + callback: function (array) { + injectDependency(array, binding) } }) - try { - var c = ronduplex.test(data.type) ? data : fn.apply(0, data.args) - data.handler(c, data.element, data) - } catch (e) { - //log("warning:exception throwed in [avalon.injectBinding] " + e) - delete data.evaluator - var node = data.element - if (node.nodeType === 3) { - var parent = node.parentNode - if (kernel.commentInterpolate) { - parent.replaceChild(DOC.createComment(data.value), node) - } else { - node.data = openTag + data.value + closeTag - } + binding.getter = parseExpr(binding.expr, binding.vmodels, binding) + binding.observers.forEach(function (a) { + a.v.$watch(a.p, binding) + }) + delete binding.observers + } + try { + var args = binding.fireArgs, a, b + delete binding.fireArgs + if (!args) { + if (binding.type === "on") { + a = binding.getter + "" + } else { + a = binding.getter.apply(0, binding.args) } - } finally { - dependencyDetection.end() - } - } - } - -//将依赖项(比它高层的访问器或构建视图刷新函数的绑定对象)注入到订阅者数组 - function injectDependency(list, data) { - data = data || Registry[expose] - if (list && data && avalon.Array.ensure(list, data) && data.element) { - injectDisposeQueue(data, list) - } - } - -//通知依赖于这个访问器的订阅者更新自身 - function fireDependencies(list) { - if (list && list.length) { - if (new Date() - beginTime > 444 && typeof list[0] === "object") { - rejectDisposeQueue() - } - var args = aslice.call(arguments, 1) - for (var i = list.length, fn; fn = list[--i]; ) { - var el = fn.element - if (el && el.parentNode) { - try { - if (fn.$repeat) { - fn.handler.apply(fn, args) //处理监控数组的方法 - } else if (fn.type !== "on") { //事件绑定只能由用户触发,不能由程序触发 - var fun = fn.evaluator || noop - fn.handler(fun.apply(0, fn.args || []), el, fn) - - } - } catch (e) { - } - } - } - } - } - /********************************************************************* - * 定时GC回收机制 * - **********************************************************************/ - var disposeCount = 0 - var disposeQueue = avalon.$$subscribers = [] - var beginTime = new Date() - var oldInfo = {} - function getUid(obj) { //IE9+,标准浏览器 - return obj.uniqueNumber || (obj.uniqueNumber = ++disposeCount) - } - -//添加到回收列队中 - function injectDisposeQueue(data, list) { - var elem = data.element - if (!data.uuid) { - if (elem.nodeType !== 1) { - data.uuid = data.type + (data.pos || 0) + "-" + getUid(elem.parentNode) } else { - data.uuid = data.name + "-" + getUid(elem) - } - } - var lists = data.lists || (data.lists = []) - avalon.Array.ensure(lists, list) - list.$uuid = list.$uuid || generateID() - if (!disposeQueue[data.uuid]) { - disposeQueue[data.uuid] = 1 - disposeQueue.push(data) - } - } + a = args[0] + b = args[1] - function rejectDisposeQueue(data) { - if(avalon.optimize) - return - var i = disposeQueue.length - var n = i - var allTypes = [] - var iffishTypes = {} - var newInfo = {} - //对页面上所有绑定对象进行分门别类, 只检测个数发生变化的类型 - while (data = disposeQueue[--i]) { - var type = data.type - if (newInfo[type]) { - newInfo[type]++ - } else { - newInfo[type] = 1 - allTypes.push(type) } - } - var diff = false - allTypes.forEach(function (type) { - if (oldInfo[type] !== newInfo[type]) { - iffishTypes[type] = 1 - diff = true + b = typeof b === "undefined" ? binding.oldValue : b + if (binding._filters) { + a = filters.$filter.apply(0, [a].concat(binding._filters)) } - }) - i = n - if (diff) { - while (data = disposeQueue[--i]) { - if (!data.element) - continue - if (iffishTypes[data.type] && shouldDispose(data.element)) { //如果它没有在DOM树 - disposeQueue.splice(i, 1) - delete disposeQueue[data.uuid] - var lists = data.lists - for (var k = 0, list; list = lists[k++]; ) { - avalon.Array.remove(lists, list) - avalon.Array.remove(list, data) - } - disposeData(data) + if (binding.signature) { + var xtype = avalon.type(a) + if (xtype !== "array" && xtype !== "object") { + throw Error("warning:" + binding.expr + "只能是对象或数组") } - } - } - oldInfo = newInfo - beginTime = new Date() - } - - function disposeData(data) { - data.element = null - data.rollback && data.rollback() - for (var key in data) { - data[key] = null - } - } - - function shouldDispose(el) { - try {//IE下，如果文本节点脱离DOM树，访问parentNode会报错 - if (!el.parentNode) { - return true + binding.xtype = xtype + var vtrack = getProxyIds(binding.proxies || [], xtype) + var mtrack = a.$track || (xtype === "array" ? createTrack(a.length) : + Object.keys(a)) + binding.track = mtrack + if (vtrack !== mtrack.join(";")) { + binding.handler(a, b) + binding.oldValue = 1 + } + } else if (Array.isArray(a) ? a.length !== (b && b.length) : false) { + binding.handler(a, b) + binding.oldValue = a.concat() + } else if (!("oldValue" in binding) || a !== b) { + binding.handler(a, b) + binding.oldValue = a } } catch (e) { + delete binding.getter + log("warning:exception throwed in [avalon.injectBinding] ", e) + var node = binding.element + if (node && node.nodeType === 3) { + node.nodeValue = openTag + (binding.oneTime ? "::" : "") + binding.expr + closeTag + } + } finally { + begin && dependencyDetection.end() + + } + } + binding.update() +} + + +//将依赖项(比它高层的访问器或构建视图刷新函数的绑定对象)注入到订阅者数组 +function injectDependency(list, binding) { + if (binding.oneTime) + return + if (list && avalon.Array.ensure(list, binding) && binding.element) { + injectDisposeQueue(binding, list) + if (new Date() - beginTime > 444) { + rejectDisposeQueue() + } + } +} + + +function getProxyIds(a, isArray) { + var ret = [] + for (var i = 0, el; el = a[i++]; ) { + ret.push(isArray ? el.$id : el.$key) + } + return ret.join(";") +} + +/********************************************************************* + * 定时GC回收机制 * + **********************************************************************/ +var disposeCount = 0 +var disposeQueue = avalon.$$subscribers = [] +var beginTime = new Date() +var oldInfo = {} + +function getUid(data) { //IE9+,标准浏览器 + if (!data.uniqueNumber) { + var elem = data.element + if (elem) { + if (elem.nodeType !== 1) { + //如果是注释节点,则data.pos不存在,当一个元素下有两个注释节点就会出问题 + data.uniqueNumber = data.type + "-" + getUid(elem.parentNode) + "-" + (++disposeCount) + } else { + data.uniqueNumber = data.name + "-" + getUid(elem) + } + } else { + data.uniqueNumber = ++disposeCount + } + } + return data.uniqueNumber +} + +//添加到回收列队中 +function injectDisposeQueue(data, list) { + var lists = data.lists || (data.lists = []) + var uuid = getUid(data) + avalon.Array.ensure(lists, list) + list.$uuid = list.$uuid || generateID() + if (!disposeQueue[uuid]) { + disposeQueue[uuid] = 1 + disposeQueue.push(data) + } +} + +function rejectDisposeQueue(data) { + + var i = disposeQueue.length + var n = i + var allTypes = [] + var iffishTypes = {} + var newInfo = {} + //对页面上所有绑定对象进行分门别类, 只检测个数发生变化的类型 + while (data = disposeQueue[--i]) { + var type = data.type + if (newInfo[type]) { + newInfo[type]++ + } else { + newInfo[type] = 1 + allTypes.push(type) + } + } + var diff = false + allTypes.forEach(function (type) { + if (oldInfo[type] !== newInfo[type]) { + iffishTypes[type] = 1 + diff = true + } + }) + i = n + if (diff) { + while (data = disposeQueue[--i]) { + if (data.element === null) { + disposeQueue.splice(i, 1) + continue + } + if (iffishTypes[data.type] && shouldDispose(data.element)) { //如果它没有在DOM树 + disposeQueue.splice(i, 1) + delete disposeQueue[data.uniqueNumber] + var lists = data.lists + for (var k = 0, list; list = lists[k++]; ) { + avalon.Array.remove(lists, list) + avalon.Array.remove(list, data) + } + disposeData(data) + } + } + } + oldInfo = newInfo + beginTime = new Date() +} + +function disposeData(data) { + delete disposeQueue[data.uniqueNumber] // 先清除，不然无法回收了 + data.element = null + data.rollback && data.rollback() + for (var key in data) { + data[key] = null + } +} + +function shouldDispose(el) { + try {//IE下，如果文本节点脱离DOM树，访问parentNode会报错 + var fireError = el.parentNode.nodeType + } catch (e) { + return true + } + if (el.ifRemove) { + // 如果节点被放到ifGroup，才移除 + if (!root.contains(el.ifRemove) && (ifGroup === el.parentNode)) { + el.parentNode && el.parentNode.removeChild(el) return true } - - return el.msRetain ? 0 : (el.nodeType === 1 ? !root.contains(el) : !avalon.contains(root, el)) } + return el.msRetain ? 0 : (el.nodeType === 1 ? !root.contains(el) : !avalon.contains(root, el)) +} - /************************************************************************ - * HTML处理(parseHTML, innerHTML, clearHTML) * - ************************************************************************/ -// We have to close these tags to support XHTML - var tagHooks = { - area: [1, "", ""], - param: [1, "", ""], - col: [2, "", "
"], - legend: [1, "
", "
"], - option: [1, ""], - thead: [1, "", "
"], - tr: [2, "", "
"], - td: [3, "", "
"], - g: [1, '', ''], - //IE6-8在用innerHTML生成节点时，不能直接创建no-scope元素与HTML5的新标签 - _default: W3C ? [0, "", ""] : [1, "X
", "
"] //div可以不用闭合 + + +/************************************************************************ + * HTML处理(parseHTML, innerHTML, clearHTML) * + ************************************************************************/ +// We have to close these tags to support XHTML +var tagHooks = { + area: [1, "", ""], + param: [1, "", ""], + col: [2, "", "
"], + legend: [1, "
", "
"], + option: [1, ""], + thead: [1, "", "
"], + tr: [2, "", "
"], + td: [3, "", "
"], + g: [1, '', ''], + //IE6-8在用innerHTML生成节点时，不能直接创建no-scope元素与HTML5的新标签 + _default: W3C ? [0, "", ""] : [1, "X
", "
"] //div可以不用闭合 +} +tagHooks.th = tagHooks.td +tagHooks.optgroup = tagHooks.option +tagHooks.tbody = tagHooks.tfoot = tagHooks.colgroup = tagHooks.caption = tagHooks.thead +String("circle,defs,ellipse,image,line,path,polygon,polyline,rect,symbol,text,use").replace(rword, function (tag) { + tagHooks[tag] = tagHooks.g //处理SVG +}) +var rtagName = /<([\w:]+)/ //取得其tagName +var rxhtml = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig +var rcreate = W3C ? /[^\d\D]/ : /(<(?:script|link|style|meta|noscript))/ig +var scriptTypes = oneObject(["", "text/javascript", "text/ecmascript", "application/ecmascript", "application/javascript"]) +var rnest = /<(?:tb|td|tf|th|tr|col|opt|leg|cap|area)/ //需要处理套嵌关系的标签 +var script = DOC.createElement("script") +var rhtml = /<|&#?\w+;/ +avalon.parseHTML = function (html) { + var fragment = avalonFragment.cloneNode(false) + if (typeof html !== "string") { + return fragment } - tagHooks.th = tagHooks.td - tagHooks.optgroup = tagHooks.option - tagHooks.tbody = tagHooks.tfoot = tagHooks.colgroup = tagHooks.caption = tagHooks.thead - String("circle,defs,ellipse,image,line,path,polygon,polyline,rect,symbol,text,use").replace(rword, function (tag) { - tagHooks[tag] = tagHooks.g //处理SVG - }) - var rtagName = /<([\w:]+)/ //取得其tagName - var rxhtml = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig - var rcreate = W3C ? /[^\d\D]/ : /(<(?:script|link|style|meta|noscript))/ig - var scriptTypes = oneObject(["", "text/javascript", "text/ecmascript", "application/ecmascript", "application/javascript"]) - var rnest = /<(?:tb|td|tf|th|tr|col|opt|leg|cap|area)/ //需要处理套嵌关系的标签 - var script = DOC.createElement("script") - var rhtml = /<|&#?\w+;/ - avalon.parseHTML = function (html) { - var fragment = avalonFragment.cloneNode(false) - if (typeof html !== "string") { - return fragment - } - if (!rhtml.test(html)) { - fragment.appendChild(DOC.createTextNode(html)) - return fragment - } - html = html.replace(rxhtml, "<$1>").trim() - var tag = (rtagName.exec(html) || ["", ""])[1].toLowerCase(), + if (!rhtml.test(html)) { + fragment.appendChild(DOC.createTextNode(html)) + return fragment + } + html = html.replace(rxhtml, "<$1>").trim() + var tag = (rtagName.exec(html) || ["", ""])[1].toLowerCase(), //取得其标签名 - wrap = tagHooks[tag] || tagHooks._default, - wrapper = cinerator, - firstChild, neo - if (!W3C) { //fix IE - html = html.replace(rcreate, "
$1") //在link style script等标签之前添加一个补丁 - } - wrapper.innerHTML = wrap[1] + html + wrap[2] - var els = wrapper.getElementsByTagName("script") - if (els.length) { //使用innerHTML生成的script节点不会发出请求与执行text属性 - for (var i = 0, el; el = els[i++]; ) { - if (scriptTypes[el.type]) { - //以偷龙转凤方式恢复执行脚本功能 - neo = script.cloneNode(false) //FF不能省略参数 - ap.forEach.call(el.attributes, function (attr) { + wrap = tagHooks[tag] || tagHooks._default, + wrapper = cinerator, + firstChild, neo + if (!W3C) { //fix IE + html = html.replace(rcreate, "
$1") //在link style script等标签之前添加一个补丁 + } + wrapper.innerHTML = wrap[1] + html + wrap[2] + var els = wrapper.getElementsByTagName("script") + if (els.length) { //使用innerHTML生成的script节点不会发出请求与执行text属性 + for (var i = 0, el; el = els[i++];) { + if (scriptTypes[el.type]) { + //以偷龙转凤方式恢复执行脚本功能 + neo = script.cloneNode(false) //FF不能省略参数 + ap.forEach.call(el.attributes, function (attr) { if (attr && attr.specified) { neo[attr.name] = attr.value //复制其属性 neo.setAttribute(attr.name, attr.value) } - }) // jshint ignore:line - neo.text = el.text - el.parentNode.replaceChild(neo, el) //替换节点 + }) // jshint ignore:line + neo.text = el.text + el.parentNode.replaceChild(neo, el) //替换节点 + } + } + } + if (!W3C) { //fix IE + var target = wrap[1] === "X
" ? wrapper.lastChild.firstChild : wrapper.lastChild + if (target && target.tagName === "TABLE" && tag !== "tbody") { + //IE6-7处理 --> , + // --> , + // -->
+ for (els = target.childNodes, i = 0; el = els[i++];) { + if (el.tagName === "TBODY" && !el.innerHTML) { + target.removeChild(el) + break } } } - if (!W3C) { //fix IE - var target = wrap[1] === "X
" ? wrapper.lastChild.firstChild : wrapper.lastChild - if (target && target.tagName === "TABLE" && tag !== "tbody") { - //IE6-7处理 --> , - // --> , - // -->
- for (els = target.childNodes, i = 0; el = els[i++]; ) { - if (el.tagName === "TBODY" && !el.innerHTML) { - target.removeChild(el) - break - } - } - } - els = wrapper.getElementsByTagName("br") - var n = els.length - while (el = els[--n]) { - if (el.className === "msNoScope") { - el.parentNode.removeChild(el) - } - } - for (els = wrapper.all, i = 0; el = els[i++]; ) { //fix VML - if (isVML(el)) { - fixVML(el) - } + els = wrapper.getElementsByTagName("br") + var n = els.length + while (el = els[--n]) { + if (el.className === "msNoScope") { + el.parentNode.removeChild(el) } } - //移除我们为了符合套嵌关系而添加的标签 - for (i = wrap[0]; i--; wrapper = wrapper.lastChild) { - } - while (firstChild = wrapper.firstChild) { // 将wrapper上的节点转移到文档碎片上！ - fragment.appendChild(firstChild) - } - return fragment - } - - function isVML(src) { - var nodeName = src.nodeName - return nodeName.toLowerCase() === nodeName && src.scopeName && src.outerText === "" - } - - function fixVML(node) { - if (node.currentStyle.behavior !== "url(#default#VML)") { - node.style.behavior = "url(#default#VML)" - node.style.display = "inline-block" - node.style.zoom = 1 //hasLayout - } - } - avalon.innerHTML = function (node, html) { - if (!W3C && (!rcreate.test(html) && !rnest.test(html))) { - try { - node.innerHTML = html - return - } catch (e) { + for (els = wrapper.all, i = 0; el = els[i++];) { //fix VML + if (isVML(el)) { + fixVML(el) } } - var a = this.parseHTML(html) - this.clearHTML(node).appendChild(a) } - avalon.clearHTML = function (node) { - node.textContent = "" - while (node.firstChild) { - node.removeChild(node.firstChild) + //移除我们为了符合套嵌关系而添加的标签 + for (i = wrap[0]; i--; wrapper = wrapper.lastChild) {} + while (firstChild = wrapper.firstChild) { // 将wrapper上的节点转移到文档碎片上！ + fragment.appendChild(firstChild) + } + return fragment +} + +function isVML(src) { + var nodeName = src.nodeName + return nodeName.toLowerCase() === nodeName && src.scopeName && src.outerText === "" +} + +function fixVML(node) { + if (node.currentStyle.behavior !== "url(#default#VML)") { + node.style.behavior = "url(#default#VML)" + node.style.display = "inline-block" + node.style.zoom = 1 //hasLayout + } +} +avalon.innerHTML = function (node, html) { + if (!W3C && (!rcreate.test(html) && !rnest.test(html))) { + try { + node.innerHTML = html + return + } catch (e) {} + } + var a = this.parseHTML(html) + this.clearHTML(node).appendChild(a) +} +avalon.clearHTML = function (node) { + node.textContent = "" + while (node.firstChild) { + node.removeChild(node.firstChild) + } + return node +} + +/********************************************************************* + * avalon的原型方法定义区 * + **********************************************************************/ + +function hyphen(target) { + //转换为连字符线风格 + return target.replace(/([a-z\d])([A-Z]+)/g, "$1-$2").toLowerCase() +} + +function camelize(target) { + //提前判断，提高getStyle等的效率 + if (!target || target.indexOf("-") < 0 && target.indexOf("_") < 0) { + return target + } + //转换为驼峰风格 + return target.replace(/[-_][^-_]/g, function (match) { + return match.charAt(1).toUpperCase() + }) +} + +var fakeClassListMethods = { + _toString: function () { + var node = this.node + var cls = node.className + var str = typeof cls === "string" ? cls : cls.baseVal + return str.split(/\s+/).join(" ") + }, + _contains: function (cls) { + return (" " + this + " ").indexOf(" " + cls + " ") > -1 + }, + _add: function (cls) { + if (!this.contains(cls)) { + this._set(this + " " + cls) } - return node - } - - /********************************************************************* - * avalon的原型方法定义区 * - **********************************************************************/ - - function hyphen(target) { - //转换为连字符线风格 - return target.replace(/([a-z\d])([A-Z]+)/g, "$1-$2").toLowerCase() - } - - function camelize(target) { - //提前判断，提高getStyle等的效率 - if (!target || target.indexOf("-") < 0 && target.indexOf("_") < 0) { - return target - } - //转换为驼峰风格 - return target.replace(/[-_][^-_]/g, function(match) { - return match.charAt(1).toUpperCase() - }) - } - - var fakeClassListMethods = { - _toString: function() { - var node = this.node - var cls = node.className - var str = typeof cls === "string" ? cls : cls.baseVal - return str.split(/\s+/).join(" ") - }, - _contains: function(cls) { - return (" " + this + " ").indexOf(" " + cls + " ") > -1 - }, - _add: function(cls) { - if (!this.contains(cls)) { - this._set(this + " " + cls) - } - }, - _remove: function(cls) { - this._set((" " + this + " ").replace(" " + cls + " ", " ")) - }, - __set: function(cls) { + }, + _remove: function (cls) { + this._set((" " + this + " ").replace(" " + cls + " ", " ")) + }, + __set: function (cls) { cls = cls.trim() var node = this.node if (rsvg.test(node)) { @@ -2177,1222 +2126,1556 @@ node.className = cls } } //toggle存在版本差异，因此不使用它 - } +} - function fakeClassList(node) { - if (!("classList" in node)) { - node.classList = { - node: node - } - for (var k in fakeClassListMethods) { - node.classList[k.slice(1)] = fakeClassListMethods[k] - } +function fakeClassList(node) { + if (!("classList" in node)) { + node.classList = { + node: node + } + for (var k in fakeClassListMethods) { + node.classList[k.slice(1)] = fakeClassListMethods[k] } - return node.classList } + return node.classList +} - "add,remove".replace(rword, function(method) { - avalon.fn[method + "Class"] = function(cls) { - var el = this[0] +"add,remove".replace(rword, function (method) { + avalon.fn[method + "Class"] = function (cls) { + var el = this[0] //https://developer.mozilla.org/zh-CN/docs/Mozilla/Firefox/Releases/26 - if (cls && typeof cls === "string" && el && el.nodeType === 1) { - cls.replace(/\S+/g, function(c) { - fakeClassList(el)[method](c) - }) - } + if (cls && typeof cls === "string" && el && el.nodeType === 1) { + cls.replace(/\S+/g, function (c) { + fakeClassList(el)[method](c) + }) + } + return this + } +}) +avalon.fn.mix({ + hasClass: function (cls) { + var el = this[0] || {} + return el.nodeType === 1 && fakeClassList(el).contains(cls) + }, + toggleClass: function (value, stateVal) { + var className, i = 0 + var classNames = String(value).split(/\s+/) + var isBool = typeof stateVal === "boolean" + while ((className = classNames[i++])) { + var state = isBool ? stateVal : !this.hasClass(className) + this[state ? "addClass" : "removeClass"](className) + } + return this + }, + attr: function (name, value) { + if (arguments.length === 2) { + this[0].setAttribute(name, value) return this + } else { + return this[0].getAttribute(name) } - }) - avalon.fn.mix({ - hasClass: function(cls) { - var el = this[0] || {} - return el.nodeType === 1 && fakeClassList(el).contains(cls) - }, - toggleClass: function(value, stateVal) { - var className, i = 0 - var classNames = String(value).split(/\s+/) - var isBool = typeof stateVal === "boolean" - while ((className = classNames[i++])) { - var state = isBool ? stateVal : !this.hasClass(className) - this[state ? "addClass" : "removeClass"](className) - } + }, + data: function (name, value) { + name = "data-" + hyphen(name || "") + switch (arguments.length) { + case 2: + this.attr(name, value) return this - }, - attr: function(name, value) { - if (arguments.length === 2) { - this[0].setAttribute(name, value) - return this - } else { - return this[0].getAttribute(name) - } - }, - data: function(name, value) { - name = "data-" + hyphen(name || "") - switch (arguments.length) { - case 2: - this.attr(name, value) - return this - case 1: - var val = this.attr(name) - return parseData(val) - case 0: - var ret = {} - ap.forEach.call(this[0].attributes, function(attr) { - if (attr) { - name = attr.name - if (!name.indexOf("data-")) { - name = camelize(name.slice(5)) - ret[name] = parseData(attr.value) - } - } - }) - return ret - } - }, - removeData: function(name) { - name = "data-" + hyphen(name) - this[0].removeAttribute(name) - return this - }, - css: function(name, value) { - if (avalon.isPlainObject(name)) { - for (var i in name) { - avalon.css(this, i, name[i]) + case 1: + var val = this.attr(name) + return parseData(val) + case 0: + var ret = {} + ap.forEach.call(this[0].attributes, function (attr) { + if (attr) { + name = attr.name + if (!name.indexOf("data-")) { + name = camelize(name.slice(5)) + ret[name] = parseData(attr.value) + } } - } else { - var ret = avalon.css(this, name, value) - } - return ret !== void 0 ? ret : this - }, - position: function() { - var offsetParent, offset, - elem = this[0], - parentOffset = { - top: 0, - left: 0 - } - if (!elem) { - return - } - if (this.css("position") === "fixed") { - offset = elem.getBoundingClientRect() - } else { - offsetParent = this.offsetParent() //得到真正的offsetParent - offset = this.offset() // 得到正确的offsetParent - if (offsetParent[0].tagName !== "HTML") { - parentOffset = offsetParent.offset() - } - parentOffset.top += avalon.css(offsetParent[0], "borderTopWidth", true) - parentOffset.left += avalon.css(offsetParent[0], "borderLeftWidth", true) - - // Subtract offsetParent scroll positions - parentOffset.top -= offsetParent.scrollTop() - parentOffset.left -= offsetParent.scrollLeft() - } - return { - top: offset.top - parentOffset.top - avalon.css(elem, "marginTop", true), - left: offset.left - parentOffset.left - avalon.css(elem, "marginLeft", true) - } - }, - offsetParent: function() { - var offsetParent = this[0].offsetParent - while (offsetParent && avalon.css(offsetParent, "position") === "static") { - offsetParent = offsetParent.offsetParent; - } - return avalon(offsetParent || root) - }, - bind: function(type, fn, phase) { - if (this[0]) { //此方法不会链 - return avalon.bind(this[0], type, fn, phase) - } - }, - unbind: function(type, fn, phase) { - if (this[0]) { - avalon.unbind(this[0], type, fn, phase) - } - return this - }, - val: function(value) { - var node = this[0] - if (node && node.nodeType === 1) { - var get = arguments.length === 0 - var access = get ? ":get" : ":set" - var fn = valHooks[getValType(node) + access] - if (fn) { - var val = fn(node, value) - } else if (get) { - return (node.value || "").replace(/\r/g, "") - } else { - node.value = value - } - } - return get ? val : this - } - }) - - function parseData(data) { - try { - if (typeof data === "object") - return data - data = data === "true" ? true : - data === "false" ? false : - data === "null" ? null : +data + "" === data ? +data : rbrace.test(data) ? avalon.parseJSON(data) : data - } catch (e) {} - return data - } - var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/, - rvalidchars = /^[\],:{}\s]*$/, - rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, - rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g, - rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g - avalon.parseJSON = window.JSON ? JSON.parse : function(data) { - if (typeof data === "string") { - data = data.trim(); - if (data) { - if (rvalidchars.test(data.replace(rvalidescape, "@") - .replace(rvalidtokens, "]") - .replace(rvalidbraces, ""))) { - return (new Function("return " + data))() // jshint ignore:line - } - } - avalon.error("Invalid JSON: " + data) - } - return data - } - -//生成avalon.fn.scrollLeft, avalon.fn.scrollTop方法 - avalon.each({ - scrollLeft: "pageXOffset", - scrollTop: "pageYOffset" - }, function(method, prop) { - avalon.fn[method] = function(val) { - var node = this[0] || {}, win = getWindow(node), - top = method === "scrollTop" - if (!arguments.length) { - return win ? (prop in win) ? win[prop] : root[method] : node[method] - } else { - if (win) { - win.scrollTo(!top ? val : avalon(win).scrollLeft(), top ? val : avalon(win).scrollTop()) - } else { - node[method] = val - } - } - } - }) - - function getWindow(node) { - return node.window && node.document ? node : node.nodeType === 9 ? node.defaultView || node.parentWindow : false; - } -//=============================css相关======================= - var cssHooks = avalon.cssHooks = {} - var prefixes = ["", "-webkit-", "-o-", "-moz-", "-ms-"] - var cssMap = { - "float": W3C ? "cssFloat" : "styleFloat" - } - avalon.cssNumber = oneObject("columnCount,order,fillOpacity,fontWeight,lineHeight,opacity,orphans,widows,zIndex,zoom") - - avalon.cssName = function(name, host, camelCase) { - if (cssMap[name]) { - return cssMap[name] - } - host = host || root.style - for (var i = 0, n = prefixes.length; i < n; i++) { - camelCase = camelize(prefixes[i] + name) - if (camelCase in host) { - return (cssMap[name] = camelCase) - } - } - return null - } - cssHooks["@:set"] = function(node, name, value) { - try { //node.style.width = NaN;node.style.width = "xxxxxxx";node.style.width = undefine 在旧式IE下会抛异常 - node.style[name] = value - } catch (e) {} - } - if (window.getComputedStyle) { - cssHooks["@:get"] = function(node, name) { - if (!node || !node.style) { - throw new Error("getComputedStyle要求传入一个节点 " + node) - } - var ret, styles = getComputedStyle(node, null) - if (styles) { - ret = name === "filter" ? styles.getPropertyValue(name) : styles[name] - if (ret === "") { - ret = node.style[name] //其他浏览器需要我们手动取内联样式 - } - } + }) return ret } - cssHooks["opacity:get"] = function(node) { - var ret = cssHooks["@:get"](node, "opacity") - return ret === "" ? "1" : ret + }, + removeData: function (name) { + name = "data-" + hyphen(name) + this[0].removeAttribute(name) + return this + }, + css: function (name, value) { + if (avalon.isPlainObject(name)) { + for (var i in name) { + avalon.css(this, i, name[i]) + } + } else { + var ret = avalon.css(this, name, value) } - } else { - var rnumnonpx = /^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i - var rposition = /^(top|right|bottom|left)$/ - var ralpha = /alpha\([^)]*\)/i - var ie8 = !! window.XDomainRequest - var salpha = "DXImageTransform.Microsoft.Alpha" - var border = { - thin: ie8 ? '1px' : '2px', - medium: ie8 ? '3px' : '4px', - thick: ie8 ? '5px' : '6px' + return ret !== void 0 ? ret : this + }, + position: function () { + var offsetParent, offset, + elem = this[0], + parentOffset = { + top: 0, + left: 0 + } + if (!elem) { + return } - cssHooks["@:get"] = function(node, name) { - //取得精确值，不过它有可能是带em,pc,mm,pt,%等单位 - var currentStyle = node.currentStyle - var ret = currentStyle[name] - if ((rnumnonpx.test(ret) && !rposition.test(ret))) { - //①，保存原有的style.left, runtimeStyle.left, - var style = node.style, - left = style.left, - rsLeft = node.runtimeStyle.left + if (this.css("position") === "fixed") { + offset = elem.getBoundingClientRect() + } else { + offsetParent = this.offsetParent() //得到真正的offsetParent + offset = this.offset() // 得到正确的offsetParent + if (offsetParent[0].tagName !== "HTML") { + parentOffset = offsetParent.offset() + } + parentOffset.top += avalon.css(offsetParent[0], "borderTopWidth", true) + parentOffset.left += avalon.css(offsetParent[0], "borderLeftWidth", true) + + // Subtract offsetParent scroll positions + parentOffset.top -= offsetParent.scrollTop() + parentOffset.left -= offsetParent.scrollLeft() + } + return { + top: offset.top - parentOffset.top - avalon.css(elem, "marginTop", true), + left: offset.left - parentOffset.left - avalon.css(elem, "marginLeft", true) + } + }, + offsetParent: function () { + var offsetParent = this[0].offsetParent + while (offsetParent && avalon.css(offsetParent, "position") === "static") { + offsetParent = offsetParent.offsetParent; + } + return avalon(offsetParent || root) + }, + bind: function (type, fn, phase) { + if (this[0]) { //此方法不会链 + return avalon.bind(this[0], type, fn, phase) + } + }, + unbind: function (type, fn, phase) { + if (this[0]) { + avalon.unbind(this[0], type, fn, phase) + } + return this + }, + val: function (value) { + var node = this[0] + if (node && node.nodeType === 1) { + var get = arguments.length === 0 + var access = get ? ":get" : ":set" + var fn = valHooks[getValType(node) + access] + if (fn) { + var val = fn(node, value) + } else if (get) { + return (node.value || "").replace(/\r/g, "") + } else { + node.value = value + } + } + return get ? val : this + } +}) + +function parseData(data) { + try { + if (typeof data === "object") + return data + data = data === "true" ? true : + data === "false" ? false : + data === "null" ? null : +data + "" === data ? +data : rbrace.test(data) ? avalon.parseJSON(data) : data + } catch (e) {} + return data +} +var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/, + rvalidchars = /^[\],:{}\s]*$/, + rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, + rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g, + rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g +avalon.parseJSON = window.JSON ? JSON.parse : function (data) { + if (typeof data === "string") { + data = data.trim(); + if (data) { + if (rvalidchars.test(data.replace(rvalidescape, "@") + .replace(rvalidtokens, "]") + .replace(rvalidbraces, ""))) { + return (new Function("return " + data))() // jshint ignore:line + } + } + avalon.error("Invalid JSON: " + data) + } + return data +} + +//生成avalon.fn.scrollLeft, avalon.fn.scrollTop方法 +avalon.each({ + scrollLeft: "pageXOffset", + scrollTop: "pageYOffset" +}, function (method, prop) { + avalon.fn[method] = function (val) { + var node = this[0] || {}, + win = getWindow(node), + top = method === "scrollTop" + if (!arguments.length) { + return win ? (prop in win) ? win[prop] : root[method] : node[method] + } else { + if (win) { + win.scrollTo(!top ? val : avalon(win).scrollLeft(), top ? val : avalon(win).scrollTop()) + } else { + node[method] = val + } + } + } +}) + +function getWindow(node) { + return node.window && node.document ? node : node.nodeType === 9 ? node.defaultView || node.parentWindow : false; +} +//=============================css相关======================= +var cssHooks = avalon.cssHooks = {} +var prefixes = ["", "-webkit-", "-o-", "-moz-", "-ms-"] +var cssMap = { + "float": W3C ? "cssFloat" : "styleFloat" +} +avalon.cssNumber = oneObject("animationIterationCount,columnCount,order,flex,flexGrow,flexShrink,fillOpacity,fontWeight,lineHeight,opacity,orphans,widows,zIndex,zoom") + +avalon.cssName = function (name, host, camelCase) { + if (cssMap[name]) { + return cssMap[name] + } + host = host || root.style + for (var i = 0, n = prefixes.length; i < n; i++) { + camelCase = camelize(prefixes[i] + name) + if (camelCase in host) { + return (cssMap[name] = camelCase) + } + } + return null +} +cssHooks["@:set"] = function (node, name, value) { + try { //node.style.width = NaN;node.style.width = "xxxxxxx";node.style.width = undefine 在旧式IE下会抛异常 + node.style[name] = value + } catch (e) {} +} +if (window.getComputedStyle) { + cssHooks["@:get"] = function (node, name) { + if (!node || !node.style) { + throw new Error("getComputedStyle要求传入一个节点 " + node) + } + var ret, styles = getComputedStyle(node, null) + if (styles) { + ret = name === "filter" ? styles.getPropertyValue(name) : styles[name] + if (ret === "") { + ret = node.style[name] //其他浏览器需要我们手动取内联样式 + } + } + return ret + } + cssHooks["opacity:get"] = function (node) { + var ret = cssHooks["@:get"](node, "opacity") + return ret === "" ? "1" : ret + } +} else { + var rnumnonpx = /^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i + var rposition = /^(top|right|bottom|left)$/ + var ralpha = /alpha\([^)]*\)/i + var ie8 = !!window.XDomainRequest + var salpha = "DXImageTransform.Microsoft.Alpha" + var border = { + thin: ie8 ? '1px' : '2px', + medium: ie8 ? '3px' : '4px', + thick: ie8 ? '5px' : '6px' + } + cssHooks["@:get"] = function (node, name) { + //取得精确值，不过它有可能是带em,pc,mm,pt,%等单位 + var currentStyle = node.currentStyle + var ret = currentStyle[name] + if ((rnumnonpx.test(ret) && !rposition.test(ret))) { + //①，保存原有的style.left, runtimeStyle.left, + var style = node.style, + left = style.left, + rsLeft = node.runtimeStyle.left //②由于③处的style.left = xxx会影响到currentStyle.left， //因此把它currentStyle.left放到runtimeStyle.left， //runtimeStyle.left拥有最高优先级，不会style.left影响 - node.runtimeStyle.left = currentStyle.left + node.runtimeStyle.left = currentStyle.left //③将精确值赋给到style.left，然后通过IE的另一个私有属性 style.pixelLeft //得到单位为px的结果；fontSize的分支见http://bugs.jquery.com/ticket/760 - style.left = name === 'fontSize' ? '1em' : (ret || 0) - ret = style.pixelLeft + "px" + style.left = name === 'fontSize' ? '1em' : (ret || 0) + ret = style.pixelLeft + "px" //④还原 style.left，runtimeStyle.left - style.left = left - node.runtimeStyle.left = rsLeft - } - if (ret === "medium") { - name = name.replace("Width", "Style") - //border width 默认值为medium，即使其为0" - if (currentStyle[name] === "none") { - ret = "0px" - } - } - return ret === "" ? "auto" : border[ret] || ret + style.left = left + node.runtimeStyle.left = rsLeft } - cssHooks["opacity:set"] = function(node, name, value) { - var style = node.style - var opacity = isFinite(value) && value <= 1 ? "alpha(opacity=" + value * 100 + ")" : "" - var filter = style.filter || ""; - style.zoom = 1 + if (ret === "medium") { + name = name.replace("Width", "Style") + //border width 默认值为medium，即使其为0" + if (currentStyle[name] === "none") { + ret = "0px" + } + } + return ret === "" ? "auto" : border[ret] || ret + } + cssHooks["opacity:set"] = function (node, name, value) { + var style = node.style + var opacity = isFinite(value) && value <= 1 ? "alpha(opacity=" + value * 100 + ")" : "" + var filter = style.filter || ""; + style.zoom = 1 //不能使用以下方式设置透明度 //node.filters.alpha.opacity = value * 100 - style.filter = (ralpha.test(filter) ? - filter.replace(ralpha, opacity) : + style.filter = (ralpha.test(filter) ? + filter.replace(ralpha, opacity) : filter + " " + opacity).trim() - if (!style.filter) { - style.removeAttribute("filter") - } - } - cssHooks["opacity:get"] = function(node) { - //这是最快的获取IE透明值的方式，不需要动用正则了！ - var alpha = node.filters.alpha || node.filters[salpha], - op = alpha && alpha.enabled ? alpha.opacity : 100 - return (op / 100) + "" //确保返回的是字符串 + if (!style.filter) { + style.removeAttribute("filter") } } + cssHooks["opacity:get"] = function (node) { + //这是最快的获取IE透明值的方式，不需要动用正则了！ + var alpha = node.filters.alpha || node.filters[salpha], + op = alpha && alpha.enabled ? alpha.opacity : 100 + return (op / 100) + "" //确保返回的是字符串 + } +} - "top,left".replace(rword, function(name) { - cssHooks[name + ":get"] = function(node) { - var computed = cssHooks["@:get"](node, name) - return /px$/.test(computed) ? computed : +"top,left".replace(rword, function (name) { + cssHooks[name + ":get"] = function (node) { + var computed = cssHooks["@:get"](node, name) + return /px$/.test(computed) ? computed : avalon(node).position()[name] + "px" - } - }) - - var cssShow = { - position: "absolute", - visibility: "hidden", - display: "block" } +}) - var rdisplayswap = /^(none|table(?!-c[ea]).+)/ +var cssShow = { + position: "absolute", + visibility: "hidden", + display: "block" +} - function showHidden(node, array) { - //http://www.cnblogs.com/rubylouvre/archive/2012/10/27/2742529.html - if (node.offsetWidth <= 0) { //opera.offsetWidth可能小于0 - if (rdisplayswap.test(cssHooks["@:get"](node, "display"))) { - var obj = { - node: node - } - for (var name in cssShow) { - obj[name] = node.style[name] - node.style[name] = cssShow[name] - } - array.push(obj) +var rdisplayswap = /^(none|table(?!-c[ea]).+)/ + +function showHidden(node, array) { + //http://www.cnblogs.com/rubylouvre/archive/2012/10/27/2742529.html + if (node.offsetWidth <= 0) { //opera.offsetWidth可能小于0 + if (rdisplayswap.test(cssHooks["@:get"](node, "display"))) { + var obj = { + node: node } - var parent = node.parentNode - if (parent && parent.nodeType === 1) { - showHidden(parent, array) + for (var name in cssShow) { + obj[name] = node.style[name] + node.style[name] = cssShow[name] } + array.push(obj) + } + var parent = node.parentNode + if (parent && parent.nodeType === 1) { + showHidden(parent, array) } } - "Width,Height".replace(rword, function(name) { //fix 481 - var method = name.toLowerCase(), - clientProp = "client" + name, - scrollProp = "scroll" + name, - offsetProp = "offset" + name - cssHooks[method + ":get"] = function(node, which, override) { - var boxSizing = -4 - if (typeof override === "number") { - boxSizing = override - } - which = name === "Width" ? ["Left", "Right"] : ["Top", "Bottom"] - var ret = node[offsetProp] // border-box 0 - if (boxSizing === 2) { // margin-box 2 - return ret + avalon.css(node, "margin" + which[0], true) + avalon.css(node, "margin" + which[1], true) - } - if (boxSizing < 0) { // padding-box -2 - ret = ret - avalon.css(node, "border" + which[0] + "Width", true) - avalon.css(node, "border" + which[1] + "Width", true) - } - if (boxSizing === -4) { // content-box -4 - ret = ret - avalon.css(node, "padding" + which[0], true) - avalon.css(node, "padding" + which[1], true) - } - return ret +} +"Width,Height".replace(rword, function (name) { //fix 481 + var method = name.toLowerCase(), + clientProp = "client" + name, + scrollProp = "scroll" + name, + offsetProp = "offset" + name + cssHooks[method + ":get"] = function (node, which, override) { + var boxSizing = -4 + if (typeof override === "number") { + boxSizing = override } - cssHooks[method + "&get"] = function(node) { - var hidden = []; - showHidden(node, hidden); - var val = cssHooks[method + ":get"](node) - for (var i = 0, obj; obj = hidden[i++];) { - node = obj.node - for (var n in obj) { - if (typeof obj[n] === "string") { - node.style[n] = obj[n] - } + which = name === "Width" ? ["Left", "Right"] : ["Top", "Bottom"] + var ret = node[offsetProp] // border-box 0 + if (boxSizing === 2) { // margin-box 2 + return ret + avalon.css(node, "margin" + which[0], true) + avalon.css(node, "margin" + which[1], true) + } + if (boxSizing < 0) { // padding-box -2 + ret = ret - avalon.css(node, "border" + which[0] + "Width", true) - avalon.css(node, "border" + which[1] + "Width", true) + } + if (boxSizing === -4) { // content-box -4 + ret = ret - avalon.css(node, "padding" + which[0], true) - avalon.css(node, "padding" + which[1], true) + } + return ret + } + cssHooks[method + "&get"] = function (node) { + var hidden = []; + showHidden(node, hidden); + var val = cssHooks[method + ":get"](node) + for (var i = 0, obj; obj = hidden[i++];) { + node = obj.node + for (var n in obj) { + if (typeof obj[n] === "string") { + node.style[n] = obj[n] } } - return val; } - avalon.fn[method] = function(value) { //会忽视其display - var node = this[0] - if (arguments.length === 0) { - if (node.setTimeout) { //取得窗口尺寸,IE9后可以用node.innerWidth /innerHeight代替 - return node["inner" + name] || node.document.documentElement[clientProp] - } - if (node.nodeType === 9) { //取得页面尺寸 - var doc = node.documentElement + return val; + } + avalon.fn[method] = function (value) { //会忽视其display + var node = this[0] + if (arguments.length === 0) { + if (node.setTimeout) { //取得窗口尺寸 + return node["inner" + name] || + node.document.documentElement[clientProp] || + node.document.body[clientProp] //IE6下前两个分别为undefined,0 + } + if (node.nodeType === 9) { //取得页面尺寸 + var doc = node.documentElement //FF chrome html.scrollHeight< body.scrollHeight //IE 标准模式 : html.scrollHeight> body.scrollHeight //IE 怪异模式 : html.scrollHeight 最大等于可视窗口多一点？ - return Math.max(node.body[scrollProp], doc[scrollProp], node.body[offsetProp], doc[offsetProp], doc[clientProp]) - } - return cssHooks[method + "&get"](node) - } else { - return this.css(method, value) + return Math.max(node.body[scrollProp], doc[scrollProp], node.body[offsetProp], doc[offsetProp], doc[clientProp]) } + return cssHooks[method + "&get"](node) + } else { + return this.css(method, value) } - avalon.fn["inner" + name] = function() { - return cssHooks[method + ":get"](this[0], void 0, -2) + } + avalon.fn["inner" + name] = function () { + return cssHooks[method + ":get"](this[0], void 0, -2) + } + avalon.fn["outer" + name] = function (includeMargin) { + return cssHooks[method + ":get"](this[0], void 0, includeMargin === true ? 2 : 0) + } +}) +avalon.fn.offset = function () { //取得距离页面左右角的坐标 + var node = this[0], + box = { + left: 0, + top: 0 } - avalon.fn["outer" + name] = function(includeMargin) { - return cssHooks[method + ":get"](this[0], void 0, includeMargin === true ? 2 : 0) - } - }) - avalon.fn.offset = function() { //取得距离页面左右角的坐标 - var node = this[0], - box = { - left: 0, - top: 0 - } - if (!node || !node.tagName || !node.ownerDocument) { - return box - } - var doc = node.ownerDocument, - body = doc.body, - root = doc.documentElement, - win = doc.defaultView || doc.parentWindow - if (!avalon.contains(root, node)) { - return box - } - //http://hkom.blog1.fc2.com/?mode=m&no=750 body的偏移量是不包含margin的 - //我们可以通过getBoundingClientRect来获得元素相对于client的rect. - //http://msdn.microsoft.com/en-us/library/ms536433.aspx - if (node.getBoundingClientRect) { - box = node.getBoundingClientRect() // BlackBerry 5, iOS 3 (original iPhone) - } - //chrome/IE6: body.scrollTop, firefox/other: root.scrollTop - var clientTop = root.clientTop || body.clientTop, - clientLeft = root.clientLeft || body.clientLeft, - scrollTop = Math.max(win.pageYOffset || 0, root.scrollTop, body.scrollTop), - scrollLeft = Math.max(win.pageXOffset || 0, root.scrollLeft, body.scrollLeft) + if (!node || !node.tagName || !node.ownerDocument) { + return box + } + var doc = node.ownerDocument, + body = doc.body, + root = doc.documentElement, + win = doc.defaultView || doc.parentWindow + if (!avalon.contains(root, node)) { + return box + } + //http://hkom.blog1.fc2.com/?mode=m&no=750 body的偏移量是不包含margin的 + //我们可以通过getBoundingClientRect来获得元素相对于client的rect. + //http://msdn.microsoft.com/en-us/library/ms536433.aspx + if (node.getBoundingClientRect) { + box = node.getBoundingClientRect() // BlackBerry 5, iOS 3 (original iPhone) + } + //chrome/IE6: body.scrollTop, firefox/other: root.scrollTop + var clientTop = root.clientTop || body.clientTop, + clientLeft = root.clientLeft || body.clientLeft, + scrollTop = Math.max(win.pageYOffset || 0, root.scrollTop, body.scrollTop), + scrollLeft = Math.max(win.pageXOffset || 0, root.scrollLeft, body.scrollLeft) // 把滚动距离加到left,top中去。 // IE一些版本中会自动为HTML元素加上2px的border，我们需要去掉它 // http://msdn.microsoft.com/en-us/library/ms533564(VS.85).aspx - return { - top: box.top + scrollTop - clientTop, - left: box.left + scrollLeft - clientLeft - } + return { + top: box.top + scrollTop - clientTop, + left: box.left + scrollLeft - clientLeft } +} - //==================================val相关============================ +//==================================val相关============================ - function getValType(elem) { - var ret = elem.tagName.toLowerCase() - return ret === "input" && /checkbox|radio/.test(elem.type) ? "checked" : ret - } - var roption = /^]+))?)*\s+value[\s=]/i - var valHooks = { - "option:get": IEVersion ? function(node) { - //在IE11及W3C，如果没有指定value，那么node.value默认为node.text（存在trim作），但IE9-10则是取innerHTML(没trim操作) - //specified并不可靠，因此通过分析outerHTML判定用户有没有显示定义value - return roption.test(node.outerHTML) ? node.value : node.text.trim() - } : function(node) { - return node.value - }, - "select:get": function(node, value) { - var option, options = node.options, - index = node.selectedIndex, - getter = valHooks["option:get"], - one = node.type === "select-one" || index < 0, - values = one ? null : [], - max = one ? index + 1 : options.length, - i = index < 0 ? max : one ? index : 0 - for (; i < max; i++) { - option = options[i] +function getValType(elem) { + var ret = elem.tagName.toLowerCase() + return ret === "input" && /checkbox|radio/.test(elem.type) ? "checked" : ret +} +var roption = /^]+))?)*\s+value[\s=]/i +var valHooks = { + "option:get": IEVersion ? function (node) { + //在IE11及W3C，如果没有指定value，那么node.value默认为node.text（存在trim作），但IE9-10则是取innerHTML(没trim操作) + //specified并不可靠，因此通过分析outerHTML判定用户有没有显示定义value + return roption.test(node.outerHTML) ? node.value : node.text.trim() + } : function (node) { + return node.value + }, + "select:get": function (node, value) { + var option, options = node.options, + index = node.selectedIndex, + getter = valHooks["option:get"], + one = node.type === "select-one" || index < 0, + values = one ? null : [], + max = one ? index + 1 : options.length, + i = index < 0 ? max : one ? index : 0 + for (; i < max; i++) { + option = options[i] //旧式IE在reset后不会改变selected，需要改用i === index判定 //我们过滤所有disabled的option元素，但在safari5下，如果设置select为disable，那么其所有孩子都disable //因此当一个元素为disable，需要检测其是否显式设置了disable及其父节点的disable情况 - if ((option.selected || i === index) && !option.disabled) { - value = getter(option) - if (one) { - return value + if ((option.selected || i === index) && !option.disabled) { + value = getter(option) + if (one) { + return value + } + //收集所有selected值组成数组返回 + values.push(value) + } + } + return values + }, + "select:set": function (node, values, optionSet) { + values = [].concat(values) //强制转换为数组 + var getter = valHooks["option:get"] + for (var i = 0, el; el = node.options[i++];) { + if ((el.selected = values.indexOf(getter(el)) > -1)) { + optionSet = true + } + } + if (!optionSet) { + node.selectedIndex = -1 + } + } +} + +var keyMap = {} +var keys = ["break,case,catch,continue,debugger,default,delete,do,else,false", + "finally,for,function,if,in,instanceof,new,null,return,switch,this", + "throw,true,try,typeof,var,void,while,with", /* 关键字*/ + "abstract,boolean,byte,char,class,const,double,enum,export,extends", + "final,float,goto,implements,import,int,interface,long,native", + "package,private,protected,public,short,static,super,synchronized", + "throws,transient,volatile", /*保留字*/ + "arguments,let,yield,undefined"].join(",") +keys.replace(/\w+/g, function (a) { + keyMap[a] = true +}) +var ridentStart = /[a-z_$]/i +var rwhiteSpace = /[\s\uFEFF\xA0]/ +function getIdent(input, lastIndex) { + var result = [] + var subroutine = !!lastIndex + lastIndex = lastIndex || 0 + + //将表达式中的标识符抽取出来 + var state = "unknown" + var variable = "" + for (var i = 0; i < input.length; i++) { + var c = input.charAt(i) + if (c === "'" || c === '"') {//字符串开始 + if (state === "unknown") { + state = c + } else if (state === c) {//字符串结束 + state = "unknown" + } + } else if (c === "\\") { + if (state === "'" || state === '"') { + i++ + } + } else if (ridentStart.test(c)) {//碰到标识符 + if (state === "unknown") { + state = "variable" + variable = c + } else if (state === "maybePath") { + variable = result.pop() + variable += "." + c + state = "variable" + } else if (state === "variable") { + variable += c + } + } else if (/\w/.test(c)) { + if (state === "variable") { + variable += c + } + } else if (c === ".") { + if (state === "variable") { + if (variable) { + result.push(variable) + variable = "" + state = "maybePath" + } + } + } else if (c === "[") { + if (state === "variable" || state === "maybePath") { + if (variable) {//如果前面存在变量,收集它 + result.push(variable) + variable = "" + } + var lastLength = result.length + var last = result[lastLength - 1] + var innerResult = getIdent(input.slice(i), i) + if (innerResult.length) {//如果括号中存在变量,那么这里添加通配符 + result[lastLength - 1] = last + ".*" + result = innerResult.concat(result) + } else { //如果括号中的东西是确定的,直接转换为其子属性 + var content = input.slice(i + 1, innerResult.i) + try { + var text = (scpCompile(["return " + content]))() + result[lastLength - 1] = last + "." + text + } catch (e) { } - //收集所有selected值组成数组返回 - values.push(value) } + state = "maybePath"//]后面可能还接东西 + i = innerResult.i } - return values - }, - "select:set": function(node, values, optionSet) { - values = [].concat(values) //强制转换为数组 - var getter = valHooks["option:get"] - for (var i = 0, el; el = node.options[i++];) { - if ((el.selected = values.indexOf(getter(el)) > -1)) { - optionSet = true + } else if (c === "]") { + if (subroutine) { + result.i = i + lastIndex + addVar(result, variable) + return result + } + } else if (rwhiteSpace.test(c) && c !== "\r" && c !== "\n") { + if (state === "variable") { + if (addVar(result, variable)) { + state = "maybePath" // aaa . bbb 这样的情况 } + variable = "" } - if (!optionSet) { - node.selectedIndex = -1 - } + } else { + addVar(result, variable) + state = "unknown" + variable = "" } } - - /********************************************************************* - * 编译系统 * - **********************************************************************/ - var meta = { - '\b': '\\b', - '\t': '\\t', - '\n': '\\n', - '\f': '\\f', - '\r': '\\r', - '"': '\\"', - '\\': '\\\\' + addVar(result, variable) + return result +} +function addVar(array, element) { + if (element && !keyMap[element]) { + array.push(element) + return true } - var quote = window.JSON && JSON.stringify || function(str) { - return '"' + str.replace(/[\\\"\x00-\x1f]/g, function(a) { - var c = meta[a]; - return typeof c === 'string' ? c : - '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4); - }) + '"' - } - - var keywords = [ - "break,case,catch,continue,debugger,default,delete,do,else,false", - "finally,for,function,if,in,instanceof,new,null,return,switch,this", - "throw,true,try,typeof,var,void,while,with", /* 关键字*/ - "abstract,boolean,byte,char,class,const,double,enum,export,extends", - "final,float,goto,implements,import,int,interface,long,native", - "package,private,protected,public,short,static,super,synchronized", - "throws,transient,volatile", /*保留字*/ - "arguments,let,yield,undefined" /* ECMA 5 - use strict*/].join(",") - var rrexpstr = /\/\*[\w\W]*?\*\/|\/\/[^\n]*\n|\/\/[^\n]*$|"(?:[^"\\]|\\[\w\W])*"|'(?:[^'\\]|\\[\w\W])*'|[\s\t\n]*\.[\s\t\n]*[$\w\.]+/g - var rsplit = /[^\w$]+/g - var rkeywords = new RegExp(["\\b" + keywords.replace(/,/g, '\\b|\\b') + "\\b"].join('|'), 'g') - var rnumber = /\b\d[^,]*/g - var rcomma = /^,+|,+$/g - var variablePool = new Cache(512) - var getVariables = function (code) { - var key = "," + code.trim() - var ret = variablePool.get(key) - if (ret) { - return ret - } - var match = code - .replace(rrexpstr, "") - .replace(rsplit, ",") - .replace(rkeywords, "") - .replace(rnumber, "") - .replace(rcomma, "") - .split(/^$|,+/) - return variablePool.put(key, uniqSet(match)) - } - /*添加赋值语句*/ - - function addAssign(vars, scope, name, data) { - var ret = [], +} +function addAssign(vars, vmodel, name, binding) { + var ret = [], prefix = " = " + name + "." - var isProxy = /\$proxy\$each/.test(scope.$id) - for (var i = vars.length, prop; prop = vars[--i]; ) { - var el = isProxy && scope.$map[prop] ? "el" : prop - if (scope.hasOwnProperty(el)) { - ret.push(prop + prefix + el) - data.vars.push(prop) - if (data.type === "duplex") { - vars.get = name + "." + el - } + for (var i = vars.length, prop; prop = vars[--i]; ) { + var arr = prop.split("."), a + var first = arr[0] + while (a = arr.shift()) { + if (vmodel.hasOwnProperty(a)) { + ret.push(first + prefix + first) + + binding.observers.push({ + v: vmodel, + p: prop + }) + vars.splice(i, 1) } } - return ret - } - - function uniqSet(array) { - var ret = [], - unique = {} - for (var i = 0; i < array.length; i++) { - var el = array[i] - var id = el && typeof el.$id === "string" ? el.$id : el - if (!unique[id]) { - unique[id] = ret.push(el) - } - } - return ret } + return ret +} +var rproxy = /(\$proxy\$[a-z]+)\d+$/ +var variablePool = new Cache(218) //缓存求值函数，以便多次利用 - var evaluatorPool = new Cache(128) -//取得求值函数及其传参 - var rduplex = /\w\[.*\]|\w\.\w/ - var rproxy = /(\$proxy\$[a-z]+)\d+$/ - var rthimRightParentheses = /\)\s*$/ - var rthimOtherParentheses = /\)\s*\|/g - var rquoteFilterName = /\|\s*([$\w]+)/g - var rpatchBracket = /"\s*\["/g - var rthimLeftParentheses = /"\s*\(/g - function parseFilter(val, filters) { - filters = filters - .replace(rthimRightParentheses, "")//处理最后的小括号 - .replace(rthimOtherParentheses, function () {//处理其他小括号 - return "],|" - }) - .replace(rquoteFilterName, function (a, b) { //处理|及它后面的过滤器的名字 - return "[" + quote(b) - }) - .replace(rpatchBracket, function () { - return '"],["' - }) - .replace(rthimLeftParentheses, function () { - return '",' - }) + "]" - return "return avalon.filters.$filter(" + val + ", " + filters + ")" +var evaluatorPool = new Cache(128) + +function getVars(expr) { + expr = expr.trim() + var ret = variablePool.get(expr) + if (ret) { + return ret.concat() + } + var array = getIdent(expr) + var uniq = {} + var result = [] + for (var i = 0, el; el = array[i++]; ) { + if (!uniq[el]) { + uniq[el] = 1 + result.push(el) + } + } + return variablePool.put(expr, result).concat() +} + +function parseExpr(expr, vmodels, binding) { + var filters = binding.filters + if (typeof filters === "string" && filters.trim() && !binding._filters) { + binding._filters = parseFilter(filters.trim()) } - function parseExpr(code, scopes, data) { - var dataType = data.type - var filters = data.filters || "" - var exprId = scopes.map(function (el) { - return String(el.$id).replace(rproxy, "$1") - }) + code + dataType + filters - var vars = getVariables(code).concat(), - assigns = [], - names = [], - args = [], - prefix = "" - //args 是一个对象数组， names 是将要生成的求值函数的参数 - scopes = uniqSet(scopes) - data.vars = [] - for (var i = 0, sn = scopes.length; i < sn; i++) { - if (vars.length) { - var name = "vm" + expose + "_" + i - names.push(name) - args.push(scopes[i]) - assigns.push.apply(assigns, addAssign(vars, scopes[i], name, data)) - } + var vars = getVars(expr) + + var expose = new Date() - 0 + var assigns = [] + var names = [] + var args = [] + binding.observers = [] + for (var i = 0, sn = vmodels.length; i < sn; i++) { + if (vars.length) { + var name = "vm" + expose + "_" + i + names.push(name) + args.push(vmodels[i]) + assigns.push.apply(assigns, addAssign(vars, vmodels[i], name, binding)) } - if (!assigns.length && dataType === "duplex") { - return + } + binding.args = args + var dataType = binding.type + var exprId = vmodels.map(function (el) { + return String(el.$id).replace(rproxy, "$1") + }) + expr + dataType + var getter = evaluatorPool.get(exprId) //直接从缓存，免得重复生成 + if (getter) { + if (dataType === "duplex") { + var setter = evaluatorPool.get(exprId + "setter") + binding.setter = setter.apply(setter, binding.args) } - if (dataType !== "duplex" && (code.indexOf("||") > -1 || code.indexOf("&&") > -1)) { - //https://github.com/RubyLouvre/avalon/issues/583 - data.vars.forEach(function (v) { - var reg = new RegExp("\\b" + v + "(?:\\.\\w+|\\[\\w+\\])+", "ig") - code = code.replace(reg, function (_) { - var c = _.charAt(v.length) - var r = IEVersion ? code.slice(arguments[1] + _.length) : RegExp.rightContext - var method = /^\s*\(/.test(r) - if (c === "." || c === "[" || method) {//比如v为aa,我们只匹配aa.bb,aa[cc],不匹配aaa.xxx - var name = "var" + String(Math.random()).replace(/^0\./, "") - if (method) {//array.size() - var array = _.split(".") - if (array.length > 2) { - var last = array.pop() - assigns.push(name + " = " + array.join(".")) - return name + "." + last - } else { - return _ - } - } - assigns.push(name + " = " + _) - return name - } else { - return _ - } - }) + return binding.getter = getter + } + + if (!assigns.length) { + assigns.push("fix" + expose) + } + + if (dataType === "duplex") { + var nameOne = {} + assigns.forEach(function (a) { + var arr = a.split("=") + nameOne[arr[0].trim()] = arr[1].trim() + }) + expr = expr.replace(/[\$\w]+/, function (a) { + return nameOne[a] ? nameOne[a] : a + }) + /* jshint ignore:start */ + var fn2 = scpCompile(names.concat("'use strict';" + + "return function(vvv){" + expr + " = vvv\n}\n")) + /* jshint ignore:end */ + evaluatorPool.put(exprId + "setter", fn2) + binding.setter = fn2.apply(fn2, binding.args) + } + + if (dataType === "on") { //事件绑定 + if (expr.indexOf("(") === -1) { + expr += ".call(this, $event)" + } else { + expr = expr.replace("(", ".call(this,") + } + names.push("$event") + expr = "\nreturn " + expr + ";" //IE全家 Function("return ")出错，需要Function("return ;") + var lastIndex = expr.lastIndexOf("\nreturn") + var header = expr.slice(0, lastIndex) + var footer = expr.slice(lastIndex) + expr = header + "\n" + footer + } else { + expr = "\nreturn " + expr + ";" //IE全家 Function("return ")出错，需要Function("return ;") + } + /* jshint ignore:start */ + getter = scpCompile(names.concat("'use strict';\nvar " + + assigns.join(",\n") + expr)) + /* jshint ignore:end */ + + return evaluatorPool.put(exprId, getter) + +} +//======== + +function stringifyExpr(code) { + var hasExpr = rexpr.test(code) //比如ms-class="width{{w}}"的情况 + if (hasExpr) { + var array = scanExpr(code) + if (array.length === 1) { + return array[0].expr + } + return array.map(function (el) { + return el.type ? "(" + el.expr + ")" : quote(el.expr) + }).join(" + ") + } else { + return code + } +} + +avalon.parseExprProxy = parseExpr + +var rthimRightParentheses = /\)\s*$/ +var rthimOtherParentheses = /\)\s*\|/g +var rquoteFilterName = /\|\s*([$\w]+)/g +var rpatchBracket = /"\s*\["/g +var rthimLeftParentheses = /"\s*\(/g +function parseFilter(filters) { + filters = filters + .replace(rthimRightParentheses, "")//处理最后的小括号 + .replace(rthimOtherParentheses, function () {//处理其他小括号 + return "],|" }) - } - //---------------args---------------- - data.args = args - //---------------cache---------------- - delete data.vars - var fn = evaluatorPool.get(exprId) //直接从缓存，免得重复生成 - if (fn) { - data.evaluator = fn - return - } - prefix = assigns.join(", ") - if (prefix) { - prefix = "var " + prefix - } - if (/\S/.test(filters)) { //文本绑定，双工绑定才有过滤器 - if (!/text|html/.test(data.type)) { - throw Error("ms-" + data.type + "不支持过滤器") - } - code = "\nvar ret" + expose + " = " + code + ";\r\n" - code += parseFilter("ret" + expose, filters) - } else if (dataType === "duplex") { //双工绑定 - var _body = "'use strict';\nreturn function(vvv){\n\t" + - prefix + - ";\n\tif(!arguments.length){\n\t\treturn " + - code + - "\n\t}\n\t" + (!rduplex.test(code) ? vars.get : code) + - "= vvv;\n} " - try { - fn = Function.apply(noop, names.concat(_body)) - data.evaluator = evaluatorPool.put(exprId, fn) - } catch (e) { - log("debug: parse error," + e.message) - } - return - } else if (dataType === "on") { //事件绑定 - if (code.indexOf("(") === -1) { - code += ".call(this, $event)" - } else { - code = code.replace("(", ".call(this,") - } - names.push("$event") - code = "\nreturn " + code + ";" //IE全家 Function("return ")出错，需要Function("return ;") - var lastIndex = code.lastIndexOf("\nreturn") - var header = code.slice(0, lastIndex) - var footer = code.slice(lastIndex) - code = header + "\n" + footer - } else { //其他绑定 - code = "\nreturn " + code + ";" //IE全家 Function("return ")出错，需要Function("return ;") - } - try { - fn = Function.apply(noop, names.concat("'use strict';\n" + prefix + code)) - data.evaluator = evaluatorPool.put(exprId, fn) - } catch (e) { - log("debug: parse error," + e.message) - } finally { - vars = assigns = names = null //释放内存 - } - } + .replace(rquoteFilterName, function (a, b) { //处理|及它后面的过滤器的名字 + return "[" + quote(b) + }) + .replace(rpatchBracket, function () { + return '"],["' + }) + .replace(rthimLeftParentheses, function () { + return '",' + }) + "]" + /* jshint ignore:start */ + return scpCompile(["return [" + filters + "]"])() + /* jshint ignore:end */ +} +/********************************************************************* + * 编译系统 * + **********************************************************************/ +var meta = { + '\b': '\\b', + '\t': '\\t', + '\n': '\\n', + '\f': '\\f', + '\r': '\\r', + '"': '\\"', + '\\': '\\\\' +} +var quote = window.JSON && JSON.stringify || function(str) { + return '"' + str.replace(/[\\\"\x00-\x1f]/g, function(a) { + var c = meta[a]; + return typeof c === 'string' ? c : + '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4); + }) + '"' +} +/********************************************************************* + * 扫描系统 * + **********************************************************************/ -//parseExpr的智能引用代理 - - function parseExprProxy(code, scopes, data, tokens, noRegister) { - if (Array.isArray(tokens)) { - code = tokens.map(function (el) { - return el.expr ? "(" + el.value + ")" : quote(el.value) - }).join(" + ") - } - parseExpr(code, scopes, data) - if (data.evaluator && !noRegister) { - data.handler = bindingExecutors[data.handlerName || data.type] - //方便调试 - //这里非常重要,我们通过判定视图刷新函数的element是否在DOM树决定 - //将它移出订阅者列表 - avalon.injectBinding(data) - } - } - avalon.parseExprProxy = parseExprProxy - /********************************************************************* - * 扫描系统 * - **********************************************************************/ - - avalon.scan = function(elem, vmodel) { - elem = elem || root - var vmodels = vmodel ? [].concat(vmodel) : [] - scanTag(elem, vmodels) - } +avalon.scan = function (elem, vmodel) { + elem = elem || root + var vmodels = vmodel ? [].concat(vmodel) : [] + scanTag(elem, vmodels) +} //http://www.w3.org/TR/html5/syntax.html#void-elements - var stopScan = oneObject("area,base,basefont,br,col,command,embed,hr,img,input,link,meta,param,source,track,wbr,noscript,script,style,textarea".toUpperCase()) +var stopScan = oneObject("area,base,basefont,br,col,command,embed,hr,img,input,link,meta,param,source,track,wbr,noscript,script,style,textarea".toUpperCase()) - function checkScan(elem, callback, innerHTML) { - var id = setTimeout(function() { - var currHTML = elem.innerHTML - clearTimeout(id) - if (currHTML === innerHTML) { - callback() - } else { - checkScan(elem, callback, currHTML) - } - }) - } +function checkScan(elem, callback, innerHTML) { + var id = setTimeout(function () { + var currHTML = elem.innerHTML + clearTimeout(id) + if (currHTML === innerHTML) { + callback() + } else { + checkScan(elem, callback, currHTML) + } + }) +} - function createSignalTower(elem, vmodel) { - var id = elem.getAttribute("avalonctrl") || vmodel.$id - elem.setAttribute("avalonctrl", id) +function createSignalTower(elem, vmodel) { + var id = elem.getAttribute("avalonctrl") || vmodel.$id + elem.setAttribute("avalonctrl", id) + if (vmodel.$events) { vmodel.$events.expr = elem.tagName + '[avalonctrl="' + id + '"]' } +} - var getBindingCallback = function(elem, name, vmodels) { - var callback = elem.getAttribute(name) - if (callback) { - for (var i = 0, vm; vm = vmodels[i++]; ) { - if (vm.hasOwnProperty(callback) && typeof vm[callback] === "function") { - return vm[callback] - } +var getBindingCallback = function (elem, name, vmodels) { + var callback = elem.getAttribute(name) + if (callback) { + for (var i = 0, vm; vm = vmodels[i++]; ) { + if (vm.hasOwnProperty(callback) && typeof vm[callback] === "function") { + return vm[callback] } } } +} - function executeBindings(bindings, vmodels) { - for (var i = 0, data; data = bindings[i++]; ) { - data.vmodels = vmodels - bindingHandlers[data.type](data, vmodels) - if (data.evaluator && data.element && data.element.nodeType === 1) { //移除数据绑定，防止被二次解析 - //chrome使用removeAttributeNode移除不存在的特性节点时会报错 https://github.com/RubyLouvre/avalon/issues/99 - data.element.removeAttribute(data.name) - } +function executeBindings(bindings, vmodels) { + for (var i = 0, binding; binding = bindings[i++]; ) { + binding.vmodels = vmodels + directives[binding.type].init(binding) + + avalon.injectBinding(binding) + if (binding.getter && binding.element.nodeType === 1) { //移除数据绑定，防止被二次解析 + //chrome使用removeAttributeNode移除不存在的特性节点时会报错 https://github.com/RubyLouvre/avalon/issues/99 + binding.element.removeAttribute(binding.name) } - bindings.length = 0 } + bindings.length = 0 +} //https://github.com/RubyLouvre/avalon/issues/636 - var mergeTextNodes = IEVersion && window.MutationObserver ? function (elem) { - var node = elem.firstChild, text - while (node) { - var aaa = node.nextSibling - if (node.nodeType === 3) { - if (text) { - text.nodeValue += node.nodeValue - elem.removeChild(node) - } else { - text = node - } +var mergeTextNodes = IEVersion && window.MutationObserver ? function (elem) { + var node = elem.firstChild, text + while (node) { + var aaa = node.nextSibling + if (node.nodeType === 3) { + if (text) { + text.nodeValue += node.nodeValue + elem.removeChild(node) } else { - text = null + text = node } - node = aaa + } else { + text = null } - } : 0 - - var rmsAttr = /ms-(\w+)-?(.*)/ - var priorityMap = { - "if": 10, - "repeat": 90, - "data": 100, - "widget": 110, - "each": 1400, - "with": 1500, - "duplex": 2000, - "on": 3000 + node = aaa } +} : 0 +var roneTime = /^\s*::/ +var rmsAttr = /ms-(\w+)-?(.*)/ - var events = oneObject("animationend,blur,change,input,click,dblclick,focus,keydown,keypress,keyup,mousedown,mouseenter,mouseleave,mousemove,mouseout,mouseover,mouseup,scan,scroll,submit") - var obsoleteAttrs = oneObject("value,title,alt,checked,selected,disabled,readonly,enabled") - function bindingSorter(a, b) { - return a.priority - b.priority - } +var events = oneObject("animationend,blur,change,input,click,dblclick,focus,keydown,keypress,keyup,mousedown,mouseenter,mouseleave,mousemove,mouseout,mouseover,mouseup,scan,scroll,submit") +var obsoleteAttrs = oneObject("value,title,alt,checked,selected,disabled,readonly,enabled,href,src") +function bindingSorter(a, b) { + return a.priority - b.priority +} - function scanAttr(elem, vmodels, match) { - var scanNode = true - if (vmodels.length) { - var attributes = getAttributes ? getAttributes(elem) : elem.attributes - var bindings = [] - var fixAttrs = [] - var msData = {} - for (var i = 0, attr; attr = attributes[i++]; ) { - if (attr.specified) { - if (match = attr.name.match(rmsAttr)) { - //如果是以指定前缀命名的 - var type = match[1] - var param = match[2] || "" - var value = attr.value - var name = attr.name - if (events[type]) { - param = type - type = "on" - } else if (obsoleteAttrs[type]) { - if (type === "enabled") {//吃掉ms-enabled绑定,用ms-disabled代替 - log("warning!ms-enabled或ms-attr-enabled已经被废弃") - type = "disabled" - value = "!(" + value + ")" - } - param = type - type = "attr" - name = "ms-" + type + "-"+ param - fixAttrs.push([attr.name, name, value]) +function scanAttr(elem, vmodels, match) { + var scanNode = true + if (vmodels.length) { + var attributes = getAttributes ? getAttributes(elem) : elem.attributes + var bindings = [] + var uniq = {} + for (var i = 0, attr; attr = attributes[i++]; ) { + var name = attr.name + if (uniq[name]) {//IE8下ms-repeat,ms-with BUG + continue + } + uniq[name] = 1 + if (attr.specified) { + if (match = name.match(rmsAttr)) { + //如果是以指定前缀命名的 + var type = match[1] + var param = match[2] || "" + var value = attr.value + if (events[type]) { + param = type + type = "on" + } else if (obsoleteAttrs[type]) { + param = type + type = "attr" + name = "ms-" + type + "-" + param + log("warning!请改用" + name + "代替" + attr.name + "!") + } + if (directives[type]) { + var newValue = value.replace(roneTime, "") + var oneTime = value !== newValue + var binding = { + type: type, + param: param, + element: elem, + name: name, + expr: newValue, + oneTime: oneTime, + uniqueNumber: attr.name + "-" + getUid(elem), + //chrome与firefox下Number(param)得到的值不一样 #855 + priority: (directives[type].priority || type.charCodeAt(0) * 10) + (Number(param.replace(/\D/g, "")) || 0) } - msData[name] = value - if (typeof bindingHandlers[type] === "function") { - var binding = { - type: type, - param: param, - element: elem, - name: name, - value: value, - //chrome与firefox下Number(param)得到的值不一样 #855 - priority: (priorityMap[type] || type.charCodeAt(0) * 10 )+ (Number(param.replace(/\D/g, "")) || 0) - } - if (type === "html" || type === "text") { - var token = getToken(value) - avalon.mix(binding, token) - binding.filters = binding.filters.replace(rhasHtml, function () { - binding.type = "html" - binding.group = 1 - return "" - })// jshint ignore:line - } else if (type === "duplex") { - var hasDuplex = name - } else if (name === "ms-if-loop") { - binding.priority += 100 - } - bindings.push(binding) - if (type === "widget") { - elem.msData = elem.msData || msData - } + if (type === "html" || type === "text") { + + var filters = getToken(value).filters + binding.expr = binding.expr.replace(filters, "") + + binding.filters = filters.replace(rhasHtml, function () { + binding.type = "html" + binding.group = 1 + return "" + }).trim() // jshint ignore:line + } else if (type === "duplex") { + var hasDuplex = name + } else if (name === "ms-if-loop") { + binding.priority += 100 + } else if (name === "ms-attr-value") { + var hasAttrValue = name } + bindings.push(binding) } } } - if (bindings.length) { - bindings.sort(bindingSorter) - fixAttrs.forEach(function (arr) { - log("warning!请改用" + arr[1] + "代替" + arr[0] + "!") - elem.removeAttribute(arr[0]) - elem.setAttribute(arr[1], arr[2]) - }) - //http://bugs.jquery.com/ticket/7071 - //在IE下对VML读取type属性,会让此元素所有属性都变成 - if (hasDuplex) { - if (msData["ms-attr-checked"]) { - log("warning!一个控件不能同时定义ms-attr-checked与" + hasDuplex) - } - if (msData["ms-attr-value"]) { - log("warning!一个控件不能同时定义ms-attr-value与" + hasDuplex) - } - } - for (i = 0; binding = bindings[i]; i++) { - type = binding.type - if (rnoscanAttrBinding.test(type)) { - return executeBindings(bindings.slice(0, i + 1), vmodels) - } else if (scanNode) { - scanNode = !rnoscanNodeBinding.test(type) - } - } - executeBindings(bindings, vmodels) - } } - if (scanNode && !stopScan[elem.tagName] && rbind.test(elem.innerHTML.replace(rlt, "<").replace(rgt, ">"))) { - mergeTextNodes && mergeTextNodes(elem) - scanNodeList(elem, vmodels) //扫描子孙元素 + if (bindings.length) { + bindings.sort(bindingSorter) + //http://bugs.jquery.com/ticket/7071 + //在IE下对VML读取type属性,会让此元素所有属性都变成 + if (hasDuplex && hasAttrValue && elem.nodeName === "INPUT" && elem.type === "text") { + log("warning!一个控件不能同时定义ms-attr-value与" + hasDuplex) + } + for (i = 0; binding = bindings[i]; i++) { + type = binding.type + if (rnoscanAttrBinding.test(type)) { + return executeBindings(bindings.slice(0, i + 1), vmodels) + } else if (scanNode) { + scanNode = !rnoscanNodeBinding.test(type) + } + } + + executeBindings(bindings, vmodels) } } + if (scanNode && !stopScan[elem.tagName] && (isWidget(elem) ? elem.msResolved : 1)) { + mergeTextNodes && mergeTextNodes(elem) + scanNodeList(elem, vmodels) //扫描子孙元素 - var rnoscanAttrBinding = /^if|widget|repeat$/ - var rnoscanNodeBinding = /^each|with|html|include$/ + } +} +var rnoscanAttrBinding = /^if|widget|repeat$/ +var rnoscanNodeBinding = /^each|with|html|include$/ //IE67下，在循环绑定中，一个节点如果是通过cloneNode得到，自定义属性的specified为false，无法进入里面的分支， //但如果我们去掉scanAttr中的attr.specified检测，一个元素会有80+个特性节点（因为它不区分固有属性与自定义属性），很容易卡死页面 - if (!"1" [0]) { - var attrPool = new Cache(512) - var rattrs = /\s+(ms-[^=\s]+)(?:=("[^"]*"|'[^']*'|[^\s>]+))?/g, +if (!W3C) { + var attrPool = new Cache(512) + var rattrs = /\s+([^=\s]+)(?:=("[^"]*"|'[^']*'|[^\s>]+))?/g, rquote = /^['"]/, rtag = /<\w+\b(?:(["'])[^"]*?(\1)|[^>])*>/i, ramp = /&/g - //IE6-8解析HTML5新标签，会将它分解两个元素节点与一个文本节点 - //
ddd
- // window.onload = function() { - // var body = document.body - // for (var i = 0, el; el = body.children[i++]; ) { - // avalon.log(el.outerHTML) - // } - // } - //依次输出
,
- var getAttributes = function (elem) { - var html = elem.outerHTML - //处理IE6-8解析HTML5新标签的情况，及
等半闭合标签outerHTML为空的情况 - if (html.slice(0, 2) === "
ddd
+// window.onload = function() { +// var body = document.body +// for (var i = 0, el; el = body.children[i++]; ) { +// avalon.log(el.outerHTML) +// } +// } +//依次输出
,
+ var getAttributes = function (elem) { + var html = elem.outerHTML + //处理IE6-8解析HTML5新标签的情况，及
等半闭合标签outerHTML为空的情况 + if (html.slice(0, 2) === " ms-important(1) --> ms-controller(2) --> ms-if(10) --> ms-repeat(100) + //--> ms-if-loop(110) --> ms-attr(970) ...--> ms-each(1400)-->ms-with(1500)--〉ms-duplex(2000)垫后 + var a = elem.getAttribute("ms-skip") + //#360 在旧式IE中 Object标签在引入Flash等资源时,可能出现没有getAttributeNode,innerHTML的情形 + if (!elem.getAttributeNode) { + return log("warning " + elem.tagName + " no getAttributeNode method") } - function scanTag(elem, vmodels, node) { - //扫描顺序 ms-skip(0) --> ms-important(1) --> ms-controller(2) --> ms-if(10) --> ms-repeat(100) - //--> ms-if-loop(110) --> ms-attr(970) ...--> ms-each(1400)-->ms-with(1500)--〉ms-duplex(2000)垫后 - var a = elem.getAttribute("ms-skip") - //#360 在旧式IE中 Object标签在引入Flash等资源时,可能出现没有getAttributeNode,innerHTML的情形 - if (!elem.getAttributeNode) { - return log("warning " + elem.tagName + " no getAttributeNode method") - } - var b = elem.getAttributeNode("ms-important") - var c = elem.getAttributeNode("ms-controller") - if (typeof a === "string") { + var b = elem.getAttributeNode("ms-important") + var c = elem.getAttributeNode("ms-controller") + if (typeof a === "string") { + return + } else if (node = b || c) { + var newVmodel = avalon.vmodels[node.value] + if (!newVmodel) { return - } else if (node = b || c) { - var newVmodel = avalon.vmodels[node.value] - if (!newVmodel) { - return - } - //ms-important不包含父VM，ms-controller相反 - vmodels = node === b ? [newVmodel] : [newVmodel].concat(vmodels) - var name = node.name - elem.removeAttribute(name) //removeAttributeNode不会刷新[ms-controller]样式规则 - avalon(elem).removeClass(name) - createSignalTower(elem, newVmodel) - } - scanAttr(elem, vmodels) //扫描特性节点 - } - var rhasHtml = /\|\s*html\s*/, - r11a = /\|\|/g, - rlt = /</g, - rgt = />/g, - rstringLiteral = /(['"])(\\\1|.)+?\1/g - function getToken(value, pos) { - if (value.indexOf("|") > 0) { - var scapegoat = value.replace( rstringLiteral, function(_){ - return Array(_.length+1).join("1")// jshint ignore:line - }) - var index = scapegoat.replace(r11a, "\u1122\u3344").indexOf("|") //干掉所有短路或 - if (index > -1) { - return { - filters: value.slice(index), - value: value.slice(0, index), - pos: pos || 0, - expr: true - } - } - } - return { - value: value, - filters: "", - expr: true } + //ms-important不包含父VM，ms-controller相反 + vmodels = node === b ? [newVmodel] : [newVmodel].concat(vmodels) + var name = node.name + elem.removeAttribute(name) //removeAttributeNode不会刷新[ms-controller]样式规则 + avalon(elem).removeClass(name) + createSignalTower(elem, newVmodel) } - function scanExpr(str) { - var tokens = [], - value, start = 0, - stop - do { - stop = str.indexOf(openTag, start) - if (stop === -1) { - break + scanAttr(elem, vmodels) //扫描特性节点 +} + + + +var rhasHtml = /\|\s*html(?:\b|$)/, + r11a = /\|\|/g, + rlt = /</g, + rgt = />/g, + rstringLiteral = /(['"])(\\\1|.)+?\1/g + +function getToken(value) { + if (value.indexOf("|") > 0) { + var scapegoat = value.replace(rstringLiteral, function (_) { + return Array(_.length + 1).join("1") // jshint ignore:line + }) + var index = scapegoat.replace(r11a, "\u1122\u3344").indexOf("|") //干掉所有短路或 + if (index > -1) { + return { + type: "text", + filters: value.slice(index).trim(), + expr: value.slice(0, index) } - value = str.slice(start, stop) - if (value) { // {{ 左边的文本 - tokens.push({ - value: value, - filters: "", - expr: false - }) - } - start = stop + openTag.length - stop = str.indexOf(closeTag, start) - if (stop === -1) { - break - } - value = str.slice(start, stop) - if (value) { //处理{{ }}插值表达式 - tokens.push(getToken(value, start)) - } - start = stop + closeTag.length - } while (1) - value = str.slice(start) - if (value) { //}} 右边的文本 + } + } + return { + type: "text", + expr: value, + filters: "" + } +} + +function scanExpr(str) { + var tokens = [], + value, start = 0, + stop + do { + stop = str.indexOf(openTag, start) + if (stop === -1) { + break + } + value = str.slice(start, stop) + if (value) { // {{ 左边的文本 tokens.push({ - value: value, - expr: false, - filters: "" + expr: value }) } - return tokens - } - - function scanText(textNode, vmodels) { - var bindings = [] - if (textNode.nodeType === 8) { - var token = getToken(textNode.nodeValue) - var tokens = [token] - } else { - tokens = scanExpr(textNode.data) + start = stop + openTag.length + stop = str.indexOf(closeTag, start) + if (stop === -1) { + break } - if (tokens.length) { - for (var i = 0; token = tokens[i++]; ) { - var node = DOC.createTextNode(token.value) //将文本转换为文本节点，并替换原来的文本节点 - if (token.expr) { - token.type = "text" - token.element = node - token.filters = token.filters.replace(rhasHtml, function() { + value = str.slice(start, stop) + if (value) { //处理{{ }}插值表达式 + tokens.push(getToken(value, start)) + } + start = stop + closeTag.length + } while (1) + value = str.slice(start) + if (value) { //}} 右边的文本 + tokens.push({ + expr: value + }) + } + return tokens +} + +function scanText(textNode, vmodels, index) { + var bindings = [], + tokens = scanExpr(textNode.data) + if (tokens.length) { + for (var i = 0, token; token = tokens[i++];) { + var node = DOC.createTextNode(token.expr) //将文本转换为文本节点，并替换原来的文本节点 + if (token.type) { + token.expr = token.expr.replace(roneTime, function () { + token.oneTime = true + return "" + }) // jshint ignore:line + token.element = node + token.filters = token.filters.replace(rhasHtml, function () { token.type = "html" return "" - })// jshint ignore:line - bindings.push(token) //收集带有插值表达式的文本 + }) // jshint ignore:line + token.pos = index * 1000 + i + bindings.push(token) //收集带有插值表达式的文本 + } + avalonFragment.appendChild(node) + } + textNode.parentNode.replaceChild(avalonFragment, textNode) + if (bindings.length) + executeBindings(bindings, vmodels) + } +} + + + +//使用来自游戏界的双缓冲技术,减少对视图的冗余刷新 +var Buffer = function () { + this.queue = [] +} +Buffer.prototype = { + render: function (isAnimate) { + if (!this.locked) { + this.locked = isAnimate ? root.offsetHeight + 10 : 1 + var me = this + avalon.nextTick(function () { + me.flush() + }) + } + }, + flush: function () { + for (var i = 0, sub; sub = this.queue[i++]; ) { + sub.update && sub.update() + } + this.locked = 0 + this.queue = [] + } +} + +var buffer = new Buffer() +var componentQueue = [] +var widgetList = [] +var componentHooks = { + $construct: function () { + return avalon.mix.apply(null, arguments) + }, + $ready: noop, + $init: noop, + $dispose: noop, + $container: null, + $childReady: noop, + $replace: false, + $extend: null, + $$template: function (str) { + return str + } +} + + +avalon.components = {} +avalon.component = function (name, opts) { + if (opts) { + avalon.components[name] = avalon.mix({}, componentHooks, opts) + } + for (var i = 0, obj; obj = componentQueue[i]; i++) { + if (name === obj.fullName) { + componentQueue.splice(i, 1) + i--; + + (function (host, hooks, elem, widget) { + + var dependencies = 1 + var library = host.library + var global = avalon.libraries[library] || componentHooks + + //===========收集各种配置======= + + var elemOpts = getOptionsFromTag(elem) + var vmOpts = getOptionsFromVM(host.vmodels, elemOpts.config || host.widget) + var $id = elemOpts.$id || elemOpts.identifier || generateID(widget) + delete elemOpts.config + delete elemOpts.$id + delete elemOpts.identifier + var componentDefinition = {} + + var parentHooks = avalon.components[hooks.$extend] + if (parentHooks) { + avalon.mix(true, componentDefinition, parentHooks) + componentDefinition = parentHooks.$construct.call(elem, componentDefinition, {}, {}) + } else { + avalon.mix(true, componentDefinition, hooks) } - avalonFragment.appendChild(node) - } - textNode.parentNode.replaceChild(avalonFragment, textNode) - if (bindings.length) - executeBindings(bindings, vmodels) + componentDefinition = avalon.components[name].$construct.call(elem, componentDefinition, vmOpts, elemOpts) + + componentDefinition.$refs = {} + componentDefinition.$id = $id + + //==========构建VM========= + var keepSolt = componentDefinition.$slot + var keepReplace = componentDefinition.$replace + var keepContainer = componentDefinition.$container + var keepTemplate = componentDefinition.$template + delete componentDefinition.$slot + delete componentDefinition.$replace + delete componentDefinition.$container + delete componentDefinition.$construct + + var vmodel = avalon.define(componentDefinition) || {} + elem.msResolved = 1 + vmodel.$init(vmodel, elem) + global.$init(vmodel, elem) + console.log("init") + var nodes = elem.childNodes + //收集插入点 + var slots = {}, snode + + for (var s = 0, el; el = nodes[s++]; ) { + var type = el.nodeType === 1 && el.getAttribute("slot") || keepSolt + if (type) { + if (slots[type]) { + slots[type].push(el) + } else { + slots[type] = [el] + } + } + } + + + if (vmodel.$$template) { + avalon.clearHTML(elem) + elem.innerHTML = vmodel.$$template(keepTemplate) + } + for (s in slots) { + if (vmodel.hasOwnProperty(s)) { + var ss = slots[s] + if (ss.length) { + var fragment = avalonFragment.cloneNode(true) + for (var ns = 0; snode = ss[ns++]; ) { + fragment.appendChild(snode) + } + vmodel[s] = fragment + } + slots[s] = null + } + } + slots = null + var child = elem.firstChild + if (keepReplace) { + child = elem.firstChild + elem.parentNode.replaceChild(child, elem) + child.msResolved = 1 + elem = host.element = child + } + if (keepContainer) { + keepContainer.appendChild(elem) + } + avalon.fireDom(elem, "datasetchanged", + {library: library, vm: vmodel, childReady: 1}) + var children = 0 + var removeFn = avalon.bind(elem, "datasetchanged", function (e) { + if (e.childReady && e.library === library) { + dependencies += e.childReady + if (vmodel !== e.vm) { + vmodel.$refs[e.vm.$id] = e.vm + if (e.childReady === -1) { + children++ + vmodel.$childReady(vmodel, elem, e) + } + e.stopPropagation() + } + } + console.log("dependencies "+dependencies) + if (dependencies === 0) { + var id1 = setTimeout(function () { + clearTimeout(id1) + + vmodel.$ready(vmodel, elem, host.vmodels) + global.$ready(vmodel, elem, host.vmodels) + }, children ? Math.max(children * 17, 100) : 17) + avalon.unbind(elem, "datasetchanged", removeFn) + //================== + host.rollback = function () { + try { + vmodel.$dispose(vmodel, elem) + global.$dispose(vmodel, elem) + } catch (e) { + } + delete avalon.vmodels[vmodel.$id] + } + injectDisposeQueue(host, widgetList) + if (window.chrome) { + elem.addEventListener("DOMNodeRemovedFromDocument", function () { + setTimeout(rejectDisposeQueue) + }) + } + + } + }) + scanTag(elem, [vmodel].concat(host.vmodels)) + + avalon.vmodels[vmodel.$id] = vmodel + avalon.log("添加组件VM: "+vmodel.$id) + if (!elem.childNodes.length) { + avalon.fireDom(elem, "datasetchanged", {library: library, vm: vmodel, childReady: -1}) + } else { + var id2 = setTimeout(function () { + clearTimeout(id2) + avalon.fireDom(elem, "datasetchanged", {library: library, vm: vmodel, childReady: -1}) + }, 17) + } + + + })(obj, avalon.components[name], obj.element, obj.widget)// jshint ignore:line + + } } +} - var bools = ["autofocus,autoplay,async,allowTransparency,checked,controls", - "declare,disabled,defer,defaultChecked,defaultSelected", - "contentEditable,isMap,loop,multiple,noHref,noResize,noShade", - "open,readOnly,selected" - ].join(",") - var boolMap = {} - bools.replace(rword, function(name) { - boolMap[name.toLowerCase()] = name - }) +avalon.fireDom = function (elem, type, opts) { + if (DOC.createEvent) { + var hackEvent = DOC.createEvent("Events"); + hackEvent.initEvent(type, true, true, opts) + avalon.mix(hackEvent, opts) - var propMap = { //属性名映射 - "accept-charset": "acceptCharset", - "char": "ch", - "charoff": "chOff", - "class": "className", - "for": "htmlFor", - "http-equiv": "httpEquiv" + elem.dispatchEvent(hackEvent) + } else if (root.contains(elem)) {//IE6-8触发事件必须保证在DOM树中,否则报"SCRIPT16389: 未指明的错误" + hackEvent = DOC.createEventObject() + avalon.mix(hackEvent, opts) + elem.fireEvent("on" + type, hackEvent) } +} - var anomaly = ["accessKey,bgColor,cellPadding,cellSpacing,codeBase,codeType,colSpan", - "dateTime,defaultValue,frameBorder,longDesc,maxLength,marginWidth,marginHeight", - "rowSpan,tabIndex,useMap,vSpace,valueType,vAlign" - ].join(",") - anomaly.replace(rword, function(name) { - propMap[name.toLowerCase()] = name - }) - var rnoscripts = /(?:[\s\S]+?)<\/noscript>/img - var rnoscriptText = /([\s\S]+?)<\/noscript>/im - - var getXHR = function() { - return new(window.XMLHttpRequest || ActiveXObject)("Microsoft.XMLHTTP") // jshint ignore:line - } - - var templatePool = avalon.templateCache = {} - - bindingHandlers.attr = function(data, vmodels) { - var text = data.value.trim(), - simple = true - if (text.indexOf(openTag) > -1 && text.indexOf(closeTag) > 2) { - simple = false - if (rexpr.test(text) && RegExp.rightContext === "" && RegExp.leftContext === "") { - simple = true - text = RegExp.$1 +function getOptionsFromVM(vmodels, pre) { + if (pre) { + for (var i = 0, v; v = vmodels[i++]; ) { + if (v.hasOwnProperty(pre) && typeof v[pre] === "object") { + var vmOptions = v[pre] + return vmOptions.$model || vmOptions + break } } - if (data.type === "include") { - var elem = data.element - data.includeRendered = getBindingCallback(elem, "data-include-rendered", vmodels) - data.includeLoaded = getBindingCallback(elem, "data-include-loaded", vmodels) - var outer = data.includeReplace = !! avalon(elem).data("includeReplace") + } + return {} +} + + + +avalon.libraries = [] +avalon.library = function (name, opts) { + if (DOC.namespaces) { + DOC.namespaces.add(name, 'http://www.w3.org/1999/xhtml'); + } + avalon.libraries[name] = avalon.mix({ + $init: noop, + $ready: noop, + $dispose: noop + }, opts || {}) +} + +avalon.library("ms") +/* +broswer nodeName scopeName localName +IE9 ONI:BUTTON oni button +IE10 ONI:BUTTON undefined oni:button +IE8 button oni undefined +chrome ONI:BUTTON undefined oni:button + +*/ +function isWidget(el) { //如果为自定义标签,返回UI库的名字 + if(el.scopeName && el.scopeName !== "HTML" ){ + return el.scopeName + } + var fullName = el.nodeName.toLowerCase() + var index = fullName.indexOf(":") + if (index > 0) { + return fullName.slice(0, index) + } +} +//各种MVVM框架在大型表格下的性能测试 +// https://github.com/RubyLouvre/avalon/issues/859 + + +var bools = ["autofocus,autoplay,async,allowTransparency,checked,controls", + "declare,disabled,defer,defaultChecked,defaultSelected", + "contentEditable,isMap,loop,multiple,noHref,noResize,noShade", + "open,readOnly,selected" +].join(",") +var boolMap = {} +bools.replace(rword, function (name) { + boolMap[name.toLowerCase()] = name +}) + +var propMap = {//属性名映射 + "accept-charset": "acceptCharset", + "char": "ch", + "charoff": "chOff", + "class": "className", + "for": "htmlFor", + "http-equiv": "httpEquiv" +} + +var anomaly = ["accessKey,bgColor,cellPadding,cellSpacing,codeBase,codeType,colSpan", + "dateTime,defaultValue,frameBorder,longDesc,maxLength,marginWidth,marginHeight", + "rowSpan,tabIndex,useMap,vSpace,valueType,vAlign" +].join(",") +anomaly.replace(rword, function (name) { + propMap[name.toLowerCase()] = name +}) + + +var attrDir = avalon.directive("attr", { + init: function (binding) { + //{{aaa}} --> aaa + //{{aaa}}/bbb.html --> (aaa) + "/bbb.html" + binding.expr = stringifyExpr(binding.expr.trim()) + if (binding.type === "include") { + var elem = binding.element + effectBinding(elem, binding) + binding.includeRendered = getBindingCallback(elem, "data-include-rendered", binding.vmodels) + binding.includeLoaded = getBindingCallback(elem, "data-include-loaded", binding.vmodels) + var outer = binding.includeReplace = !!avalon(elem).data("includeReplace") if (avalon(elem).data("includeCache")) { - data.templateCache = {} + binding.templateCache = {} } - data.startInclude = DOC.createComment("ms-include") - data.endInclude = DOC.createComment("ms-include-end") + binding.start = DOC.createComment("ms-include") + binding.end = DOC.createComment("ms-include-end") if (outer) { - data.element = data.startInclude - elem.parentNode.insertBefore(data.startInclude, elem) - elem.parentNode.insertBefore(data.endInclude, elem.nextSibling) + binding.element = binding.end + binding._element = elem + elem.parentNode.insertBefore(binding.start, elem) + elem.parentNode.insertBefore(binding.end, elem.nextSibling) } else { - elem.insertBefore(data.startInclude, elem.firstChild) - elem.appendChild(data.endInclude) + elem.insertBefore(binding.start, elem.firstChild) + elem.appendChild(binding.end) } } - data.handlerName = "attr" //handleName用于处理多种绑定共用同一种bindingExecutor的情况 - parseExprProxy(text, vmodels, data, (simple ? 0 : scanExpr(data.value))) - } - - bindingExecutors.attr = function(val, elem, data) { - var method = data.type, - attrName = data.param - if (method === "css") { - avalon(elem).css(attrName, val) - } else if (method === "attr") { + }, + update: function (val) { + var elem = this.element + var attrName = this.param + if (attrName === "href" || attrName === "src") { + if (typeof val === "string" && !root.hasAttribute) { + val = val.replace(/&/g, "&") //处理IE67自动转义的问题 + } + elem[attrName] = val + if (window.chrome && elem.tagName === "EMBED") { + var parent = elem.parentNode //#525 chrome1-37下embed标签动态设置src不能发生请求 + var comment = document.createComment("ms-src") + parent.replaceChild(comment, elem) + parent.replaceChild(elem, comment) + } + } else { // ms-attr-class="xxx" vm.xxx="aaa bbb ccc"将元素的className设置为aaa bbb ccc // ms-attr-class="xxx" vm.xxx=false 清空元素的所有类名 // ms-attr-name="yyy" vm.yyy="ooo" 为元素设置name属性 var toRemove = (val === false) || (val === null) || (val === void 0) - if (!W3C && propMap[attrName]) { //旧式IE下需要进行名字映射 attrName = propMap[attrName] } var bool = boolMap[attrName] if (typeof elem[bool] === "boolean") { - elem[bool] = !! val //布尔属性必须使用el.xxx = true|false方式设值 + elem[bool] = !!val //布尔属性必须使用el.xxx = true|false方式设值 if (!val) { //如果为false, IE全系列下相当于setAttribute(xxx,''),会影响到样式,需要进一步处理 toRemove = true } @@ -3403,636 +3686,851 @@ //SVG只能使用setAttribute(xxx, yyy), VML只能使用elem.xxx = yyy ,HTML的固有属性必须elem.xxx = yyy var isInnate = rsvg.test(elem) ? false : (DOC.namespaces && isVML(elem)) ? true : attrName in elem.cloneNode(false) if (isInnate) { - elem[attrName] = val + elem[attrName] = val + "" } else { elem.setAttribute(attrName, val) } - } else if (method === "include" && val) { - var vmodels = data.vmodels - var rendered = data.includeRendered - var loaded = data.includeLoaded - var replace = data.includeReplace - var target = replace ? elem.parentNode : elem - var scanTemplate = function(text) { - if (loaded) { - var newText = loaded.apply(target, [text].concat(vmodels)) - if (typeof newText === "string") - text = newText - } - if (rendered) { - checkScan(target, function() { - rendered.call(target) - }, NaN) - } - var lastID = data.includeLastID - if (data.templateCache && lastID && lastID !== val) { - var lastTemplate = data.templateCache[lastID] - if (!lastTemplate) { - lastTemplate = data.templateCache[lastID] = DOC.createElement("div") - ifGroup.appendChild(lastTemplate) - } - } - data.includeLastID = val - while (true) { - var node = data.startInclude.nextSibling - if (node && node !== data.endInclude) { - target.removeChild(node) - if (lastTemplate) - lastTemplate.appendChild(node) - } else { - break - } - } - var dom = getTemplateNodes(data, val, text) - var nodes = avalon.slice(dom.childNodes) - target.insertBefore(dom, data.endInclude) - scanNodeArray(nodes, vmodels) - } - - if (data.param === "src") { - if (typeof templatePool[val] === "string") { - avalon.nextTick(function() { - scanTemplate(templatePool[val]) - }) - } else if (Array.isArray(templatePool[val])) { //#805 防止在循环绑定中发出许多相同的请求 - templatePool[val].push(scanTemplate) - } else { - var xhr = getXHR() - xhr.onreadystatechange = function() { - if (xhr.readyState === 4) { - var s = xhr.status - if (s >= 200 && s < 300 || s === 304 || s === 1223) { - var text = xhr.responseText - for (var f = 0, fn; fn = templatePool[val][f++];) { - fn(text) - } - templatePool[val] = text - } - } - } - templatePool[val] = [scanTemplate] - xhr.open("GET", val, true) - if ("withCredentials" in xhr) { - xhr.withCredentials = true - } - xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest") - xhr.send(null) - } - } else { - //IE系列与够新的标准浏览器支持通过ID取得元素（firefox14+） - //http://tjvantoll.com/2012/07/19/dom-element-references-as-global-variables/ - var el = val && val.nodeType === 1 ? val : DOC.getElementById(val) - if (el) { - if (el.tagName === "NOSCRIPT" && !(el.innerHTML || el.fixIE78)) { //IE7-8 innerText,innerHTML都无法取得其内容，IE6能取得其innerHTML - xhr = getXHR() //IE9-11与chrome的innerHTML会得到转义的内容，它们的innerText可以 - xhr.open("GET", location, false) //谢谢Nodejs 乱炖群 深圳-纯属虚构 - xhr.send(null) - //http://bbs.csdn.net/topics/390349046?page=1#post-393492653 - var noscripts = DOC.getElementsByTagName("noscript") - var array = (xhr.responseText || "").match(rnoscripts) || [] - var n = array.length - for (var i = 0; i < n; i++) { - var tag = noscripts[i] - if (tag) { //IE6-8中noscript标签的innerHTML,innerText是只读的 - tag.style.display = "none" //http://haslayout.net/css/noscript-Ghost-Bug - tag.fixIE78 = (array[i].match(rnoscriptText) || ["", " "])[1] - } - } - } - avalon.nextTick(function() { - scanTemplate(el.fixIE78 || el.value || el.innerText || el.innerHTML) - }) - } - } - } else { - if (!root.hasAttribute && typeof val === "string" && (method === "src" || method === "href")) { - val = val.replace(/&/g, "&") //处理IE67自动转义的问题 - } - elem[method] = val - if (window.chrome && elem.tagName === "EMBED") { - var parent = elem.parentNode //#525 chrome1-37下embed标签动态设置src不能发生请求 - var comment = document.createComment("ms-src") - parent.replaceChild(comment, elem) - parent.replaceChild(elem, comment) - } } } +}) + - function getTemplateNodes(data, id, text) { - var div = data.templateCache && data.templateCache[id] - if (div) { - var dom = DOC.createDocumentFragment(), - firstChild - while (firstChild = div.firstChild) { - dom.appendChild(firstChild) - } - return dom - } - return avalon.parseHTML(text) - } //这几个指令都可以使用插值表达式，如ms-src="aaa/{{b}}/{{c}}.html" - "title,alt,src,value,css,include,href".replace(rword, function(name) { - bindingHandlers[name] = bindingHandlers.attr - }) -//根据VM的属性值或表达式的值切换类名，ms-class="xxx yyy zzz:flag" +"title,alt,src,value,css,include,href".replace(rword, function (name) { + directives[name] = attrDir +}) + +//根据VM的属性值或表达式的值切换类名，ms-class="xxx yyy zzz:flag" //http://www.cnblogs.com/rubylouvre/archive/2012/12/17/2818540.html - bindingHandlers["class"] = function(data, vmodels) { - var oldStyle = data.param, - text = data.value, - rightExpr - data.handlerName = "class" +avalon.directive("class", { + init: function (binding) { + var oldStyle = binding.param + var method = binding.type if (!oldStyle || isFinite(oldStyle)) { - data.param = "" //去掉数字 - var noExpr = text.replace(rexprg, function(a) { - return a.replace(/./g, "0") - //return Math.pow(10, a.length - 1) //将插值表达式插入10的N-1次方来占位 - }) - var colonIndex = noExpr.indexOf(":") //取得第一个冒号的位置 - if (colonIndex === -1) { // 比如 ms-class="aaa bbb ccc" 的情况 - var className = text - } else { // 比如 ms-class-1="ui-state-active:checked" 的情况 - className = text.slice(0, colonIndex) - rightExpr = text.slice(colonIndex + 1) - parseExpr(rightExpr, vmodels, data) //决定是添加还是删除 - if (!data.evaluator) { - log("debug: ms-class '" + (rightExpr || "").trim() + "' 不存在于VM中") - return false - } else { - data._evaluator = data.evaluator - data._args = data.args + binding.param = "" //去掉数字 + directives.effect.init(binding) + } else { + log('ms-' + method + '-xxx="yyy"这种用法已经过时,请使用ms-' + method + '="xxx:yyy"') + binding.expr = '[' + quote(oldStyle) + "," + binding.expr + "]" + binding.oldStyle = oldStyle + } + if (method === "hover" || method === "active") { //确保只绑定一次 + if (!binding.hasBindEvent) { + var elem = binding.element + var $elem = avalon(elem) + var activate = "mouseenter" //在移出移入时切换类名 + var abandon = "mouseleave" + if (method === "active") { //在聚焦失焦中切换类名 + elem.tabIndex = elem.tabIndex || -1 + activate = "mousedown" + abandon = "mouseup" + var fn0 = $elem.bind("mouseleave", function () { + binding.toggleClass && $elem.removeClass(binding.newClass) + }) } } - var hasExpr = rexpr.test(className) //比如ms-class="width{{w}}"的情况 - if (!hasExpr) { - data.immobileClass = className - } - parseExprProxy("", vmodels, data, (hasExpr ? scanExpr(className) : 0)) - } else { - data.immobileClass = data.oldStyle = data.param - parseExprProxy(text, vmodels, data) - } - } - bindingExecutors["class"] = function(val, elem, data) { - var $elem = avalon(elem), - method = data.type - if (method === "class" && data.oldStyle) { //如果是旧风格 - $elem.toggleClass(data.oldStyle, !! val) - } else { - //如果存在冒号就有求值函数 - data.toggleClass = data._evaluator ? !! data._evaluator.apply(elem, data._args) : true - data.newClass = data.immobileClass || val - if (data.oldClass && data.newClass !== data.oldClass) { - $elem.removeClass(data.oldClass) + var fn1 = $elem.bind(activate, function () { + binding.toggleClass && $elem.addClass(binding.newClass) + }) + var fn2 = $elem.bind(abandon, function () { + binding.toggleClass && $elem.removeClass(binding.newClass) + }) + binding.rollback = function () { + $elem.unbind("mouseleave", fn0) + $elem.unbind(activate, fn1) + $elem.unbind(abandon, fn2) } - data.oldClass = data.newClass - switch (method) { - case "class": - $elem.toggleClass(data.newClass, data.toggleClass) - break - case "hover": - case "active": - if (!data.hasBindEvent) { //确保只绑定一次 - var activate = "mouseenter" //在移出移入时切换类名 - var abandon = "mouseleave" - if (method === "active") { //在聚焦失焦中切换类名 - elem.tabIndex = elem.tabIndex || -1 - activate = "mousedown" - abandon = "mouseup" - var fn0 = $elem.bind("mouseleave", function() { - data.toggleClass && $elem.removeClass(data.newClass) - }) - } - var fn1 = $elem.bind(activate, function() { - data.toggleClass && $elem.addClass(data.newClass) - }) - var fn2 = $elem.bind(abandon, function() { - data.toggleClass && $elem.removeClass(data.newClass) - }) - data.rollback = function() { - $elem.unbind("mouseleave", fn0) - $elem.unbind(activate, fn1) - $elem.unbind(abandon, fn2) - } - data.hasBindEvent = true - } - break; + binding.hasBindEvent = true + } + + }, + update: function (arr) { + var binding = this + var $elem = avalon(this.element) + binding.newClass = arr[0] + binding.toggleClass = !!arr[1] + if (binding.oldClass && binding.newClass !== binding.oldClass) { + $elem.removeClass(binding.oldClass) + } + binding.oldClass = binding.newClass + if (binding.type === "class") { + if (binding.oldStyle) { + $elem.toggleClass(binding.oldStyle, !!arr[1]) + } else { + $elem.toggleClass(binding.newClass, binding.toggleClass) } } } +}) + +"hover,active".replace(rword, function (name) { + directives[name] = directives["class"] +}) + - "hover,active".replace(rword, function(method) { - bindingHandlers[method] = bindingHandlers["class"] - }) //ms-controller绑定已经在scanTag 方法中实现 -//ms-css绑定已由ms-attr绑定实现 +avalon.directive("css", { + init: directives.attr.init, + update: function (val) { + avalon(this.element).css(this.param, val) + } +}) - -// bindingHandlers.data 定义在if.js - bindingExecutors.data = function(val, elem, data) { - var key = "data-" + data.param +avalon.directive("data", { + priority: 100, + update: function (val) { + var elem = this.element + var key = "data-" + this.param if (val && typeof val === "object") { elem[key] = val } else { elem.setAttribute(key, String(val)) } } +}) + //双工绑定 - var duplexBinding = bindingHandlers.duplex = function(data, vmodels) { - var elem = data.element, - hasCast - parseExprProxy(data.value, vmodels, data, 0, 1) - - data.changed = getBindingCallback(elem, "data-duplex-changed", vmodels) || noop - if (data.evaluator && data.args) { - var params = [] - var casting = oneObject("string,number,boolean,checked") - if (elem.type === "radio" && data.param === "") { - data.param = "checked" - } - if (elem.msData) { - elem.msData["ms-duplex"] = data.value - } - data.param.replace(/\w+/g, function(name) { - if (/^(checkbox|radio)$/.test(elem.type) && /^(radio|checked)$/.test(name)) { - if (name === "radio") - log("ms-duplex-radio已经更名为ms-duplex-checked") - name = "checked" - data.isChecked = true - } - if (name === "bool") { - name = "boolean" - log("ms-duplex-bool已经更名为ms-duplex-boolean") - } else if (name === "text") { - name = "string" - log("ms-duplex-text已经更名为ms-duplex-string") - } - if (casting[name]) { - hasCast = true - } - avalon.Array.ensure(params, name) - }) - if (!hasCast) { - params.push("string") - } - data.param = params.join("-") - data.bound = function(type, callback) { - if (elem.addEventListener) { - elem.addEventListener(type, callback, false) - } else { - elem.attachEvent("on" + type, callback) - } - var old = data.rollback - data.rollback = function() { - elem.avalonSetter = null - avalon.unbind(elem, type, callback) - old && old() - } - } - for (var i in avalon.vmodels) { - var v = avalon.vmodels[i] - v.$fire("avalon-ms-duplex-init", data) - } - var cpipe = data.pipe || (data.pipe = pipe) - cpipe(null, data, "init") - var tagName = elem.tagName - duplexBinding[tagName] && duplexBinding[tagName](elem, data.evaluator.apply(null, data.args), data) +var rduplexType = /^(?:checkbox|radio)$/ +var rduplexParam = /^(?:radio|checked)$/ +var rnoduplexInput = /^(file|button|reset|submit|checkbox|radio|range)$/ +var duplexBinding = avalon.directive("duplex", { + priority: 2000, + init: function (binding, hasCast) { + var elem = binding.element + var vmodels = binding.vmodels + binding.changed = getBindingCallback(elem, "data-duplex-changed", vmodels) || noop + var params = [] + var casting = oneObject("string,number,boolean,checked") + if (elem.type === "radio" && binding.param === "") { + binding.param = "checked" } - } -//不存在 bindingExecutors.duplex - function fixNull(val) { - return val == null ? "" : val - } - avalon.duplexHooks = { - checked: { - get: function(val, data) { - return !data.element.oldValue - } - }, - string: { - get: function(val) { //同步到VM - return val - }, - set: fixNull - }, - "boolean": { - get: function(val) { - return val === "true" - }, - set: fixNull - }, - number: { - get: function(val, data) { - var number = parseFloat(val) - if (-val === -number) { - return number - } - var arr = /strong|medium|weak/.exec(data.element.getAttribute("data-duplex-number")) || ["medium"] - switch (arr[0]) { - case "strong": - return 0 - case "medium": - return val === "" ? "" : 0 - case "weak": - return val - } - }, - set: fixNull - } - } - function pipe(val, data, action, e) { - data.param.replace(/\w+/g, function(name) { - var hook = avalon.duplexHooks[name] - if (hook && typeof hook[action] === "function") { - val = hook[action](val, data) + binding.param.replace(rw20g, function (name) { + if (rduplexType.test(elem.type) && rduplexParam.test(name)) { + if (name === "radio") + log("ms-duplex-radio已经更名为ms-duplex-checked") + name = "checked" + binding.isChecked = true + binding.xtype = "radio" } + if (name === "bool") { + name = "boolean" + log("ms-duplex-bool已经更名为ms-duplex-boolean") + } else if (name === "text") { + name = "string" + log("ms-duplex-text已经更名为ms-duplex-string") + } + if (casting[name]) { + hasCast = true + } + avalon.Array.ensure(params, name) }) - return val - } - - var TimerID, ribbon = [] - - avalon.tick = function(fn) { - if (ribbon.push(fn) === 1) { - TimerID = setInterval(ticker, 60) + if (!hasCast) { + params.push("string") } - } - - function ticker() { - for (var n = ribbon.length - 1; n >= 0; n--) { - var el = ribbon[n] - if (el() === false) { - ribbon.splice(n, 1) + binding.param = params.join("-") + if (!binding.xtype) { + binding.xtype = elem.tagName === "SELECT" ? "select" : + elem.type === "checkbox" ? "checkbox" : + elem.type === "radio" ? "radio" : + /^change/.test(elem.getAttribute("data-duplex-event")) ? "change" : + "input" + } + //===================绑定事件====================== + binding.bound = function (type, callback) { + if (elem.addEventListener) { + elem.addEventListener(type, callback, false) + } else { + elem.attachEvent("on" + type, callback) + } + var old = binding.rollback + binding.rollback = function () { + elem.avalonSetter = null + avalon.unbind(elem, type, callback) + old && old() } } - if (!ribbon.length) { - clearInterval(TimerID) - } - } - - var watchValueInTimer = noop - var rmsinput = /text|password|hidden/ - new function() { // jshint ignore:line - try { //#272 IE9-IE11, firefox - var setters = {} - var aproto = HTMLInputElement.prototype - var bproto = HTMLTextAreaElement.prototype - - function newSetter(value) { // jshint ignore:line - if (avalon.optimize || this.parentNode) { - setters[this.tagName].call(this, value) - if (!rmsinput.test(this.type)) - return - if (!this.msFocus && this.avalonSetter) { - this.avalonSetter() - } - } - } - var inputProto = HTMLInputElement.prototype - Object.getOwnPropertyNames(inputProto) //故意引发IE6-8等浏览器报错 - setters["INPUT"] = Object.getOwnPropertyDescriptor(aproto, "value").set - Object.defineProperty(aproto, "value", { - set: newSetter - }) - setters["TEXTAREA"] = Object.getOwnPropertyDescriptor(bproto, "value").set - Object.defineProperty(bproto, "value", { - set: newSetter - }) - } catch (e) { - //在chrome 43中 ms-duplex终于不需要使用定时器实现双向绑定了 - // http://updates.html5rocks.com/2015/04/DOM-attributes-now-on-the-prototype - // https://docs.google.com/document/d/1jwA8mtClwxI-QJuHT7872Z0pxpZz8PBkf2bGAbsUtqs/edit?pli=1 - watchValueInTimer = avalon.tick - } - } // jshint ignore:line - if (IEVersion) { - avalon.bind(DOC, "selectionchange", function(e) { - var el = DOC.activeElement - if (el && typeof el.avalonSetter === "function") { - el.avalonSetter() - } - }) - } - -//处理radio, checkbox, text, textarea, password - duplexBinding.INPUT = function(element, evaluator, data) { - var $type = element.type, - bound = data.bound, - $elem = avalon(element), - composing = false - + var composing = false function callback(value) { - data.changed.call(this, value, data) + binding.changed.call(this, value, binding) } - function compositionStart() { composing = true } - function compositionEnd() { composing = false } - //当value变化时改变model的值 - var updateVModel = function() { - if (composing) //处理中文输入法在minlengh下引发的BUG + var updateVModel = function () { + var val = elem.value //防止递归调用形成死循环 + if (composing || val === binding.oldValue) //处理中文输入法在minlengh下引发的BUG return - var val = element.oldValue = element.value //防止递归调用形成死循环 - var lastValue = data.pipe(val, data, "get") - if ($elem.data("duplexObserve") !== false) { - evaluator(lastValue) - callback.call(element, lastValue) - if ($elem.data("duplex-focus")) { - avalon.nextTick(function() { - element.focus() - }) - } + var lastValue = binding.pipe(val, binding, "get") + try { + binding.setter(lastValue) + callback.call(elem, lastValue) + } catch (ex) { + log(ex) } } - //当model变化时,它就会改变value的值 - data.handler = function() { - var val = data.pipe(evaluator(), data, "set") + "" //fix #673 - if (val !== element.oldValue) { - element.value = val - } - } - if (data.isChecked || $type === "radio") { - var IE6 = IEVersion === 6 - updateVModel = function() { - if ($elem.data("duplexObserve") !== false) { - var lastValue = data.pipe(element.value, data, "get") - evaluator(lastValue) - callback.call(element, lastValue) - } - } - data.handler = function() { - var val = evaluator() - var checked = data.isChecked ? !! val : val + "" === element.value - element.oldValue = checked - if (IE6) { - setTimeout(function() { - //IE8 checkbox, radio是使用defaultChecked控制选中状态， - //并且要先设置defaultChecked后设置checked - //并且必须设置延迟 - element.defaultChecked = checked - element.checked = checked - }, 31) - } else { - element.checked = checked - } - } - bound("click", updateVModel) - } else if ($type === "checkbox") { - updateVModel = function() { - if ($elem.data("duplexObserve") !== false) { - var method = element.checked ? "ensure" : "remove" - var array = evaluator() + switch (binding.xtype) { + case "radio": + binding.bound("click", function () { + var lastValue = binding.pipe(elem.value, binding, "get") + try { + binding.setter(lastValue) + callback.call(elem, lastValue) + } catch (ex) { + log(ex) + } + }) + break + case "checkbox": + binding.bound(W3C ? "change" : "click", function () { + var method = elem.checked ? "ensure" : "remove" + var array = binding.getter.apply(0, binding.vmodels) if (!Array.isArray(array)) { log("ms-duplex应用于checkbox上要对应一个数组") array = [array] } - avalon.Array[method](array, data.pipe(element.value, data, "get")) - callback.call(element, array) - } - } - - data.handler = function() { - var array = [].concat(evaluator()) //强制转换为数组 - element.checked = array.indexOf(data.pipe(element.value, data, "get")) > -1 - } - bound(W3C ? "change" : "click", updateVModel) - } else { - var events = element.getAttribute("data-duplex-event") || "input" - if (element.attributes["data-event"]) { - log("data-event指令已经废弃，请改用data-duplex-event") - } - - function delay(e) { // jshint ignore:line - setTimeout(function() { - updateVModel(e) + var val = binding.pipe(elem.value, binding, "get") + avalon.Array[method](array, val) + callback.call(elem, array) }) - } - events.replace(rword, function(name) { - switch (name) { - case "input": - if (!IEVersion) { // W3C - bound("input", updateVModel) - //非IE浏览器才用这个 - bound("compositionstart", compositionStart) - bound("compositionend", compositionEnd) - bound("DOMAutoComplete", updateVModel) - } else { //onpropertychange事件无法区分是程序触发还是用户触发 - // IE下通过selectionchange事件监听IE9+点击input右边的X的清空行为，及粘贴，剪切，删除行为 - if (IEVersion > 8) { - bound("input", updateVModel) //IE9使用propertychange无法监听中文输入改动 - } else { - bound("propertychange", function(e) { //IE6-8下第一次修改时不会触发,需要使用keydown或selectionchange修正 - if (e.propertyName === "value") { - updateVModel() - } - }) + break + case "change": + binding.bound("change", updateVModel) + break + case "input": + if (!IEVersion) { // W3C + binding.bound("input", updateVModel) + //非IE浏览器才用这个 + binding.bound("compositionstart", compositionStart) + binding.bound("compositionend", compositionEnd) + binding.bound("DOMAutoComplete", updateVModel) + } else { //onpropertychange事件无法区分是程序触发还是用户触发 + // IE下通过selectionchange事件监听IE9+点击input右边的X的清空行为，及粘贴，剪切，删除行为 + if (IEVersion > 8) { + binding.bound("input", updateVModel) //IE9使用propertychange无法监听中文输入改动 + } else { + binding.bound("propertychange", function (e) { //IE6-8下第一次修改时不会触发,需要使用keydown或selectionchange修正 + if (e.propertyName === "value") { + updateVModel() } - bound("dragend", delay) - //http://www.cnblogs.com/rubylouvre/archive/2013/02/17/2914604.html - //http://www.matts411.com/post/internet-explorer-9-oninput/ - } - break - default: - bound(name, updateVModel) - break - } - }) - bound("focus", function() { - element.msFocus = true - }) - bound("blur", function() { - element.msFocus = false - }) - - if (rmsinput.test($type)) { - watchValueInTimer(function() { - if (avalon.optimize || element.parentNode) { - if (!element.msFocus && element.oldValue !== element.value) { + }) + } + binding.bound("dragend", function () { + setTimeout(function () { updateVModel() + }, 17) + }) + //http://www.cnblogs.com/rubylouvre/archive/2013/02/17/2914604.html + //http://www.matts411.com/post/internet-explorer-9-oninput/ + } + break + case "select": + binding.bound("change", function () { + var val = avalon(elem).val() //字符串或字符串数组 + if (Array.isArray(val)) { + val = val.map(function (v) { + return binding.pipe(v, binding, "get") + }) + } else { + val = binding.pipe(val, binding, "get") + } + if (val + "" !== binding.oldValue) { + try { + binding.setter(val) + callback.call(elem, val) + } catch (ex) { + log(ex) } - } else if (!element.msRetain) { - return false } }) + binding.bound("datasetchanged", function (e) { + if (e.bubble === "selectDuplex") { + var value = binding._value + var curValue = Array.isArray(value) ? value.map(String) : value + "" + avalon(elem).val(curValue) + elem.oldValue = curValue + "" + binding.changed.call(elem, curValue) + } + }) + break + } + if (binding.xtype === "input" && !rnoduplexInput.test(elem.type)) { + if (elem.type !== "hidden") { + binding.bound("focus", function () { + elem.msFocus = true + }) + binding.bound("blur", function () { + elem.msFocus = false + }) } - - element.avalonSetter = updateVModel //#765 + elem.avalonSetter = updateVModel //#765 + watchValueInTimer(function () { + if (elem.contains(elem)) { + if (!this.msFocus && binding.oldValue !== elem.value) { + updateVModel() + } + } else if (!elem.msRetain) { + return false + } + }) } - element.oldValue = element.value - avalon.injectBinding(data) - callback.call(element, element.value) - } - duplexBinding.TEXTAREA = duplexBinding.INPUT - duplexBinding.SELECT = function(element, evaluator, data) { - var $elem = avalon(element) - - function updateVModel() { - if ($elem.data("duplexObserve") !== false) { - var val = $elem.val() //字符串或字符串数组 - if (Array.isArray(val)) { - val = val.map(function(v) { - return data.pipe(v, data, "get") - }) + }, + update: function (value) { + var elem = this.element, binding = this, curValue + if (!this.init) { + for (var i in avalon.vmodels) { + var v = avalon.vmodels[i] + v.$fire("avalon-ms-duplex-init", binding) + } + var cpipe = binding.pipe || (binding.pipe = pipe) + cpipe(null, binding, "init") + this.init = 1 + } + switch (this.xtype) { + case "input": + case "change": + curValue = this.pipe(value, this, "set") //fix #673 + if (curValue !== this.oldValue) { + var fixCaret = false + if (elem.msFocus) { + var pos = getCaret(elem) + if (pos.start === pos.end) { + pos = pos.start + fixCaret = true + } + } + elem.value = this.oldValue = curValue + if (fixCaret) { + setCaret(element, pos, pos) + } + } + break + case "radio": + curValue = binding.isChecked ? !!value : value + "" === elem.value + if (IEVersion === 6) { + setTimeout(function () { + //IE8 checkbox, radio是使用defaultChecked控制选中状态， + //并且要先设置defaultChecked后设置checked + //并且必须设置延迟 + elem.defaultChecked = curValue + elem.checked = curValue + }, 31) } else { - val = data.pipe(val, data, "get") + elem.checked = curValue } - if (val + "" !== element.oldValue) { - evaluator(val) + break + case "checkbox": + var array = [].concat(value) //强制转换为数组 + curValue = this.pipe(elem.value, this, "get") + elem.checked = array.indexOf(curValue) > -1 + break + case "select": + //必须变成字符串后才能比较 + binding._value = value + if(!elem.msHasEvent){ + elem.msHasEvent = "selectDuplex" + //必须等到其孩子准备好才触发 + }else{ + avalon.fireDom(elem, "datasetchanged", { + bubble: elem.msHasEvent + }) } - data.changed.call(element, val, data) - } + break } - data.handler = function() { - var val = evaluator() - val = val && val.$model || val - if (Array.isArray(val)) { - if (!element.multiple) { - log("ms-duplex在不能对应一个数组") - } - } - //必须变成字符串后才能比较 - val = Array.isArray(val) ? val.map(String) : val + "" - if (val + "" !== element.oldValue) { - $elem.val(val) - element.oldValue = val + "" - } - } - data.bound("change", updateVModel) - element.msCallback = function() { - avalon.injectBinding(data) - data.changed.call(element, evaluator(), data) + if (binding.xtype !== "select") { + binding.changed.call(elem, curValue) } } -// bindingHandlers.html 定义在if.js - bindingExecutors.html = function (val, elem, data) { +}) + +if (IEVersion) { + avalon.bind(DOC, "selectionchange", function (e) { + var el = DOC.activeElement + if (el && typeof el.avalonSetter === "function") { + el.avalonSetter() + } + }) +} + +function fixNull(val) { + return val == null ? "" : val +} +avalon.duplexHooks = { + checked: { + get: function (val, binding) { + return !binding.oldValue + } + }, + string: { + get: function (val) { //同步到VM + return val + }, + set: fixNull + }, + "boolean": { + get: function (val) { + return val === "true" + }, + set: fixNull + }, + number: { + get: function (val, binding) { + var number = parseFloat(val + "") + if (-val === -number) { + return number + } + + var arr = /strong|medium|weak/.exec(binding.element.getAttribute("data-duplex-number")) || ["medium"] + switch (arr[0]) { + case "strong": + return 0 + case "medium": + return val === "" ? "" : 0 + case "weak": + return val + } + }, + set: fixNull + } +} + +function pipe(val, binding, action) { + binding.param.replace(rw20g, function (name) { + var hook = avalon.duplexHooks[name] + if (hook && typeof hook[action] === "function") { + val = hook[action](val, binding) + } + }) + return val +} + +var TimerID, ribbon = [] + +avalon.tick = function (fn) { + if (ribbon.push(fn) === 1) { + TimerID = setInterval(ticker, 60) + } +} + +function ticker() { + for (var n = ribbon.length - 1; n >= 0; n--) { + var el = ribbon[n] + if (el() === false) { + ribbon.splice(n, 1) + } + } + if (!ribbon.length) { + clearInterval(TimerID) + } +} + +var watchValueInTimer = noop +new function () { // jshint ignore:line + try { //#272 IE9-IE11, firefox + var setters = {} + var aproto = HTMLInputElement.prototype + var bproto = HTMLTextAreaElement.prototype + function newSetter(value) { // jshint ignore:line + setters[this.tagName].call(this, value) + if (!this.msFocus && this.avalonSetter && this.oldValue !== value) { + this.avalonSetter() + } + } + var inputProto = HTMLInputElement.prototype + Object.getOwnPropertyNames(inputProto) //故意引发IE6-8等浏览器报错 + setters["INPUT"] = Object.getOwnPropertyDescriptor(aproto, "value").set + + Object.defineProperty(aproto, "value", { + set: newSetter + }) + setters["TEXTAREA"] = Object.getOwnPropertyDescriptor(bproto, "value").set + Object.defineProperty(bproto, "value", { + set: newSetter + }) + } catch (e) { + //在chrome 43中 ms-duplex终于不需要使用定时器实现双向绑定了 + // http://updates.html5rocks.com/2015/04/DOM-attributes-now-on-the-prototype + // https://docs.google.com/document/d/1jwA8mtClwxI-QJuHT7872Z0pxpZz8PBkf2bGAbsUtqs/edit?pli=1 + watchValueInTimer = avalon.tick + } +} // jshint ignore:line +function getCaret(ctrl, start, end) { + if (ctrl.setSelectionRange) { + start = ctrl.selectionStart + end = ctrl.selectionEnd + } else if (document.selection && document.selection.createRange) { + var range = document.selection.createRange() + start = 0 - range.duplicate().moveStart('character', -100000) + end = start + range.text.length + } + return { + start: start, + end: end + } +} +function setCaret(ctrl, begin, end) { + if (!ctrl.value || ctrl.readOnly) + return + if (ctrl.setSelectionRange) { + ctrl.selectionStart = begin + ctrl.selectionEnd = end + } else { + var range = ctrl.createTextRange() + range.collapse(true); + range.moveStart("character", begin) + range.moveEnd("character", end - begin) + range.select() + } +} + +avalon.directive("effect", { + priority: 5, + init: function (binding) { + var text = binding.expr, + className, + rightExpr + var colonIndex = text.replace(rexprg, function (a) { + return a.replace(/./g, "0") + }).indexOf(":") //取得第一个冒号的位置 + if (colonIndex === -1) { // 比如 ms-class/effect="aaa bbb ccc" 的情况 + className = text + rightExpr = true + } else { // 比如 ms-class/effect-1="ui-state-active:checked" 的情况 + className = text.slice(0, colonIndex) + rightExpr = text.slice(colonIndex + 1) + } + if (!rexpr.test(text)) { + className = quote(className) + } else { + className = stringifyExpr(className) + } + binding.expr = "[" + className + "," + rightExpr + "]" + }, + update: function (arr) { + var name = arr[0] + var elem = this.element + if (elem.getAttribute("data-effect-name") === name) { + return + } else { + elem.removeAttribute("data-effect-driver") + } + var inlineStyles = elem.style + var computedStyles = window.getComputedStyle ? window.getComputedStyle(elem) : null + var useAni = false + if (computedStyles && (supportTransition || supportAnimation)) { + + //如果支持CSS动画 + var duration = inlineStyles[transitionDuration] || computedStyles[transitionDuration] + if (duration && duration !== '0s') { + elem.setAttribute("data-effect-driver", "t") + useAni = true + } + + if (!useAni) { + + duration = inlineStyles[animationDuration] || computedStyles[animationDuration] + if (duration && duration !== '0s') { + elem.setAttribute("data-effect-driver", "a") + useAni = true + } + + } + } + + if (!useAni) { + if (avalon.effects[name]) { + elem.setAttribute("data-effect-driver", "j") + useAni = true + } + } + if (useAni) { + elem.setAttribute("data-effect-name", name) + } + } +}) + +avalon.effects = {} +avalon.effect = function (name, callbacks) { + avalon.effects[name] = callbacks +} + + + +var supportTransition = false +var supportAnimation = false + +var transitionEndEvent +var animationEndEvent +var transitionDuration = avalon.cssName("transition-duration") +var animationDuration = avalon.cssName("animation-duration") +new function () {// jshint ignore:line + var checker = { + 'TransitionEvent': 'transitionend', + 'WebKitTransitionEvent': 'webkitTransitionEnd', + 'OTransitionEvent': 'oTransitionEnd', + 'otransitionEvent': 'otransitionEnd' + } + var tran + //有的浏览器同时支持私有实现与标准写法，比如webkit支持前两种，Opera支持1、3、4 + for (var name in checker) { + if (window[name]) { + tran = checker[name] + break; + } + try { + var a = document.createEvent(name); + tran = checker[name] + break; + } catch (e) { + } + } + if (typeof tran === "string") { + supportTransition = true + transitionEndEvent = tran + } + + //大致上有两种选择 + //IE10+, Firefox 16+ & Opera 12.1+: animationend + //Chrome/Safari: webkitAnimationEnd + //http://blogs.msdn.com/b/davrous/archive/2011/12/06/introduction-to-css3-animat ions.aspx + //IE10也可以使用MSAnimationEnd监听，但是回调里的事件 type依然为animationend + // el.addEventListener("MSAnimationEnd", function(e) { + // alert(e.type)// animationend！！！ + // }) + checker = { + 'AnimationEvent': 'animationend', + 'WebKitAnimationEvent': 'webkitAnimationEnd' + } + var ani; + for (name in checker) { + if (window[name]) { + ani = checker[name]; + break; + } + } + if (typeof ani === "string") { + supportTransition = true + animationEndEvent = ani + } + +}() + +var effectPool = []//重复利用动画实例 +function effectFactory(el, opts) { + if (!el || el.nodeType !== 1) { + return null + } + if (opts) { + var name = opts.effectName + var driver = opts.effectDriver + } else { + name = el.getAttribute("data-effect-name") + driver = el.getAttribute("data-effect-driver") + } + if (!name || !driver) { + return null + } + + var instance = effectPool.pop() || new Effect() + instance.el = el + instance.driver = driver + instance.useCss = driver !== "j" + if (instance.useCss) { + opts && avalon(el).addClass(opts.effectClass) + instance.cssEvent = driver === "t" ? transitionEndEvent : animationEndEvent + } + instance.name = name + instance.callbacks = avalon.effects[name] || {} + + return instance + + +} + +function effectBinding(elem, binding) { + var name = elem.getAttribute("data-effect-name") + if (name) { + binding.effectName = name + binding.effectDriver = elem.getAttribute("data-effect-driver") + var stagger = +elem.getAttribute("data-effect-stagger") + binding.effectLeaveStagger = +elem.getAttribute("data-effect-leave-stagger") || stagger + binding.effectEnterStagger = +elem.getAttribute("data-effect-enter-stagger") || stagger + binding.effectClass = elem.className || NaN + } +} +function upperFirstChar(str) { + return str.replace(/^[\S]/g, function (m) { + return m.toUpperCase() + }) +} +var effectBuffer = new Buffer() +function Effect() { +}// 动画实例,做成类的形式,是为了共用所有原型方法 + +Effect.prototype = { + contrustor: Effect, + enterClass: function () { + return getEffectClass(this, "enter") + }, + leaveClass: function () { + return getEffectClass(this, "leave") + }, + // 共享一个函数 + actionFun: function (name, before, after) { + if (document.hidden) { + return + } + var me = this + var el = me.el + var isLeave = name === "leave" + name = isLeave ? "leave" : "enter" + var oppositeName = isLeave ? "enter" : "leave" + callEffectHook(me, "abort" + upperFirstChar(oppositeName)) + callEffectHook(me, "before" + upperFirstChar(name)) + if (!isLeave) + before(el) // 这里可能做插入DOM树的操作,因此必须在修改类名前执行 + var cssCallback = function (cancel) { + el.removeEventListener(me.cssEvent, me.cssCallback) + if (isLeave) { + before(el) //这里可能做移出DOM树操作,因此必须位于动画之后 + avalon(el).removeClass(me.cssClass) + } else { + if (me.driver === "a") { + avalon(el).removeClass(me.cssClass) + } + } + if (cancel !== true) { + callEffectHook(me, "after" + upperFirstChar(name)) + after && after(el) + } + me.dispose() + } + if (me.useCss) { + if (me.cssCallback) { //如果leave动画还没有完成,立即完成 + me.cssCallback(true) + } + + me.cssClass = getEffectClass(me, name) + me.cssCallback = cssCallback + + me.update = function () { + el.addEventListener(me.cssEvent, me.cssCallback) + if (!isLeave && me.driver === "t") {//transtion延迟触发 + avalon(el).removeClass(me.cssClass) + } + } + avalon(el).addClass(me.cssClass)//animation会立即触发 + + effectBuffer.render(true) + effectBuffer.queue.push(me) + + } else { + callEffectHook(me, name, cssCallback) + + } + }, + enter: function (before, after) { + this.actionFun.apply(this, ["enter"].concat(avalon.slice(arguments))) + + }, + leave: function (before, after) { + this.actionFun.apply(this, ["leave"].concat(avalon.slice(arguments))) + + }, + dispose: function () {//销毁与回收到池子中 + this.update = this.cssCallback = null + if (effectPool.unshift(this) > 100) { + effectPool.pop() + } + } + + +} + + +function getEffectClass(instance, type) { + var a = instance.callbacks[type + "Class"] + if (typeof a === "string") + return a + if (typeof a === "function") + return a() + return instance.name + "-" + type +} + + +function callEffectHook(effect, name, cb) { + var hook = effect.callbacks[name] + if (hook) { + hook.call(effect, effect.el, cb) + } +} + +var applyEffect = function (el, dir/*[before, [after, [opts]]]*/) { + var args = aslice.call(arguments, 0) + if (typeof args[2] !== "function") { + args.splice(2, 0, noop) + } + if (typeof args[3] !== "function") { + args.splice(3, 0, noop) + } + var before = args[2] + var after = args[3] + var opts = args[4] + var effect = effectFactory(el, opts) + if (!effect) { + before() + after() + return false + } else { + var method = dir ? 'enter' : 'leave' + effect[method](before, after) + } +} + +avalon.mix(avalon.effect, { + apply: applyEffect, + append: function (el, parent, after, opts) { + return applyEffect(el, 1, function () { + parent.appendChild(el) + }, after, opts) + }, + before: function (el, target, after, opts) { + return applyEffect(el, 1, function () { + target.parentNode.insertBefore(el, target) + }, after, opts) + }, + remove: function (el, parent, after, opts) { + return applyEffect(el, 0, function () { + if (el.parentNode === parent) + parent.removeChild(el) + }, after, opts) + } +}) + + +avalon.directive("html", { + update: function (val) { + var binding = this + var elem = this.element var isHtmlFilter = elem.nodeType !== 1 var parent = isHtmlFilter ? elem.parentNode : elem if (!parent) return val = val == null ? "" : val - if (data.oldText !== val) { - data.oldText = val - } else { - return - } + if (elem.nodeType === 3) { var signature = generateID("html") parent.insertBefore(DOC.createComment(signature), elem) - data.element = DOC.createComment(signature + ":end") - parent.replaceChild(data.element, elem) - elem = data.element + binding.element = DOC.createComment(signature + ":end") + parent.replaceChild(binding.element, elem) + elem = binding.element } if (typeof val !== "object") {//string, number, boolean var fragment = avalon.parseHTML(String(val)) @@ -4062,56 +4560,303 @@ } else { avalon.clearHTML(elem).appendChild(fragment) } - scanNodeArray(nodes, data.vmodels) + scanNodeArray(nodes, binding.vmodels) } - bindingHandlers["if"] = - bindingHandlers.data = - bindingHandlers.text = - bindingHandlers.html = - function(data, vmodels) { - parseExprProxy(data.value, vmodels, data) - } +}) - bindingExecutors["if"] = function(val, elem, data) { +avalon.directive("if", { + priority: 10, + update: function (val) { + var binding = this + var elem = this.element + var stamp = binding.stamp = +new Date() + var par + var after = function () { + if (stamp !== binding.stamp) + return + binding.recoverNode = null + } + if (binding.recoverNode) + binding.recoverNode() // 还原现场，有移动节点的都需要还原现场 try { - if(!elem.parentNode) return - } catch(e) {return} + if (!elem.parentNode) + return + par = elem.parentNode + } catch (e) { + return + } if (val) { //插回DOM树 + function alway() {// jshint ignore:line + if (elem.getAttribute(binding.name)) { + elem.removeAttribute(binding.name) + scanAttr(elem, binding.vmodels) + } + binding.rollback = null + } if (elem.nodeType === 8) { - elem.parentNode.replaceChild(data.template, elem) - // animate.enter(data.template, elem.parentNode) - elem = data.element = data.template //这时可能为null + var keep = binding.keep + var hasEffect = avalon.effect.apply(keep, 1, function () { + if (stamp !== binding.stamp) + return + elem.parentNode.replaceChild(keep, elem) + elem = binding.element = keep //这时可能为null + if (keep.getAttribute("_required")) {//#1044 + elem.required = true + elem.removeAttribute("_required") + } + if (elem.querySelectorAll) { + avalon.each(elem.querySelectorAll("[_required=true]"), function (el) { + el.required = true + el.removeAttribute("_required") + }) + } + alway() + }, after) + hasEffect = hasEffect === false } - if (elem.getAttribute(data.name)) { - elem.removeAttribute(data.name) - scanAttr(elem, data.vmodels) - } - data.rollback = null + if (!hasEffect) + alway() } else { //移出DOM树，并用注释节点占据原位置 if (elem.nodeType === 1) { - var node = data.element = DOC.createComment("ms-if") - elem.parentNode.replaceChild(node, elem) - // animate.leave(elem, node.parentNode, node) - data.template = elem //元素节点 - ifGroup.appendChild(elem) - data.rollback = function() { - if (elem.parentNode === ifGroup) { - ifGroup.removeChild(elem) + if (elem.required === true) { + elem.required = false + elem.setAttribute("_required", "true") + } + try {// 如果不支持querySelectorAll或:required,可以直接无视 + avalon.each(elem.querySelectorAll(":required"), function (el) { + elem.required = false + el.setAttribute("_required", "true") + }) + } catch (e) { + } + + var node = binding.element = DOC.createComment("ms-if"), + pos = elem.nextSibling + binding.recoverNode = function () { + binding.recoverNode = null + if (node.parentNode !== par) { + par.insertBefore(node, pos) + binding.keep = elem } } + + avalon.effect.apply(elem, 0, function () { + binding.recoverNode = null + if (stamp !== binding.stamp) + return + elem.parentNode.replaceChild(node, elem) + binding.keep = elem //元素节点 + ifGroup.appendChild(elem) + binding.rollback = function () { + if (elem.parentNode === ifGroup) { + ifGroup.removeChild(elem) + } + } + }, after) } } } -//ms-important绑定已经在scanTag 方法中实现 -//ms-include绑定已由ms-attr绑定实现 +}) - var rdash = /\(([^)]*)\)/ - bindingHandlers.on = function(data, vmodels) { - var value = data.value - data.type = "on" - var eventType = data.param.replace(/-\d+$/, "") // ms-on-mousemove-10 - if (typeof bindingHandlers.on[eventType + "Hook"] === "function") { - bindingHandlers.on[eventType + "Hook"](data) + + +//ms-important绑定已经在scanTag 方法中实现 +var rnoscripts = /(?:[\s\S]+?)<\/noscript>/img +var rnoscriptText = /([\s\S]+?)<\/noscript>/im + +var getXHR = function () { + return new (window.XMLHttpRequest || ActiveXObject)("Microsoft.XMLHTTP") // jshint ignore:line +} +//将所有远程加载的模板,以字符串形式存放到这里 +var templatePool = avalon.templateCache = {} + +function getTemplateContainer(binding, id, text) { + var div = binding.templateCache && binding.templateCache[id] + if (div) { + var dom = DOC.createDocumentFragment(), + firstChild + while (firstChild = div.firstChild) { + dom.appendChild(firstChild) + } + return dom + } + return avalon.parseHTML(text) + +} +function nodesToFrag(nodes) { + var frag = DOC.createDocumentFragment() + for (var i = 0, len = nodes.length; i < len; i++) { + frag.appendChild(nodes[i]) + } + return frag +} +avalon.directive("include", { + init: directives.attr.init, + update: function (val) { + var binding = this + var elem = this.element + var vmodels = binding.vmodels + var rendered = binding.includeRendered + var effectClass = binding.effectName && binding.effectClass // 是否开启动画 + var templateCache = binding.templateCache // 是否data-include-cache + var outer = binding.includeReplace // 是否data-include-replace + var loaded = binding.includeLoaded + var target = outer ? elem.parentNode : elem + var _ele = binding._element // data-include-replace binding.element === binding.end + + binding.recoverNodes = binding.recoverNodes || avalon.noop + var scanTemplate = function (text) { + var _stamp = binding._stamp = +(new Date()) // 过滤掉频繁操作 + if (loaded) { + var newText = loaded.apply(target, [text].concat(vmodels)) + if (typeof newText === "string") + text = newText + } + if (rendered) { + checkScan(target, function () { + rendered.call(target) + }, NaN) + } + var lastID = binding.includeLastID || "_default" // 默认 + + binding.includeLastID = val + var leaveEl = templateCache && templateCache[lastID] || DOC.createElement(elem.tagName || binding._element.tagName) // 创建一个离场元素 + if (effectClass) { + leaveEl.className = effectClass + target.insertBefore(leaveEl, binding.start) // 插入到start之前，防止被错误的移动 + } + + // cache or animate，移动节点 + (templateCache || {})[lastID] = leaveEl + var fragOnDom = binding.recoverNodes() // 恢复动画中的节点 + if (fragOnDom) { + target.insertBefore(fragOnDom, binding.end) + } + while (true) { + var node = binding.start.nextSibling + if (node && node !== leaveEl && node !== binding.end) { + leaveEl.appendChild(node) + } else { + break + } + } + // 元素退场 + avalon.effect.remove(leaveEl, target, function () { + if (templateCache) { // write cache + if (_stamp === binding._stamp) + ifGroup.appendChild(leaveEl) + } + }, binding) + + + var enterEl = target, + before = avalon.noop, + after = avalon.noop + + var fragment = getTemplateContainer(binding, val, text) + var nodes = avalon.slice(fragment.childNodes) + + if (outer && effectClass) { + enterEl = _ele + enterEl.innerHTML = "" // 清空 + enterEl.setAttribute("ms-skip", "true") + target.insertBefore(enterEl, binding.end.nextSibling) // 插入到bingding.end之后避免被错误的移动 + before = function () { + enterEl.insertBefore(fragment, null) // 插入节点 + } + after = function () { + binding.recoverNodes = avalon.noop + if (_stamp === binding._stamp) { + fragment = nodesToFrag(nodes) + target.insertBefore(fragment, binding.end) // 插入真实element + scanNodeArray(nodes, vmodels) + } + if (enterEl.parentNode === target) + target.removeChild(enterEl) // 移除入场动画元素 + } + binding.recoverNodes = function () { + binding.recoverNodes = avalon.noop + return nodesToFrag(nodes) + } + } else { + before = function () {// 新添加元素的动画 + target.insertBefore(fragment, binding.end) + scanNodeArray(nodes, vmodels) + } + } + + avalon.effect.apply(enterEl, "enter", before, after) + } + + if (binding.param === "src") { + if (typeof templatePool[val] === "string") { + avalon.nextTick(function () { + scanTemplate(templatePool[val]) + }) + } else if (Array.isArray(templatePool[val])) { //#805 防止在循环绑定中发出许多相同的请求 + templatePool[val].push(scanTemplate) + } else { + var xhr = getXHR() + xhr.onreadystatechange = function () { + if (xhr.readyState === 4) { + var s = xhr.status + if (s >= 200 && s < 300 || s === 304 || s === 1223) { + var text = xhr.responseText + for (var f = 0, fn; fn = templatePool[val][f++]; ) { + fn(text) + } + templatePool[val] = text + }else{ + log("ms-include load ["+ val +"] error") + } + } + } + templatePool[val] = [scanTemplate] + xhr.open("GET", val, true) + if ("withCredentials" in xhr) { + xhr.withCredentials = true + } + xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest") + xhr.send(null) + } + } else { + //IE系列与够新的标准浏览器支持通过ID取得元素（firefox14+） + //http://tjvantoll.com/2012/07/19/dom-element-references-as-global-variables/ + var el = val && val.nodeType === 1 ? val : DOC.getElementById(val) + if (el) { + if (el.tagName === "NOSCRIPT" && !(el.innerHTML || el.fixIE78)) { //IE7-8 innerText,innerHTML都无法取得其内容，IE6能取得其innerHTML + xhr = getXHR() //IE9-11与chrome的innerHTML会得到转义的内容，它们的innerText可以 + xhr.open("GET", location, false) + xhr.send(null) + //http://bbs.csdn.net/topics/390349046?page=1#post-393492653 + var noscripts = DOC.getElementsByTagName("noscript") + var array = (xhr.responseText || "").match(rnoscripts) || [] + var n = array.length + for (var i = 0; i < n; i++) { + var tag = noscripts[i] + if (tag) { //IE6-8中noscript标签的innerHTML,innerText是只读的 + tag.style.display = "none" //http://haslayout.net/css/noscript-Ghost-Bug + tag.fixIE78 = (array[i].match(rnoscriptText) || ["", " "])[1] + } + } + } + avalon.nextTick(function () { + scanTemplate(el.fixIE78 || el.value || el.innerText || el.innerHTML) + }) + } + } + } +}) + +var rdash = /\(([^)]*)\)/ +var onDir = avalon.directive("on", { + priority: 3000, + init: function (binding) { + var value = binding.expr + binding.type = "on" + var eventType = binding.param.replace(/-\d+$/, "") // ms-on-mousemove-10 + if (typeof onDir[eventType + "Hook"] === "function") { + onDir[eventType + "Hook"](binding) } if (value.indexOf("(") > 0 && value.indexOf(")") > -1) { var matched = (value.match(rdash) || ["", ""])[1].trim() @@ -4119,507 +4864,563 @@ value = value.replace(rdash, "") } } - parseExprProxy(value, vmodels, data) - } - - bindingExecutors.on = function(callback, elem, data) { - callback = function(e) { - var fn = data.evaluator || noop - return fn.apply(this, data.args.concat(e)) + binding.expr = value + }, + update: function (callback) { + var binding = this + var elem = this.element + callback = function (e) { + var fn = binding.getter || noop + return fn.apply(this, binding.args.concat(e)) } - var eventType = data.param.replace(/-\d+$/, "") // ms-on-mousemove-10 + + var eventType = binding.param.replace(/-\d+$/, "") // ms-on-mousemove-10 if (eventType === "scan") { callback.call(elem, { type: eventType }) - } else if (typeof data.specialBind === "function") { - data.specialBind(elem, callback) + } else if (typeof binding.specialBind === "function") { + binding.specialBind(elem, callback) } else { var removeFn = avalon.bind(elem, eventType, callback) } - data.rollback = function() { - if (typeof data.specialUnbind === "function") { - data.specialUnbind() + binding.rollback = function () { + if (typeof binding.specialUnbind === "function") { + binding.specialUnbind() } else { avalon.unbind(elem, eventType, removeFn) } } } - bindingHandlers.repeat = function (data, vmodels) { - var type = data.type - parseExprProxy(data.value, vmodels, data, 0, 1) - var freturn = false - try { - var $repeat = data.$repeat = data.evaluator.apply(0, data.args || []) - var xtype = avalon.type($repeat) - if (xtype !== "object" && xtype !== "array") { - freturn = true - avalon.log("warning:" + data.value + "只能是对象或数组") - } - } catch (e) { - freturn = true - } - var arr = data.value.split(".") || [] - if (arr.length > 1) { - arr.pop() - var n = arr[0] - for (var i = 0, v; v = vmodels[i++]; ) { - if (v && v.hasOwnProperty(n)) { - var events = v[n].$events || {} - events[subscribers] = events[subscribers] || [] - events[subscribers].push(data) - break - } - } - } +}) +avalon.directive("repeat", { + priority: 90, + init: function (binding) { + var type = binding.type + binding.cache = {} //用于存放代理VM + binding.enterCount = 0 - var elem = data.element + var elem = binding.element if (elem.nodeType === 1) { - elem.removeAttribute(data.name) - data.sortedCallback = getBindingCallback(elem, "data-with-sorted", vmodels) - data.renderedCallback = getBindingCallback(elem, "data-" + type + "-rendered", vmodels) + elem.removeAttribute(binding.name) + effectBinding(elem, binding) + binding.param = binding.param || "el" + binding.sortedCallback = getBindingCallback(elem, "data-with-sorted", binding.vmodels) + // binding.renderedCallback = + var rendered = getBindingCallback(elem, "data-" + type + "-rendered", binding.vmodels) + var signature = generateID(type) - var start = DOC.createComment(signature) - var end = DOC.createComment(signature + ":end") - data.signature = signature - data.template = avalonFragment.cloneNode(false) + var start = DOC.createComment(signature + ":start") + var end = binding.element = DOC.createComment(signature + ":end") + binding.signature = signature + binding.start = start + binding.template = avalonFragment.cloneNode(false) if (type === "repeat") { var parent = elem.parentNode parent.replaceChild(end, elem) parent.insertBefore(start, end) - data.template.appendChild(elem) + binding.template.appendChild(elem) } else { while (elem.firstChild) { - data.template.appendChild(elem.firstChild) + binding.template.appendChild(elem.firstChild) } elem.appendChild(start) elem.appendChild(end) + parent = elem } - data.element = end - data.handler = bindingExecutors.repeat - data.rollback = function () { - var elem = data.element - if (!elem) - return - data.handler("clear") - } - } + binding.element = end - if (freturn) { - return - } - - data.$outer = {} - var check0 = "$key" - var check1 = "$val" - if (Array.isArray($repeat)) { - if (!$repeat.$map) { - $repeat.$map = { - el: 1 - } - var m = $repeat.length - var $proxy = [] - for (i = 0; i < m; i++) {//生成代理VM - $proxy.push(eachProxyAgent(i, $repeat)) - } - $repeat.$proxy = $proxy - } - $repeat.$map[data.param || "el"] = 1 - check0 = "$first" - check1 = "$last" - } - for (i = 0; v = vmodels[i++]; ) { - if (v.hasOwnProperty(check0) && v.hasOwnProperty(check1)) { - data.$outer = v - break + if (rendered) { + var removeFn = avalon.bind(parent, "datasetchanged", function () { + rendered.apply(parent, parent.args) + avalon.unbind(parent, "datasetchanged", removeFn) + parent.msRendered = rendered + }) } } - var $events = $repeat.$events - var $list = ($events || {})[subscribers] - injectDependency($list, data) - if (xtype === "object") { - data.$with = true - $repeat.$proxy || ($repeat.$proxy = {}) - data.handler("append", $repeat) - } else if ($repeat.length) { - data.handler("add", 0, $repeat.length) - } - } + }, + update: function (value, oldValue) { + var binding = this + var xtype = this.xtype - bindingExecutors.repeat = function (method, pos, el) { - if (method) { - var data = this, start, fragment - var end = data.element - var comments = getComments(data) - var parent = end.parentNode - var transation = avalonFragment.cloneNode(false) - switch (method) { - case "add": //在pos位置后添加el数组（pos为插入位置,el为要插入的个数） - var n = pos + el - var fragments = [] - var array = data.$repeat - for (var i = pos; i < n; i++) { - var proxy = array.$proxy[i] - proxy.$outer = data.$outer - shimController(data, transation, proxy, fragments) - } - var now = new Date - 0 - avalon.optimize = avalon.optimize || now - for (i = 0; fragment = fragments[i++]; ) { - scanNodeArray(fragment.nodes, fragment.vmodels) - fragment.nodes = fragment.vmodels = null - } - if(avalon.optimize === now){ - delete avalon.optimize - } - parent.insertBefore(transation, comments[pos] || end) - avalon.profile("插入操作花费了 "+ (new Date - now)) + this.enterCount += 1 + var init = !oldValue + if (init) { + binding.$outer = {} + var check0 = "$key" + var check1 = "$val" + if (xtype === "array") { + check0 = "$first" + check1 = "$last" + } + for (var i = 0, v; v = binding.vmodels[i++]; ) { + if (v.hasOwnProperty(check0) && v.hasOwnProperty(check1)) { + binding.$outer = v break - case "del": //将pos后的el个元素删掉(pos, el都是数字) - sweepNodes(comments[pos], comments[pos + el] || end) - break - case "clear": - start = comments[0] - if (start) { - sweepNodes(start, end) - } - break - case "move": - start = comments[0] - if (start) { - var signature = start.nodeValue - var rooms = [] - var room = [], - node - sweepNodes(start, end, function () { - room.unshift(this) - if (this.nodeValue === signature) { - rooms.unshift(room) - room = [] - } - }) - sortByIndex(rooms, pos) - while (room = rooms.shift()) { - while (node = room.shift()) { - transation.appendChild(node) - } - } - parent.insertBefore(transation, end) - } - break - case "append": - var object = pos //原来第2参数， 被循环对象 - var pool = object.$proxy //代理对象组成的hash - var keys = [] - fragments = [] - for (var key in pool) { - if (!object.hasOwnProperty(key)) { - proxyRecycler(pool[key], withProxyPool) //去掉之前的代理VM - delete(pool[key]) - } - } - for (key in object) { //得到所有键名 - if (object.hasOwnProperty(key) && key !== "hasOwnProperty" && key !== "$proxy") { - keys.push(key) - } - } - if (data.sortedCallback) { //如果有回调，则让它们排序 - var keys2 = data.sortedCallback.call(parent, keys) - if (keys2 && Array.isArray(keys2) && keys2.length) { - keys = keys2 - } - } - - for (i = 0; key = keys[i++]; ) { - if (key !== "hasOwnProperty") { - pool[key] = withProxyAgent(pool[key], key, data) - shimController(data, transation, pool[key], fragments) - } - } - - parent.insertBefore(transation, end) - for (i = 0; fragment = fragments[i++]; ) { - scanNodeArray(fragment.nodes, fragment.vmodels) - fragment.nodes = fragment.vmodels = null - } - break - } - if (method === "clear") - method = "del" - var callback = data.renderedCallback || noop, - args = arguments - checkScan(parent, function () { - callback.apply(parent, args) - if (parent.oldValue && parent.tagName === "SELECT") { //fix #503 - avalon(parent).val(parent.oldValue.split(",")) - } - }, NaN) - } - } - - "with,each".replace(rword, function (name) { - bindingHandlers[name] = bindingHandlers.repeat - }) - avalon.pool = eachProxyPool - function shimController(data, transation, proxy, fragments) { - var content = data.template.cloneNode(true) - var nodes = avalon.slice(content.childNodes) - if (!data.$with) { - content.insertBefore(DOC.createComment(data.signature), content.firstChild) - } - transation.appendChild(content) - var nv = [proxy].concat(data.vmodels) - var fragment = { - nodes: nodes, - vmodels: nv - } - fragments.push(fragment) - } - - function getComments(data) { - var end = data.element - var signature = end.nodeValue.replace(":end", "") - var node = end.previousSibling - var array = [] - while (node) { - if (node.nodeValue === signature) { - array.unshift(node) - } - node = node.previousSibling - } - return array - } - - -//移除掉start与end之间的节点(保留end) - function sweepNodes(start, end, callback) { - while (true) { - var node = end.previousSibling - if (!node) - break - node.parentNode.removeChild(node) - callback && callback.call(node) - if (node === start) { - break - } - } - } - -// 为ms-each,ms-with, ms-repeat会创建一个代理VM， -// 通过它们保持一个下上文，让用户能调用$index,$first,$last,$remove,$key,$val,$outer等属性与方法 -// 所有代理VM的产生,消费,收集,存放通过xxxProxyFactory,xxxProxyAgent, recycleProxies,xxxProxyPool实现 - var withProxyPool = [] - function withProxyFactory() { - var proxy = modelFactory({ - $key: "", - $outer: {}, - $host: {}, - $val: { - get: function () { - return this.$host[this.$key] - }, - set: function (val) { - this.$host[this.$key] = val } } - }, { - $val: 1 - }) - proxy.$id = generateID("$proxy$with") - return proxy - } - - function withProxyAgent(proxy, key, data) { - proxy = proxy || withProxyPool.pop() - if (!proxy) { - proxy = withProxyFactory() } - var host = data.$repeat - proxy.$key = key - proxy.$host = host - proxy.$outer = data.$outer - if (host.$events) { - proxy.$events.$val = host.$events[key] + var track = this.track + if (binding.sortedCallback) { //如果有回调，则让它们排序 + var keys2 = binding.sortedCallback.call(parent, track) + if (keys2 && Array.isArray(keys2)) { + track = keys2 + } + } + + var action = "move" + binding.$repeat = value + var fragments = [] + var transation = init && avalonFragment.cloneNode(false) + var proxies = [] + var param = this.param + var retain = avalon.mix({}, this.cache) + var elem = this.element + var length = track.length + + var parent = elem.parentNode + for (i = 0; i < length; i++) { + + var keyOrId = track[i] //array为随机数, object 为keyName + var proxy = retain[keyOrId] + if (!proxy) { + proxy = getProxyVM(this) + + if (xtype === "array") { + action = "add" + proxy.$id = keyOrId + + proxy[param] = value[i] //index + + } else { + action = "append" + proxy.$key = keyOrId + proxy.$val = value[keyOrId] //key + } + this.cache[keyOrId] = proxy + var node = proxy.$anchor || (proxy.$anchor = elem.cloneNode(false)) + node.nodeValue = this.signature + shimController(binding, transation, proxy, fragments, init && !binding.effectDriver) + decorateProxy(proxy, binding, xtype) + } else { +// if (xtype === "array") { +// proxy[param] = value[i] +// } + fragments.push({}) + retain[keyOrId] = true + } + + //重写proxy + if (this.enterCount === 1) {// 防止多次进入,导致位置不对 + proxy.$active = false + proxy.$oldIndex = proxy.$index + proxy.$active = true + proxy.$index = i + + } + + if (xtype === "array") { + proxy.$first = i === 0 + proxy.$last = i === length - 1 + // proxy[param] = value[i] + } else { + proxy.$val = toJson(value[keyOrId]) // 这里是处理vm.object = newObject的情况 + } + proxies.push(proxy) + } + this.proxies = proxies + if (init && !binding.effectDriver) { + parent.insertBefore(transation, elem) + fragments.forEach(function (fragment) { + scanNodeArray(fragment.nodes || [], fragment.vmodels) + //if(fragment.vmodels.length > 2) + fragment.nodes = fragment.vmodels = null + })// jshint ignore:line } else { - proxy.$events = {} + + var staggerIndex = binding.staggerIndex = 0 + for (keyOrId in retain) { + if (retain[keyOrId] !== true) { + + action = "del" + removeItem(retain[keyOrId].$anchor, binding) + // avalon.log("删除", keyOrId) + // 相当于delete binding.cache[key] + proxyRecycler(this.cache, keyOrId, param) + retain[keyOrId] = null + } + } + + // console.log(effectEnterStagger) + for (i = 0; i < length; i++) { + proxy = proxies[i] + keyOrId = xtype === "array" ? proxy.$id : proxy.$key + var pre = proxies[i - 1] + var preEl = pre ? pre.$anchor : binding.start + if (!retain[keyOrId]) {//如果还没有插入到DOM树 + (function (fragment, preElement) { + var nodes = fragment.nodes + var vmodels = fragment.vmodels + if (nodes) { + staggerIndex = mayStaggerAnimate(binding.effectEnterStagger, function () { + parent.insertBefore(fragment.content, preElement.nextSibling) + scanNodeArray(nodes, vmodels) + animateRepeat(nodes, 1, binding) + }, staggerIndex) + } + fragment.nodes = fragment.vmodels = null + })(fragments[i], preEl)// jshint ignore:line + // avalon.log("插入") + + } else if (proxy.$index !== proxy.$oldIndex) { + (function (proxy2, preElement) { + staggerIndex = mayStaggerAnimate(binding.effectEnterStagger, function () { + var curNode = removeItem(proxy2.$anchor)// 如果位置被挪动了 + var inserted = avalon.slice(curNode.childNodes) + parent.insertBefore(curNode, preElement.nextSibling) + animateRepeat(inserted, 1, binding) + }, staggerIndex) + })(proxy, preEl)// jshint ignore:line + + // avalon.log("移动", proxy.$oldIndex, "-->", proxy.$index) + } + } + } - return proxy - } + if (!value.$track) {//如果是非监控对象,那么就将其$events清空,阻止其持续监听 + for (keyOrId in this.cache) { + proxyRecycler(this.cache, keyOrId, param) + } - function eachProxyRecycler(proxies) { - proxies.forEach(function (proxy) { - proxyRecycler(proxy, eachProxyPool) + } + + //repeat --> duplex + (function (args) { + parent.args = args + if (parent.msRendered) {//第一次事件触发,以后直接调用 + parent.msRendered.apply(parent, args) + } + })(kernel.newWatch ? arguments : [action]); + var id = setTimeout(function () { + clearTimeout(id) + //触发上层的select回调及自己的rendered回调 + avalon.fireDom(parent, "datasetchanged", { + bubble: parent.msHasEvent + }) }) - proxies.length = 0 + this.enterCount -= 1 + } - function proxyRecycler(proxy, proxyPool) { +}) + +"with,each".replace(rword, function (name) { + directives[name] = avalon.mix({}, directives.repeat, { + priority: 1400 + }) +}) + + +function animateRepeat(nodes, isEnter, binding) { + for (var i = 0, node; node = nodes[i++]; ) { + if (node.className === binding.effectClass) { + avalon.effect.apply(node, isEnter, noop, noop, binding) + } + } +} + +function mayStaggerAnimate(staggerTime, callback, index) { + if (staggerTime) { + setTimeout(callback, (++index) * staggerTime) + } else { + callback() + } + return index +} + + +function removeItem(node, binding) { + var fragment = avalonFragment.cloneNode(false) + var last = node + var breakText = last.nodeValue + var staggerIndex = binding && Math.max(+binding.staggerIndex, 0) + var nodes = avalon.slice(last.parentNode.childNodes) + var index = nodes.indexOf(last) + while (true) { + var pre = nodes[--index] //node.previousSibling + if (!pre || String(pre.nodeValue).indexOf(breakText) === 0) { + break + } + + if (binding && (pre.className === binding.effectClass)) { + node = pre; + (function (cur) { + binding.staggerIndex = mayStaggerAnimate(binding.effectLeaveStagger, function () { + avalon.effect.apply(cur, 0, noop, function () { + fragment.appendChild(cur) + }, binding) + }, staggerIndex) + })(pre);// jshint ignore:line + } else { + fragment.insertBefore(pre, fragment.firstChild) + } + } + fragment.appendChild(last) + return fragment +} + + +function shimController(data, transation, proxy, fragments, init) { + var content = data.template.cloneNode(true) + var nodes = avalon.slice(content.childNodes) + content.appendChild(proxy.$anchor) + init && transation.appendChild(content) + var nv = [proxy].concat(data.vmodels) + var fragment = { + nodes: nodes, + vmodels: nv, + content: content + } + fragments.push(fragment) +} +// {} --> {xx: 0, yy: 1, zz: 2} add +// {xx: 0, yy: 1, zz: 2} --> {xx: 0, yy: 1, zz: 2, uu: 3} +// [xx: 0, yy: 1, zz: 2} --> {xx: 0, zz: 1, yy: 2} + +function getProxyVM(binding) { + var agent = binding.xtype === "object" ? withProxyAgent : eachProxyAgent + var proxy = agent(binding) + var node = proxy.$anchor || (proxy.$anchor = binding.element.cloneNode(false)) + node.nodeValue = binding.signature + proxy.$outer = binding.$outer + return proxy +} + +var eachProxyPool = [] + +function eachProxyAgent(data, proxy) { + var itemName = data.param || "el" + for (var i = 0, n = eachProxyPool.length; i < n; i++) { + var candidate = eachProxyPool[i] + if (candidate && candidate.hasOwnProperty(itemName)) { + eachProxyPool.splice(i, 1) + proxy = candidate + break + } + } + if (!proxy) { + proxy = eachProxyFactory(itemName) + } + return proxy +} + +function eachProxyFactory(itemName) { + var source = { + $outer: {}, + $index: 0, + $oldIndex: 0, + $anchor: null, + //----- + $first: false, + $last: false, + $remove: avalon.noop + } + source[itemName] = NaN + + var force = { + $last: 1, + $first: 1, + $index: 1 + } + force[itemName] = 1 + var proxy = modelFactory(source, { + force: force + }) + proxy.$id = generateID("$proxy$each") + return proxy +} + +function decorateProxy(proxy, binding, type) { + if (type === "array") { + proxy.$remove = function () { + + binding.$repeat.removeAt(proxy.$index) + } + var param = binding.param + + + proxy.$watch(param, function (a) { + var index = proxy.$index + binding.$repeat[index] = a + }) + } else { + proxy.$watch("$val", function fn(a) { + binding.$repeat[proxy.$key] = a + }) + } +} + +var withProxyPool = [] + +function withProxyAgent() { + return withProxyPool.pop() || withProxyFactory() +} + +function withProxyFactory() { + var proxy = modelFactory({ + $key: "", + $val: NaN, + $index: 0, + $oldIndex: 0, + $outer: {}, + $anchor: null + }, { + force: { + $key: 1, + $val: 1, + $index: 1 + } + }) + proxy.$id = generateID("$proxy$with") + return proxy +} + + +function proxyRecycler(cache, key, param) { + var proxy = cache[key] + if (proxy) { + var proxyPool = proxy.$id.indexOf("$proxy$each") === 0 ? eachProxyPool : withProxyPool + proxy.$outer = {} + for (var i in proxy.$events) { - if (Array.isArray(proxy.$events[i])) { - proxy.$events[i].forEach(function (data) { - if (typeof data === "object") - disposeData(data) - })// jshint ignore:line - proxy.$events[i].length = 0 + var a = proxy.$events[i] + if (Array.isArray(a)) { + a.length = 0 + if (i === param) { + proxy[param] = NaN + + } else if (i === "$val") { + proxy.$val = NaN + } } } - proxy.$host = proxy.$outer = {} + if (proxyPool.unshift(proxy) > kernel.maxRepeatSize) { proxyPool.pop() } + delete cache[key] } - /********************************************************************* - * 各种指令 * - **********************************************************************/ +} +/********************************************************************* + * 各种指令 * + **********************************************************************/ //ms-skip绑定已经在scanTag 方法中实现 -// bindingHandlers.text 定义在if.js - bindingExecutors.text = function(val, elem) { - val = val == null ? "" : val //不在页面上显示undefined null +avalon.directive("text", { + update: function (value) { + var elem = this.element + value = value == null ? "" : value //不在页面上显示undefined null if (elem.nodeType === 3) { //绑定在文本节点上 try { //IE对游离于DOM树外的节点赋值会报错 - elem.data = val - } catch (e) {} + elem.data = value + } catch (e) { + } } else { //绑定在特性节点上 if ("textContent" in elem) { - elem.textContent = val + elem.textContent = value } else { - elem.innerText = val + elem.innerText = value } } } - function parseDisplay(nodeName, val) { - //用于取得此类标签的默认display值 - var key = "_" + nodeName - if (!parseDisplay[key]) { - var node = DOC.createElement(nodeName) - root.appendChild(node) - if (W3C) { - val = getComputedStyle(node, null).display - } else { - val = node.currentStyle.display - } - root.removeChild(node) - parseDisplay[key] = val +}) +function parseDisplay(nodeName, val) { + //用于取得此类标签的默认display值 + var key = "_" + nodeName + if (!parseDisplay[key]) { + var node = DOC.createElement(nodeName) + root.appendChild(node) + if (W3C) { + val = getComputedStyle(node, null).display + } else { + val = node.currentStyle.display } - return parseDisplay[key] + root.removeChild(node) + parseDisplay[key] = val } + return parseDisplay[key] +} - avalon.parseDisplay = parseDisplay +avalon.parseDisplay = parseDisplay - bindingHandlers.visible = function(data, vmodels) { - var elem = avalon(data.element) - var display = elem.css("display") - if (display === "none") { - var style = elem[0].style - var has = /visibility/i.test(style.cssText) - var visible = elem.css("visibility") - style.display = "" - style.visibility = "hidden" - display = elem.css("display") - if (display === "none") { - display = parseDisplay(elem[0].nodeName) - } - style.visibility = has ? visible : "" - } - data.display = display - parseExprProxy(data.value, vmodels, data) - } - - bindingExecutors.visible = function(val, elem, data) { - elem.style.display = val ? data.display : "none" - } - bindingHandlers.widget = function(data, vmodels) { - var args = data.value.match(rword) - var elem = data.element - var widget = args[0] - var id = args[1] - if (!id || id === "$") { //没有定义或为$时，取组件名+随机数 - id = generateID(widget) - } - var optName = args[2] || widget //没有定义，取组件名 - var constructor = avalon.ui[widget] - if (typeof constructor === "function") { //ms-widget="tabs,tabsAAA,optname" - vmodels = elem.vmodels || vmodels - for (var i = 0, v; v = vmodels[i++];) { - if (v.hasOwnProperty(optName) && typeof v[optName] === "object") { - var vmOptions = v[optName] - vmOptions = vmOptions.$model || vmOptions - break - } - } - if (vmOptions) { - var wid = vmOptions[widget + "Id"] - if (typeof wid === "string") { - log("warning!不再支持" + widget + "Id") - id = wid - } - } - //抽取data-tooltip-text、data-tooltip-attr属性，组成一个配置对象 - var widgetData = avalon.getWidgetData(elem, widget) - data.value = [widget, id, optName].join(",") - data[widget + "Id"] = id - data.evaluator = noop - elem.msData["ms-widget-id"] = id - var options = data[widget + "Options"] = avalon.mix({}, constructor.defaults, vmOptions || {}, widgetData) - elem.removeAttribute("ms-widget") - var vmodel = constructor(elem, data, vmodels) || {} //防止组件不返回VM - if (vmodel.$id) { - avalon.vmodels[id] = vmodel - createSignalTower(elem, vmodel) - try { - vmodel.$init(function() { - avalon.scan(elem, [vmodel].concat(vmodels)) - if (typeof options.onInit === "function") { - options.onInit.call(elem, vmodel, options, vmodels) - } - }) - } catch (e) {} - data.rollback = function() { - try { - vmodel.widgetElement = null - vmodel.$remove() - } catch (e) {} - elem.msData = {} - delete avalon.vmodels[vmodel.$id] - } - injectDisposeQueue(data, widgetList) - if (window.chrome) { - elem.addEventListener("DOMNodeRemovedFromDocument", function() { - setTimeout(rejectDisposeQueue) - }) +avalon.directive("visible", { + init: function (binding) { + effectBinding(binding.element, binding) + }, + update: function (val) { + var binding = this, elem = this.element, stamp + var noEffect = !this.effectName + if (!this.stamp) { + stamp = this.stamp = +new Date + if (val) { + elem.style.display = binding.display || "" + if (avalon(elem).css("display") === "none") { + elem.style.display = binding.display = parseDisplay(elem.nodeName) } } else { - avalon.scan(elem, vmodels) + elem.style.display = "none" } - } else if (vmodels.length) { //如果该组件还没有加载，那么保存当前的vmodels - elem.vmodels = vmodels + return + } + stamp = this.stamp = +new Date + if (val) { + avalon.effect.apply(elem, 1, function () { + if (stamp !== binding.stamp) + return + var driver = elem.getAttribute("data-effect-driver") || "a" + + if (noEffect) {//不用动画时走这里 + elem.style.display = binding.display || "" + } + // "a", "t" + if (driver === "a" || driver === "t") { + if (avalon(elem).css("display") === "none") { + elem.style.display = binding.display || parseDisplay(elem.nodeName) + } + } + }) + } else { + avalon.effect.apply(elem, 0, function () { + if (stamp !== binding.stamp) + return + elem.style.display = "none" + }) } } - var widgetList = [] -//不存在 bindingExecutors.widget - /********************************************************************* - * 自带过滤器 * - **********************************************************************/ - var rscripts = /]*>([\S\s]*?)<\/script\s*>/gim - var ron = /\s+(on[^=\s]+)(?:=("[^"]*"|'[^']*'|[^\s>]+))?/g - var ropen = /<\w+\b(?:(["'])[^"]*?(\1)|[^>])*>/ig - var rsanitize = { - a: /\b(href)\=("javascript[^"]*"|'javascript[^']*')/ig, - img: /\b(src)\=("javascript[^"]*"|'javascript[^']*')/ig, - form: /\b(action)\=("javascript[^"]*"|'javascript[^']*')/ig - } - var rsurrogate = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g - var rnoalphanumeric = /([^\#-~| |!])/g; +}) - function numberFormat(number, decimals, point, thousands) { - //form http://phpjs.org/functions/number_format/ - //number 必需，要格式化的数字 - //decimals 可选，规定多少个小数位。 - //point 可选，规定用作小数点的字符串（默认为 . ）。 - //thousands 可选，规定用作千位分隔符的字符串（默认为 , ），如果设置了该参数，那么所有其他参数都是必需的。 - number = (number + '') +/********************************************************************* + * 自带过滤器 * + **********************************************************************/ +var rscripts = /]*>([\S\s]*?)<\/script\s*>/gim +var ron = /\s+(on[^=\s]+)(?:=("[^"]*"|'[^']*'|[^\s>]+))?/g +var ropen = /<\w+\b(?:(["'])[^"]*?(\1)|[^>])*>/ig +var rsanitize = { + a: /\b(href)\=("javascript[^"]*"|'javascript[^']*')/ig, + img: /\b(src)\=("javascript[^"]*"|'javascript[^']*')/ig, + form: /\b(action)\=("javascript[^"]*"|'javascript[^']*')/ig +} +var rsurrogate = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g +var rnoalphanumeric = /([^\#-~| |!])/g; + +function numberFormat(number, decimals, point, thousands) { + //form http://phpjs.org/functions/number_format/ + //number 必需，要格式化的数字 + //decimals 可选，规定多少个小数位。 + //point 可选，规定用作小数点的字符串（默认为 . ）。 + //thousands 可选，规定用作千位分隔符的字符串（默认为 , ），如果设置了该参数，那么所有其他参数都是必需的。 + number = (number + '') .replace(/[^0-9+\-Ee.]/g, '') - var n = !isFinite(+number) ? 0 : +number, + var n = !isFinite(+number) ? 0 : +number, prec = !isFinite(+decimals) ? 3 : Math.abs(decimals), sep = thousands || ",", dec = point || ".", @@ -4629,71 +5430,71 @@ return '' + (Math.round(n * k) / k) .toFixed(prec) } - // Fix for IE parseFloat(0.55).toFixed(0) = 0; - s = (prec ? toFixedFix(n, prec) : '' + Math.round(n)) + // Fix for IE parseFloat(0.55).toFixed(0) = 0; + s = (prec ? toFixedFix(n, prec) : '' + Math.round(n)) .split('.') - if (s[0].length > 3) { - s[0] = s[0].replace(/\B(?=(?:\d{3})+(?!\d))/g, sep) - } - if ((s[1] || '') - .length < prec) { - s[1] = s[1] || '' - s[1] += new Array(prec - s[1].length + 1) - .join('0') - } - return s.join(dec) + if (s[0].length > 3) { + s[0] = s[0].replace(/\B(?=(?:\d{3})+(?!\d))/g, sep) } + if ((s[1] || '') + .length < prec) { + s[1] = s[1] || '' + s[1] += new Array(prec - s[1].length + 1) + .join('0') + } + return s.join(dec) +} - var filters = avalon.filters = { - uppercase: function(str) { - return str.toUpperCase() - }, - lowercase: function(str) { - return str.toLowerCase() - }, - truncate: function(str, length, truncation) { - //length，新字符串长度，truncation，新字符串的结尾的字段,返回新字符串 - length = length || 30 - truncation = typeof truncation === "string" ? truncation : "..." - return str.length > length ? str.slice(0, length - truncation.length) + truncation : String(str) - }, - $filter: function(val) { - for (var i = 1, n = arguments.length; i < n; i++) { - var array = arguments[i] - var fn = avalon.filters[array.shift()] - if (typeof fn === "function") { - var arr = [val].concat(array) - val = fn.apply(null, arr) +var filters = avalon.filters = { + uppercase: function(str) { + return str.toUpperCase() + }, + lowercase: function(str) { + return str.toLowerCase() + }, + truncate: function(str, length, truncation) { + //length，新字符串长度，truncation，新字符串的结尾的字段,返回新字符串 + length = length || 30 + truncation = typeof truncation === "string" ? truncation : "..." + return str.length > length ? str.slice(0, length - truncation.length) + truncation : String(str) + }, + $filter: function(val) { + for (var i = 1, n = arguments.length; i < n; i++) { + var array = arguments[i] + var fn = avalon.filters[array[0]] + if (typeof fn === "function") { + var arr = [val].concat(array.slice(1)) + val = fn.apply(null, arr) + } + } + return val + }, + camelize: camelize, + //https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet + // chrome + // chrome + // IE67chrome + // IE67chrome + // IE67chrome + sanitize: function(str) { + return str.replace(rscripts, "").replace(ropen, function(a, b) { + var match = a.toLowerCase().match(/<(\w+)\s/) + if (match) { //处理a标签的href属性，img标签的src属性，form标签的action属性 + var reg = rsanitize[match[1]] + if (reg) { + a = a.replace(reg, function(s, name, value) { + var quote = value.charAt(0) + return name + "=" + quote + "javascript:void(0)" + quote// jshint ignore:line + }) } } - return val - }, - camelize: camelize, - //https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet - // chrome - // chrome - // IE67chrome - // IE67chrome - // IE67chrome - sanitize: function(str) { - return str.replace(rscripts, "").replace(ropen, function(a, b) { - var match = a.toLowerCase().match(/<(\w+)\s/) - if (match) { //处理a标签的href属性，img标签的src属性，form标签的action属性 - var reg = rsanitize[match[1]] - if (reg) { - a = a.replace(reg, function(s, name, value) { - var quote = value.charAt(0) - return name + "=" + quote + "javascript:void(0)" + quote// jshint ignore:line - }) - } - } - return a.replace(ron, " ").replace(/\s+/g, " ") //移除onXXX事件 - }) - }, - escape: function(str) { - //将字符串经过 str 转义得到适合在页面中显示的内容, 例如替换 < 为 < - return String(str). + return a.replace(ron, " ").replace(/\s+/g, " ") //移除onXXX事件 + }) + }, + escape: function(str) { + //将字符串经过 str 转义得到适合在页面中显示的内容, 例如替换 < 为 < + return String(str). replace(/&/g, '&'). replace(rsurrogate, function(value) { var hi = value.charCodeAt(0) @@ -4705,983 +5506,308 @@ }). replace(//g, '>') - }, - currency: function(amount, symbol, fractionSize) { - return (symbol || "\uFFE5") + numberFormat(amount, isFinite(fractionSize) ? fractionSize : 2) - }, - number: numberFormat + }, + currency: function(amount, symbol, fractionSize) { + return (symbol || "\uFFE5") + numberFormat(amount, isFinite(fractionSize) ? fractionSize : 2) + }, + number: numberFormat +} +/* + 'yyyy': 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010) + 'yy': 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10) + 'y': 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199) + 'MMMM': Month in year (January-December) + 'MMM': Month in year (Jan-Dec) + 'MM': Month in year, padded (01-12) + 'M': Month in year (1-12) + 'dd': Day in month, padded (01-31) + 'd': Day in month (1-31) + 'EEEE': Day in Week,(Sunday-Saturday) + 'EEE': Day in Week, (Sun-Sat) + 'HH': Hour in day, padded (00-23) + 'H': Hour in day (0-23) + 'hh': Hour in am/pm, padded (01-12) + 'h': Hour in am/pm, (1-12) + 'mm': Minute in hour, padded (00-59) + 'm': Minute in hour (0-59) + 'ss': Second in minute, padded (00-59) + 's': Second in minute (0-59) + 'a': am/pm marker + 'Z': 4 digit (+sign) representation of the timezone offset (-1200-+1200) + format string can also be one of the following predefined localizable formats: + + 'medium': equivalent to 'MMM d, y h:mm:ss a' for en_US locale (e.g. Sep 3, 2010 12:05:08 pm) + 'short': equivalent to 'M/d/yy h:mm a' for en_US locale (e.g. 9/3/10 12:05 pm) + 'fullDate': equivalent to 'EEEE, MMMM d,y' for en_US locale (e.g. Friday, September 3, 2010) + 'longDate': equivalent to 'MMMM d, y' for en_US locale (e.g. September 3, 2010 + 'mediumDate': equivalent to 'MMM d, y' for en_US locale (e.g. Sep 3, 2010) + 'shortDate': equivalent to 'M/d/yy' for en_US locale (e.g. 9/3/10) + 'mediumTime': equivalent to 'h:mm:ss a' for en_US locale (e.g. 12:05:08 pm) + 'shortTime': equivalent to 'h:mm a' for en_US locale (e.g. 12:05 pm) + */ +new function() {// jshint ignore:line + function toInt(str) { + return parseInt(str, 10) || 0 } - /* - 'yyyy': 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010) - 'yy': 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10) - 'y': 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199) - 'MMMM': Month in year (January-December) - 'MMM': Month in year (Jan-Dec) - 'MM': Month in year, padded (01-12) - 'M': Month in year (1-12) - 'dd': Day in month, padded (01-31) - 'd': Day in month (1-31) - 'EEEE': Day in Week,(Sunday-Saturday) - 'EEE': Day in Week, (Sun-Sat) - 'HH': Hour in day, padded (00-23) - 'H': Hour in day (0-23) - 'hh': Hour in am/pm, padded (01-12) - 'h': Hour in am/pm, (1-12) - 'mm': Minute in hour, padded (00-59) - 'm': Minute in hour (0-59) - 'ss': Second in minute, padded (00-59) - 's': Second in minute (0-59) - 'a': am/pm marker - 'Z': 4 digit (+sign) representation of the timezone offset (-1200-+1200) - format string can also be one of the following predefined localizable formats: - 'medium': equivalent to 'MMM d, y h:mm:ss a' for en_US locale (e.g. Sep 3, 2010 12:05:08 pm) - 'short': equivalent to 'M/d/yy h:mm a' for en_US locale (e.g. 9/3/10 12:05 pm) - 'fullDate': equivalent to 'EEEE, MMMM d,y' for en_US locale (e.g. Friday, September 3, 2010) - 'longDate': equivalent to 'MMMM d, y' for en_US locale (e.g. September 3, 2010 - 'mediumDate': equivalent to 'MMM d, y' for en_US locale (e.g. Sep 3, 2010) - 'shortDate': equivalent to 'M/d/yy' for en_US locale (e.g. 9/3/10) - 'mediumTime': equivalent to 'h:mm:ss a' for en_US locale (e.g. 12:05:08 pm) - 'shortTime': equivalent to 'h:mm a' for en_US locale (e.g. 12:05 pm) - */ - new function() {// jshint ignore:line - function toInt(str) { - return parseInt(str, 10) || 0 + function padNumber(num, digits, trim) { + var neg = "" + if (num < 0) { + neg = '-' + num = -num } + num = "" + num + while (num.length < digits) + num = "0" + num + if (trim) + num = num.substr(num.length - digits) + return neg + num + } - function padNumber(num, digits, trim) { - var neg = "" - if (num < 0) { - neg = '-' - num = -num + function dateGetter(name, size, offset, trim) { + return function(date) { + var value = date["get" + name]() + if (offset > 0 || value > -offset) + value += offset + if (value === 0 && offset === -12) { + value = 12 } - num = "" + num - while (num.length < digits) - num = "0" + num - if (trim) - num = num.substr(num.length - digits) - return neg + num + return padNumber(value, size, trim) } + } - function dateGetter(name, size, offset, trim) { - return function(date) { - var value = date["get" + name]() - if (offset > 0 || value > -offset) - value += offset - if (value === 0 && offset === -12) { - value = 12 - } - return padNumber(value, size, trim) - } + function dateStrGetter(name, shortForm) { + return function(date, formats) { + var value = date["get" + name]() + var get = (shortForm ? ("SHORT" + name) : name).toUpperCase() + return formats[get][value] } + } - function dateStrGetter(name, shortForm) { - return function(date, formats) { - var value = date["get" + name]() - var get = (shortForm ? ("SHORT" + name) : name).toUpperCase() - return formats[get][value] - } - } + function timeZoneGetter(date) { + var zone = -1 * date.getTimezoneOffset() + var paddedZone = (zone >= 0) ? "+" : "" + paddedZone += padNumber(Math[zone > 0 ? "floor" : "ceil"](zone / 60), 2) + padNumber(Math.abs(zone % 60), 2) + return paddedZone + } + //取得上午下午 - function timeZoneGetter(date) { - var zone = -1 * date.getTimezoneOffset() - var paddedZone = (zone >= 0) ? "+" : "" - paddedZone += padNumber(Math[zone > 0 ? "floor" : "ceil"](zone / 60), 2) + padNumber(Math.abs(zone % 60), 2) - return paddedZone - } - //取得上午下午 - - function ampmGetter(date, formats) { - return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1] - } - var DATE_FORMATS = { - yyyy: dateGetter("FullYear", 4), - yy: dateGetter("FullYear", 2, 0, true), - y: dateGetter("FullYear", 1), - MMMM: dateStrGetter("Month"), - MMM: dateStrGetter("Month", true), - MM: dateGetter("Month", 2, 1), - M: dateGetter("Month", 1, 1), - dd: dateGetter("Date", 2), - d: dateGetter("Date", 1), - HH: dateGetter("Hours", 2), - H: dateGetter("Hours", 1), - hh: dateGetter("Hours", 2, -12), - h: dateGetter("Hours", 1, -12), - mm: dateGetter("Minutes", 2), - m: dateGetter("Minutes", 1), - ss: dateGetter("Seconds", 2), - s: dateGetter("Seconds", 1), - sss: dateGetter("Milliseconds", 3), - EEEE: dateStrGetter("Day"), - EEE: dateStrGetter("Day", true), - a: ampmGetter, - Z: timeZoneGetter - } - var rdateFormat = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/ - var raspnetjson = /^\/Date\((\d+)\)\/$/ - filters.date = function(date, format) { - var locate = filters.date.locate, + function ampmGetter(date, formats) { + return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1] + } + var DATE_FORMATS = { + yyyy: dateGetter("FullYear", 4), + yy: dateGetter("FullYear", 2, 0, true), + y: dateGetter("FullYear", 1), + MMMM: dateStrGetter("Month"), + MMM: dateStrGetter("Month", true), + MM: dateGetter("Month", 2, 1), + M: dateGetter("Month", 1, 1), + dd: dateGetter("Date", 2), + d: dateGetter("Date", 1), + HH: dateGetter("Hours", 2), + H: dateGetter("Hours", 1), + hh: dateGetter("Hours", 2, -12), + h: dateGetter("Hours", 1, -12), + mm: dateGetter("Minutes", 2), + m: dateGetter("Minutes", 1), + ss: dateGetter("Seconds", 2), + s: dateGetter("Seconds", 1), + sss: dateGetter("Milliseconds", 3), + EEEE: dateStrGetter("Day"), + EEE: dateStrGetter("Day", true), + a: ampmGetter, + Z: timeZoneGetter + } + var rdateFormat = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/ + var raspnetjson = /^\/Date\((\d+)\)\/$/ + filters.date = function(date, format) { + var locate = filters.date.locate, text = "", parts = [], fn, match - format = format || "mediumDate" - format = locate[format] || format - if (typeof date === "string") { - if (/^\d+$/.test(date)) { - date = toInt(date) - } else if (raspnetjson.test(date)) { - date = +RegExp.$1 - } else { - var trimDate = date.trim() - var dateArray = [0, 0, 0, 0, 0, 0, 0] - var oDate = new Date(0) - //取得年月日 - trimDate = trimDate.replace(/^(\d+)\D(\d+)\D(\d+)/, function(_, a, b, c) { - var array = c.length === 4 ? [c, a, b] : [a, b, c] - dateArray[0] = toInt(array[0]) //年 - dateArray[1] = toInt(array[1]) - 1 //月 - dateArray[2] = toInt(array[2]) //日 - return "" - }) - var dateSetter = oDate.setFullYear - var timeSetter = oDate.setHours - trimDate = trimDate.replace(/[T\s](\d+):(\d+):?(\d+)?\.?(\d)?/, function(_, a, b, c, d) { - dateArray[3] = toInt(a) //小时 - dateArray[4] = toInt(b) //分钟 - dateArray[5] = toInt(c) //秒 - if (d) { //毫秒 - dateArray[6] = Math.round(parseFloat("0." + d) * 1000) - } - return "" - }) - var tzHour = 0 - var tzMin = 0 - trimDate = trimDate.replace(/Z|([+-])(\d\d):?(\d\d)/, function(z, symbol, c, d) { - dateSetter = oDate.setUTCFullYear - timeSetter = oDate.setUTCHours - if (symbol) { - tzHour = toInt(symbol + c) - tzMin = toInt(symbol + d) - } - return "" - }) - - dateArray[3] -= tzHour - dateArray[4] -= tzMin - dateSetter.apply(oDate, dateArray.slice(0, 3)) - timeSetter.apply(oDate, dateArray.slice(3)) - date = oDate - } - } - if (typeof date === "number") { - date = new Date(date) - } - if (avalon.type(date) !== "date") { - return - } - while (format) { - match = rdateFormat.exec(format) - if (match) { - parts = parts.concat(match.slice(1)) - format = parts.pop() - } else { - parts.push(format) - format = null - } - } - parts.forEach(function(value) { - fn = DATE_FORMATS[value] - text += fn ? fn(date, locate) : value.replace(/(^'|'$)/g, "").replace(/''/g, "'") - }) - return text - } - var locate = { - AMPMS: { - 0: "上午", - 1: "下午" - }, - DAY: { - 0: "星期日", - 1: "星期一", - 2: "星期二", - 3: "星期三", - 4: "星期四", - 5: "星期五", - 6: "星期六" - }, - MONTH: { - 0: "1月", - 1: "2月", - 2: "3月", - 3: "4月", - 4: "5月", - 5: "6月", - 6: "7月", - 7: "8月", - 8: "9月", - 9: "10月", - 10: "11月", - 11: "12月" - }, - SHORTDAY: { - "0": "周日", - "1": "周一", - "2": "周二", - "3": "周三", - "4": "周四", - "5": "周五", - "6": "周六" - }, - fullDate: "y年M月d日EEEE", - longDate: "y年M月d日", - medium: "yyyy-M-d H:mm:ss", - mediumDate: "yyyy-M-d", - mediumTime: "H:mm:ss", - "short": "yy-M-d ah:mm", - shortDate: "yy-M-d", - shortTime: "ah:mm" - } - locate.SHORTMONTH = locate.MONTH - filters.date.locate = locate - }// jshint ignore:line - /********************************************************************* - * AMD加载器 * - **********************************************************************/ -//https://www.devbridge.com/articles/understanding-amd-requirejs/ -//http://maxogden.com/nested-dependencies.html - /*var modules = avalon.modules = { - "domReady!": { - exports: avalon, - state: 3 - }, - "avalon": { - exports: avalon, - state: 4 - } - } -//Object(modules[id]).state拥有如下值 -// undefined 没有定义 -// 1(send) 已经发出请求 -// 2(loading) 已经被执行但还没有执行完成，在这个阶段define方法会被执行 -// 3(loaded) 执行完毕，通过onload/onreadystatechange回调判定，在这个阶段checkDeps方法会执行 -// 4(execute) 其依赖也执行完毕, 值放到exports对象上，在这个阶段fireFactory方法会执行 - modules.exports = modules.avalon - - new function () {// jshint ignore:line - var loadings = [] //正在加载中的模块列表 - var factorys = [] //放置define方法的factory函数 - var rjsext = /\.js$/i - function makeRequest(name, config) { -//1. 去掉资源前缀 - var res = "js" - name = name.replace(/^(\w+)\!/, function (a, b) { - res = b - return "" - }) - if (res === "ready") { - log("debug: ready!已经被废弃，请使用domReady!") - res = "domReady" - } -//2. 去掉querystring, hash - var query = "" - name = name.replace(rquery, function (a) { - query = a - return "" - }) - //3. 去掉扩展名 - var suffix = "." + res - var ext = /js|css/.test(suffix) ? suffix : "" - name = name.replace(/\.[a-z0-9]+$/g, function (a) { - if (a === suffix) { - ext = a + format = format || "mediumDate" + format = locate[format] || format + if (typeof date === "string") { + if (/^\d+$/.test(date)) { + date = toInt(date) + } else if (raspnetjson.test(date)) { + date = +RegExp.$1 + } else { + var trimDate = date.trim() + var dateArray = [0, 0, 0, 0, 0, 0, 0] + var oDate = new Date(0) + //取得年月日 + trimDate = trimDate.replace(/^(\d+)\D(\d+)\D(\d+)/, function(_, a, b, c) { + var array = c.length === 4 ? [c, a, b] : [a, b, c] + dateArray[0] = toInt(array[0]) //年 + dateArray[1] = toInt(array[1]) - 1 //月 + dateArray[2] = toInt(array[2]) //日 return "" - } else { - return a - } - }) - var req = avalon.mix({ - query: query, - ext: ext, - res: res, - name: name, - toUrl: toUrl - }, config) - req.toUrl(name) - return req - } - - function fireRequest(req) { - var name = req.name - var res = req.res - //1. 如果该模块已经发出请求，直接返回 - var module = modules[name] - var urlNoQuery = name && req.urlNoQuery - if (module && module.state >= 1) { - return name - } - module = modules[urlNoQuery] - if (module && module.state >= 3) { - innerRequire(module.deps || [], module.factory, urlNoQuery) - return urlNoQuery - } - if (name && !module) { - module = modules[urlNoQuery] = { - id: urlNoQuery, - state: 1 //send - } - var wrap = function (obj) { - resources[res] = obj - obj.load(name, req, function (a) { - if (arguments.length && a !== void 0) { - module.exports = a - } - module.state = 4 - checkDeps() - }) - } - - if (!resources[res]) { - innerRequire([res], wrap) - } else { - wrap(resources[res]) - } - } - return name ? urlNoQuery : res + "!" - } - -//核心API之一 require - var requireQueue = [] - var isUserFirstRequire = false - innerRequire = avalon.require = function (array, factory, parentUrl, defineConfig) { - if (!isUserFirstRequire) { - requireQueue.push(avalon.slice(arguments)) - if (arguments.length <= 2) { - isUserFirstRequire = true - var queue = requireQueue.splice(0, requireQueue.length), args - while (args = queue.shift()) { - innerRequire.apply(null, args) + }) + var dateSetter = oDate.setFullYear + var timeSetter = oDate.setHours + trimDate = trimDate.replace(/[T\s](\d+):(\d+):?(\d+)?\.?(\d)?/, function(_, a, b, c, d) { + dateArray[3] = toInt(a) //小时 + dateArray[4] = toInt(b) //分钟 + dateArray[5] = toInt(c) //秒 + if (d) { //毫秒 + dateArray[6] = Math.round(parseFloat("0." + d) * 1000) } - } - return - } + return "" + }) + var tzHour = 0 + var tzMin = 0 + trimDate = trimDate.replace(/Z|([+-])(\d\d):?(\d\d)/, function(z, symbol, c, d) { + dateSetter = oDate.setUTCFullYear + timeSetter = oDate.setUTCHours + if (symbol) { + tzHour = toInt(symbol + c) + tzMin = toInt(symbol + d) + } + return "" + }) - if (!Array.isArray(array)) { - avalon.error("require方法的第一个参数应为数组 " + array) + dateArray[3] -= tzHour + dateArray[4] -= tzMin + dateSetter.apply(oDate, dateArray.slice(0, 3)) + timeSetter.apply(oDate, dateArray.slice(3)) + date = oDate } - var deps = [] // 放置所有依赖项的完整路径 - var uniq = {} - var id = parentUrl || "callback" + setTimeout("1")// jshint ignore:line - defineConfig = defineConfig || {} - defineConfig.baseUrl = kernel.baseUrl - var isBuilt = !!defineConfig.built - if (parentUrl) { - defineConfig.parentUrl = parentUrl.substr(0, parentUrl.lastIndexOf("/")) - defineConfig.mapUrl = parentUrl.replace(rjsext, "") - } - if (isBuilt) { - var req = makeRequest(defineConfig.defineName, defineConfig) - id = req.urlNoQuery + } + if (typeof date === "number") { + date = new Date(date) + } + if (avalon.type(date) !== "date") { + return + } + while (format) { + match = rdateFormat.exec(format) + if (match) { + parts = parts.concat(match.slice(1)) + format = parts.pop() } else { - array.forEach(function (name) { - var req = makeRequest(name, defineConfig) - var url = fireRequest(req) //加载资源，并返回该资源的完整地址 - if (url) { - if (!uniq[url]) { - deps.push(url) - uniq[url] = "司徒正美" //去重 - } - } - }) - } - - var module = modules[id] - if (!module || module.state !== 4) { - modules[id] = { - id: id, - deps: isBuilt ? array.concat() : deps, - factory: factory || noop, - state: 3 - } - } - if (!module) { - //如果此模块是定义在另一个JS文件中, 那必须等该文件加载完毕, 才能放到检测列队中 - loadings.push(id) - } - checkDeps() - } - -//核心API之二 require - innerRequire.define = function (name, deps, factory) { //模块名,依赖列表,模块本身 - if (typeof name !== "string") { - factory = deps - deps = name - name = "anonymous" - } - if (!Array.isArray(deps)) { - factory = deps - deps = [] - } - var config = { - built: !isUserFirstRequire, //用r.js打包后,所有define会放到requirejs之前 - defineName: name - } - var args = [deps, factory, config] - factory.require = function (url) { - args.splice(2, 0, url) - if (modules[url]) { - modules[url].state = 3 //loaded - var isCycle = false - try { - isCycle = checkCycle(modules[url].deps, url) - } catch (e) { - } - if (isCycle) { - avalon.error(url + "模块与之前的模块存在循环依赖，请不要直接用script标签引入" + url + "模块") - } - } - delete factory.require //释放内存 - innerRequire.apply(null, args) //0,1,2 --> 1,2,0 - } -//根据标准,所有遵循W3C标准的浏览器,script标签会按标签的出现顺序执行。 -//老的浏览器中，加载也是按顺序的：一个文件下载完成后，才开始下载下一个文件。 -//较新的浏览器中（IE8+ 、FireFox3.5+ 、Chrome4+ 、Safari4+），为了减小请求时间以优化体验， -//下载可以是并行的，但是执行顺序还是按照标签出现的顺序。 -//但如果script标签是动态插入的, 就未必按照先请求先执行的原则了,目测只有firefox遵守 -//唯一比较一致的是,IE10+及其他标准浏览器,一旦开始解析脚本, 就会一直堵在那里,直接脚本解析完毕 -//亦即，先进入loading阶段的script标签(模块)必然会先进入loaded阶段 - var url = config.built ? "unknown" : getCurrentScript() - if (url) { - var module = modules[url] - if (module) { - module.state = 2 - } - factory.require(url) - } else {//合并前后的safari，合并后的IE6-9走此分支 - factorys.push(factory) + parts.push(format) + format = null } } -//核心API之三 require.config(settings) - innerRequire.config = kernel - //核心API之四 define.amd 标识其符合AMD规范 - innerRequire.define.amd = modules - - //==========================对用户配置项进行再加工========================== - var allpaths = kernel["orig.paths"] = {} - var allmaps = kernel["orig.map"] = {} - var allpackages = kernel["packages"] = [] - var allargs = kernel["orig.args"] = {} - avalon.mix(plugins, { - paths: function (hash) { - avalon.mix(allpaths, hash) - kernel.paths = makeIndexArray(allpaths) - }, - map: function (hash) { - avalon.mix(allmaps, hash) - var list = makeIndexArray(allmaps, 1, 1) - avalon.each(list, function (_, item) { - item.val = makeIndexArray(item.val) - }) - kernel.map = list - }, - packages: function (array) { - array = array.concat(allpackages) - var uniq = {} - var ret = [] - for (var i = 0, pkg; pkg = array[i++]; ) { - pkg = typeof pkg === "string" ? {name: pkg} : pkg - var name = pkg.name - if (!uniq[name]) { - var url = joinPath(pkg.location || name, pkg.main || "main") - url = url.replace(rjsext, "") - ret.push(pkg) - uniq[name] = pkg.location = url - pkg.reg = makeMatcher(name) - } - } - kernel.packages = ret.sort() - }, - urlArgs: function (hash) { - if (typeof hash === "string") { - hash = {"*": hash} - } - avalon.mix(allargs, hash) - kernel.urlArgs = makeIndexArray(allargs, 1) - }, - baseUrl: function (url) { - if (!isAbsUrl(url)) { - var baseElement = head.getElementsByTagName("base")[0] - if (baseElement) { - head.removeChild(baseElement) - } - var node = DOC.createElement("a") - node.href = url - url = getFullUrl(node, "href") - if (baseElement) { - head.insertBefore(baseElement, head.firstChild) - } - } - if (url.length > 3) - kernel.baseUrl = url - }, - shim: function (obj) { - for (var i in obj) { - var value = obj[i] - if (Array.isArray(value)) { - value = obj[i] = { - deps: value - } - } - if (!value.exportsFn && (value.exports || value.init)) { - value.exportsFn = makeExports(value) - } - } - kernel.shim = obj - } - + parts.forEach(function(value) { + fn = DATE_FORMATS[value] + text += fn ? fn(date, locate) : value.replace(/(^'|'$)/g, "").replace(/''/g, "'") }) - - - //==============================内部方法================================= - function checkCycle(deps, nick) { - //检测是否存在循环依赖 - for (var i = 0, id; id = deps[i++]; ) { - if (modules[id].state !== 4 && - (id === nick || checkCycle(modules[id].deps, nick))) { - return true - } - } - } - - function checkFail(node, onError, fuckIE) { - var id = trimQuery(node.src) //检测是否死链 - node.onload = node.onreadystatechange = node.onerror = null - if (onError || (fuckIE && modules[id] && !modules[id].state)) { - setTimeout(function () { - head.removeChild(node) - node = null // 处理旧式IE下的循环引用问题 - }) - log("debug: 加载 " + id + " 失败" + onError + " " + (!modules[id].state)) - } else { - return true - } - } - - function checkDeps() { - //检测此JS模块的依赖是否都已安装完毕,是则安装自身 - loop: for (var i = loadings.length, id; id = loadings[--i]; ) { - var obj = modules[id], - deps = obj.deps - if (!deps) - continue - for (var j = 0, key; key = deps[j]; j++) { - if (Object(modules[key]).state !== 4) { - continue loop - } - } - //如果deps是空对象或者其依赖的模块的状态都是2 - if (obj.state !== 4) { - loadings.splice(i, 1) //必须先移除再安装，防止在IE下DOM树建完后手动刷新页面，会多次执行它 - fireFactory(obj.id, obj.deps, obj.factory) - checkDeps() //如果成功,则再执行一次,以防有些模块就差本模块没有安装好 - } - } - } - - var rreadyState = /complete|loaded/ - function loadJS(url, id, callback) { - //通过script节点加载目标模块 - var node = DOC.createElement("script") - node.className = subscribers //让getCurrentScript只处理类名为subscribers的script节点 - var supportLoad = "onload" in node - var onEvent = supportLoad ? "onload" : "onreadystatechange" - function onload() { - var factory = factorys.pop() - factory && factory.require(id) - if (callback) { - callback() - } - if (checkFail(node, false, !supportLoad)) { - log("debug: 已成功加载 " + url) - id && loadings.push(id) - checkDeps() - } - } - var index = 0, loadID - node[onEvent] = supportLoad ? onload : function () { - if (rreadyState.test(node.readyState)) { - ++index - if (index === 1) { - loadID = setTimeout(onload, 500) - } else { - clearTimeout(loadID) - onload() - } - } - } - node.onerror = function () { - checkFail(node, true) - } - - head.insertBefore(node, head.firstChild) //chrome下第二个参数不能为null - node.src = url //插入到head的第一个节点前，防止IE6下head标签没闭合前使用appendChild抛错 - log("debug: 正准备加载 " + url) //更重要的是IE6下可以收窄getCurrentScript的寻找范围 - } - - var resources = innerRequire.plugins = { - //三大常用资源插件 js!, css!, text!, ready! - ready: { - load: noop - }, - js: { - load: function (name, req, onLoad) { - var url = req.url - var id = req.urlNoQuery - var shim = kernel.shim[name.replace(rjsext, "")] - if (shim) { //shim机制 - innerRequire(shim.deps || [], function () { - var args = avalon.slice(arguments) - loadJS(url, id, function () { - onLoad(shim.exportsFn ? shim.exportsFn.apply(0, args) : void 0) - }) - }) - } else { - loadJS(url, id) - } - } - }, - css: { - load: function (name, req, onLoad) { - var url = req.url - var node = DOC.createElement("link") - node.rel = "stylesheet" - node.href = url - head.insertBefore(node, head.firstChild) - log("debug: 已成功加载 " + url) - onLoad() - } - }, - text: { - load: function (name, req, onLoad) { - var url = req.url - var xhr = getXHR() - xhr.onreadystatechange = function () { - if (xhr.readyState === 4) { - var status = xhr.status; - if (status > 399 && status < 600) { - avalon.error(url + " 对应资源不存在或没有开启 CORS") - } else { - log("debug: 已成功加载 " + url) - onLoad(xhr.responseText) - } - } - } - var time = "_=" + (new Date() - 0) - var _url = url.indexOf("?") === -1 ? url + "?" + time : url + "&" + time - xhr.open("GET", _url, true) - if ("withCredentials" in xhr) {//这是处理跨域 - xhr.withCredentials = true - } - xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest")//告诉后端这是AJAX请求 - xhr.send() - log("debug: 正准备加载 " + url) - } - } - } - innerRequire.checkDeps = checkDeps - - var rquery = /(\?[^#]*)$/ - function trimQuery(url) { - return (url || "").replace(rquery, "") - } - - function isAbsUrl(path) { - //http://stackoverflow.com/questions/10687099/how-to-test-if-a-url-string-is-absolute-or-relative - return /^(?:[a-z]+:)?\/\//i.test(String(path)) - } - - function getFullUrl(node, src) { - return"1"[0] ? node[src] : node.getAttribute(src, 4) - } - - function getCurrentScript() { - // inspireb by https://github.com/samyk/jiagra/blob/master/jiagra.js - var stack - try { - a.b.c() //强制报错,以便捕获e.stack - } catch (e) { //safari5的sourceURL，firefox的fileName，它们的效果与e.stack不一样 - stack = e.stack - if (!stack && window.opera) { - //opera 9没有e.stack,但有e.Backtrace,但不能直接取得,需要对e对象转字符串进行抽取 - stack = (String(e).match(/of linked script \S+/g) || []).join(" ") - } - } - if (stack) { - /!**e.stack最后一行在所有支持的浏览器大致如下: - *chrome23: - * at http://113.93.50.63/data.js:4:1 - *firefox17: - *@http://113.93.50.63/query.js:4 - *opera12:http://www.oldapps.com/opera.php?system=Windows_XP - *@http://113.93.50.63/data.js:4 - *IE10: - * at Global code (http://113.93.50.63/data.js:4:1) - * //firefox4+ 可以用document.currentScript - *!/ - stack = stack.split(/[@ ]/g).pop() //取得最后一行,最后一个空格或@之后的部分 - stack = stack[0] === "(" ? stack.slice(1, -1) : stack.replace(/\s/, "") //去掉换行符 - return trimQuery(stack.replace(/(:\d+)?:\d+$/i, "")) //去掉行号与或许存在的出错字符起始位置 - } - var nodes = head.getElementsByTagName("script") //只在head标签中寻找 - for (var i = nodes.length, node; node = nodes[--i]; ) { - if (node.className === subscribers && node.readyState === "interactive") { - var url = getFullUrl(node, "src") - return node.className = trimQuery(url) - } - } - } - - var rcallback = /^callback\d+$/ - function fireFactory(id, deps, factory) { - var module = Object(modules[id]) - module.state = 4 - for (var i = 0, array = [], d; d = deps[i++]; ) { - if (d === "exports") { - var obj = module.exports || (module.exports = {}) - array.push(obj) - } else { - array.push(modules[d].exports) - } - } - try { - var ret = factory.apply(window, array) - } catch (e) { - log("执行[" + id + "]模块的factory抛错： " + e) - } - if (ret !== void 0) { - module.exports = ret - } - if (rcallback.test(id)) { - delete modules[id] - } - delete module.factory - return ret - } - function toUrl(id) { - if (id.indexOf(this.res + "!") === 0) { - id = id.slice(this.res.length + 1) //处理define("css!style",[], function(){})的情况 - } - var url = id - //1. 是否命中paths配置项 - var usePath = 0 - var baseUrl = this.baseUrl - var rootUrl = this.parentUrl || baseUrl - eachIndexArray(id, kernel.paths, function (value, key) { - url = url.replace(key, value) - usePath = 1 - }) - //2. 是否命中packages配置项 - if (!usePath) { - eachIndexArray(id, kernel.packages, function (value, key, item) { - url = url.replace(item.name, item.location) - }) - } - //3. 是否命中map配置项 - if (this.mapUrl) { - eachIndexArray(this.mapUrl, kernel.map, function (array) { - eachIndexArray(url, array, function (mdValue, mdKey) { - url = url.replace(mdKey, mdValue) - rootUrl = baseUrl - }) - }) - } - var ext = this.ext - if (ext && usePath && url.slice(-ext.length) === ext) { - url = url.slice(0, -ext.length) - } - //4. 转换为绝对路径 - if (!isAbsUrl(url)) { - rootUrl = this.built || /^\w/.test(url) ? baseUrl : rootUrl - url = joinPath(rootUrl, url) - } - //5. 还原扩展名，query - var urlNoQuery = url + ext - url = urlNoQuery + this.query - //6. 处理urlArgs - eachIndexArray(id, kernel.urlArgs, function (value) { - url += (url.indexOf("?") === -1 ? "?" : "&") + value; - }) - this.url = url - return this.urlNoQuery = urlNoQuery - } - - function makeIndexArray(hash, useStar, part) { - //创建一个经过特殊算法排好序的数组 - var index = hash2array(hash, useStar, part) - index.sort(descSorterByName) - return index - } - - function makeMatcher(prefix) { - return new RegExp('^' + prefix + '(/|$)') - } - - function makeExports(value) { - return function () { - var ret - if (value.init) { - ret = value.init.apply(window, arguments) - } - return ret || (value.exports && getGlobal(value.exports)) - } - } - - - function hash2array(hash, useStar, part) { - var array = []; - for (var key in hash) { - if (ohasOwn.call(hash, key)) { - var item = { - name: key, - val: hash[key] - } - array.push(item) - item.reg = key === "*" && useStar ? /^/ : makeMatcher(key) - if (part && key !== "*") { - item.reg = new RegExp('\/' + key.replace(/^\//, "") + '(/|$)') - } - } - } - return array - } - - function eachIndexArray(moduleID, array, matcher) { - array = array || [] - for (var i = 0, el; el = array[i++]; ) { - if (el.reg.test(moduleID)) { - matcher(el.val, el.name, el) - return false - } - } - } - // 根据元素的name项进行数组字符数逆序的排序函数 - function descSorterByName(a, b) { - var aaa = a.name - var bbb = b.name - if (bbb === "*") { - return -1 - } - if (aaa === "*") { - return 1 - } - return bbb.length - aaa.length - } - - var rdeuce = /\/\w+\/\.\./ - function joinPath(a, b) { - if (a.charAt(a.length - 1) !== "/") { - a += "/" - } - if (b.slice(0, 2) === "./") { //相对于兄弟路径 - return a + b.slice(2) - } - if (b.slice(0, 2) === "..") { //相对于父路径 - a += b - while (rdeuce.test(a)) { - a = a.replace(rdeuce, "") - } - return a - } - if (b.slice(0, 1) === "/") { - return a + b.slice(1) - } - return a + b - } - - function getGlobal(value) { - if (!value) { - return value - } - var g = window - value.split(".").forEach(function (part) { - g = g[part] - }) - return g - } - - var mainNode = DOC.scripts[DOC.scripts.length - 1] - var dataMain = mainNode.getAttribute("data-main") - if (dataMain) { - plugins.baseUrl(dataMain) - var href = kernel.baseUrl - kernel.baseUrl = href.slice(0, href.lastIndexOf("/") + 1) - loadJS(href.replace(rjsext, "") + ".js") - } else { - var loaderUrl = trimQuery(getFullUrl(mainNode, "src")) - kernel.baseUrl = loaderUrl.slice(0, loaderUrl.lastIndexOf("/") + 1) - } - }// jshint ignore:line*/ - - /********************************************************************* - * DOMReady * - **********************************************************************/ - - var readyList = [], isReady - var fireReady = function(fn) { - isReady = true - if (innerRequire) { - modules["domReady!"].state = 4 - innerRequire.checkDeps() - } - while(fn = readyList.shift()){ - fn(avalon) - } + return text } + var locate = { + AMPMS: { + 0: "上午", + 1: "下午" + }, + DAY: { + 0: "星期日", + 1: "星期一", + 2: "星期二", + 3: "星期三", + 4: "星期四", + 5: "星期五", + 6: "星期六" + }, + MONTH: { + 0: "1月", + 1: "2月", + 2: "3月", + 3: "4月", + 4: "5月", + 5: "6月", + 6: "7月", + 7: "8月", + 8: "9月", + 9: "10月", + 10: "11月", + 11: "12月" + }, + SHORTDAY: { + "0": "周日", + "1": "周一", + "2": "周二", + "3": "周三", + "4": "周四", + "5": "周五", + "6": "周六" + }, + fullDate: "y年M月d日EEEE", + longDate: "y年M月d日", + medium: "yyyy-M-d H:mm:ss", + mediumDate: "yyyy-M-d", + mediumTime: "H:mm:ss", + "short": "yy-M-d ah:mm", + shortDate: "yy-M-d", + shortTime: "ah:mm" + } + locate.SHORTMONTH = locate.MONTH + filters.date.locate = locate +}// jshint ignore:line +/********************************************************************* + * DOMReady * + **********************************************************************/ - function doScrollCheck() { - try { //IE下通过doScrollCheck检测DOM树是否建完 - root.doScroll("left") +var readyList = [], + isReady +var fireReady = function (fn) { + isReady = true + var require = avalon.require + if (require && require.checkDeps) { + modules["domReady!"].state = 4 + require.checkDeps() + } + while (fn = readyList.shift()) { + fn(avalon) + } +} + +function doScrollCheck() { + try { //IE下通过doScrollCheck检测DOM树是否建完 + root.doScroll("left") + fireReady() + } catch (e) { + setTimeout(doScrollCheck) + } +} + +if (DOC.readyState === "complete") { + setTimeout(fireReady) //如果在domReady之外加载 +} else if (W3C) { + DOC.addEventListener("DOMContentLoaded", fireReady) +} else { + DOC.attachEvent("onreadystatechange", function () { + if (DOC.readyState === "complete") { fireReady() - } catch (e) { - setTimeout(doScrollCheck) } + }) + try { + var isTop = window.frameElement === null + } catch (e) {} + if (root.doScroll && isTop && window.external) { //fix IE iframe BUG + doScrollCheck() } +} +avalon.bind(window, "load", fireReady) - if (DOC.readyState === "complete") { - setTimeout(fireReady) //如果在domReady之外加载 - } else if (W3C) { - DOC.addEventListener("DOMContentLoaded", fireReady) +avalon.ready = function (fn) { + if (!isReady) { + readyList.push(fn) } else { - DOC.attachEvent("onreadystatechange", function() { - if (DOC.readyState === "complete") { - fireReady() - } - }) - try { - var isTop = window.frameElement === null - } catch (e) { - } - if (root.doScroll && isTop && window.external) {//fix IE iframe BUG - doScrollCheck() - } + fn(avalon) } - avalon.bind(window, "load", fireReady) +} - avalon.ready = function(fn) { - if (!isReady) { - readyList.push(fn) - } else { - fn(avalon) - } - } +avalon.config({ + loader: true +}) - avalon.config({ - loader: false - }) +avalon.ready(function () { + avalon.scan(DOC.body) +}) - avalon.ready(function() { - avalon.scan(DOC.body) - }) // Register as a named AMD module, since avalon can be concatenated with other // files that may use define, but not via a proper concatenation script that diff --git a/static/src/js/lib/avalon/avalon14.js b/static/src/js/lib/avalon/avalon14.js new file mode 100644 index 0000000..9f41e82 --- /dev/null +++ b/static/src/js/lib/avalon/avalon14.js @@ -0,0 +1,5718 @@ +/*================================================== + Copyright (c) 2013-2015 司徒正美 and other contributors + http://www.cnblogs.com/rubylouvre/ + https://github.com/RubyLouvre + http://weibo.com/jslouvre/ + + Released under the MIT license + avalon.js 1.44 built in 2015.6.25 + support IE6+ and other browsers + ==================================================*/ +(function(global, factory) { + + if (typeof module === "object" && typeof module.exports === "object") { + // For CommonJS and CommonJS-like environments where a proper `window` + // is present, execute the factory and get avalon. + // For environments that do not have a `window` with a `document` + // (such as Node.js), expose a factory as module.exports. + // This accentuates the need for the creation of a real `window`. + // e.g. var avalon = require("avalon")(window); + module.exports = global.document ? factory(global, true) : function(w) { + if (!w.document) { + throw new Error("Avalon requires a window with a document") + } + return factory(w) + } + } else { + factory(global) + } + +// Pass this if window is not defined yet +}(typeof window !== "undefined" ? window : this, function(window, noGlobal){ + + /********************************************************************* + * 全局变量及方法 * + **********************************************************************/ + var expose = new Date() - 0 +//http://stackoverflow.com/questions/7290086/javascript-use-strict-and-nicks-find-global-function + var DOC = window.document + var head = DOC.getElementsByTagName("head")[0] //HEAD元素 + var ifGroup = head.insertBefore(document.createElement("avalon"), head.firstChild) //避免IE6 base标签BUG + ifGroup.innerHTML = "X" + ifGroup.setAttribute("ms-skip", "1") + ifGroup.className = "avalonHide" + var rnative = /\[native code\]/ //判定是否原生函数 + function log() { + if (window.console && avalon.config.debug) { + // http://stackoverflow.com/questions/8785624/how-to-safely-wrap-console-log + Function.apply.call(console.log, console, arguments) + } + } + + + var subscribers = "$" + expose + var otherRequire = window.require + var otherDefine = window.define + var innerRequire + var stopRepeatAssign = false + var rword = /[^, ]+/g //切割字符串为一个个小块，以空格或豆号分开它们，结合replace实现字符串的forEach + var rcomplexType = /^(?:object|array)$/ + var rsvg = /^\[object SVG\w*Element\]$/ + var rwindow = /^\[object (?:Window|DOMWindow|global)\]$/ + var oproto = Object.prototype + var ohasOwn = oproto.hasOwnProperty + var serialize = oproto.toString + var ap = Array.prototype + var aslice = ap.slice + var Registry = {} //将函数曝光到此对象上，方便访问器收集依赖 + var W3C = window.dispatchEvent + var root = DOC.documentElement + var avalonFragment = DOC.createDocumentFragment() + var cinerator = DOC.createElement("div") + var class2type = {} + "Boolean Number String Function Array Date RegExp Object Error".replace(rword, function (name) { + class2type["[object " + name + "]"] = name.toLowerCase() + }) + + + function noop() { + } + + + function oneObject(array, val) { + if (typeof array === "string") { + array = array.match(rword) || [] + } + var result = {}, + value = val !== void 0 ? val : 1 + for (var i = 0, n = array.length; i < n; i++) { + result[array[i]] = value + } + return result + } + +//生成UUID http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript + var generateID = function (prefix) { + prefix = prefix || "avalon" + return String(Math.random() + Math.random()).replace(/\d\.\d{4}/, prefix) + } + function IE() { + if (window.VBArray) { + var mode = document.documentMode + return mode ? mode : window.XMLHttpRequest ? 7 : 6 + } else { + return 0 + } + } + var IEVersion = IE() + + avalon = function (el) { //创建jQuery式的无new 实例化结构 + return new avalon.init(el) + } + + avalon.profile = function () { + if (window.console && avalon.config.profile) { + Function.apply.call(console.log, console, arguments) + } + } + + /*视浏览器情况采用最快的异步回调*/ + avalon.nextTick = new function () {// jshint ignore:line + var tickImmediate = window.setImmediate + var tickObserver = window.MutationObserver + var tickPost = W3C && window.postMessage + if (tickImmediate) { + return tickImmediate.bind(window) + } + + var queue = [] + function callback() { + var n = queue.length + for (var i = 0; i < n; i++) { + queue[i]() + } + queue = queue.slice(n) + } + + if (tickObserver) { + var node = document.createTextNode("avalon") + new tickObserver(callback).observe(node, {characterData: true})// jshint ignore:line + return function (fn) { + queue.push(fn) + node.data = Math.random() + } + } + + if (tickPost) { + window.addEventListener("message", function (e) { + var source = e.source + if ((source === window || source === null) && e.data === "process-tick") { + e.stopPropagation() + callback() + } + }) + + return function (fn) { + queue.push(fn) + window.postMessage('process-tick', '*') + } + } + + return function (fn) { + setTimeout(fn, 0) + } + }// jshint ignore:line + /********************************************************************* + * avalon的静态方法定义区 * + **********************************************************************/ + avalon.init = function(el) { + this[0] = this.element = el + } + avalon.fn = avalon.prototype = avalon.init.prototype + + avalon.type = function(obj) { //取得目标的类型 + if (obj == null) { + return String(obj) + } + // 早期的webkit内核浏览器实现了已废弃的ecma262v4标准，可以将正则字面量当作函数使用，因此typeof在判定正则时会返回function + return typeof obj === "object" || typeof obj === "function" ? + class2type[serialize.call(obj)] || "object" : + typeof obj + } + + var isFunction = typeof alert === "object" ? function(fn) { + try { + return /^\s*\bfunction\b/.test(fn + "") + } catch (e) { + return false + } + } : function(fn) { + return serialize.call(fn) === "[object Function]" + } + avalon.isFunction = isFunction + + avalon.isWindow = function(obj) { + if (!obj) + return false + // 利用IE678 window == document为true,document == window竟然为false的神奇特性 + // 标准浏览器及IE9，IE10等使用 正则检测 + return obj == obj.document && obj.document != obj //jshint ignore:line + } + + function isWindow(obj) { + return rwindow.test(serialize.call(obj)) + } + if (isWindow(window)) { + avalon.isWindow = isWindow + } + var enu + for (enu in avalon({})) { + break + } + var enumerateBUG = enu !== "0" //IE6下为true, 其他为false + /*判定是否是一个朴素的javascript对象（Object），不是DOM对象，不是BOM对象，不是自定义类的实例*/ + avalon.isPlainObject = function(obj, key) { + if (!obj || avalon.type(obj) !== "object" || obj.nodeType || avalon.isWindow(obj)) { + return false; + } + try { //IE内置对象没有constructor + if (obj.constructor && !ohasOwn.call(obj, "constructor") && !ohasOwn.call(obj.constructor.prototype, "isPrototypeOf")) { + return false; + } + } catch (e) { //IE8 9会在这里抛错 + return false; + } + if (enumerateBUG) { + for (key in obj) { + return ohasOwn.call(obj, key) + } + } + for (key in obj) { + } + return key === void 0 || ohasOwn.call(obj, key) + } + if (rnative.test(Object.getPrototypeOf)) { + avalon.isPlainObject = function(obj) { + // 简单的 typeof obj === "object"检测，会致使用isPlainObject(window)在opera下通不过 + return serialize.call(obj) === "[object Object]" && Object.getPrototypeOf(obj) === oproto + } + } +//与jQuery.extend方法，可用于浅拷贝，深拷贝 + avalon.mix = avalon.fn.mix = function() { + var options, name, src, copy, copyIsArray, clone, + target = arguments[0] || {}, + i = 1, + length = arguments.length, + deep = false + + // 如果第一个参数为布尔,判定是否深拷贝 + if (typeof target === "boolean") { + deep = target + target = arguments[1] || {} + i++ + } + + //确保接受方为一个复杂的数据类型 + if (typeof target !== "object" && !isFunction(target)) { + target = {} + } + + //如果只有一个参数，那么新成员添加于mix所在的对象上 + if (i === length) { + target = this + i-- + } + + for (; i < length; i++) { + //只处理非空参数 + if ((options = arguments[i]) != null) { + for (name in options) { + src = target[name] + try { + copy = options[name] //当options为VBS对象时报错 + } catch (e) { + continue + } + + // 防止环引用 + if (target === copy) { + continue + } + if (deep && copy && (avalon.isPlainObject(copy) || (copyIsArray = Array.isArray(copy)))) { + + if (copyIsArray) { + copyIsArray = false + clone = src && Array.isArray(src) ? src : [] + + } else { + clone = src && avalon.isPlainObject(src) ? src : {} + } + + target[name] = avalon.mix(deep, clone, copy) + } else if (copy !== void 0) { + target[name] = copy + } + } + } + } + return target + } + + function _number(a, len) { //用于模拟slice, splice的效果 + a = Math.floor(a) || 0 + return a < 0 ? Math.max(len + a, 0) : Math.min(a, len); + } + avalon.mix({ + rword: rword, + subscribers: subscribers, + version: 1.44, + ui: {}, + log: log, + slice: W3C ? function(nodes, start, end) { + return aslice.call(nodes, start, end) + } : function(nodes, start, end) { + var ret = [] + var len = nodes.length + if (end === void 0) + end = len + if (typeof end === "number" && isFinite(end)) { + start = _number(start, len) + end = _number(end, len) + for (var i = start; i < end; ++i) { + ret[i - start] = nodes[i] + } + } + return ret + }, + noop: noop, + /*如果不用Error对象封装一下，str在控制台下可能会乱码*/ + error: function(str, e) { + throw (e || Error)(str) + }, + /*将一个以空格或逗号隔开的字符串或数组,转换成一个键值都为1的对象*/ + oneObject: oneObject, + /* avalon.range(10) + => [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + avalon.range(1, 11) + => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] + avalon.range(0, 30, 5) + => [0, 5, 10, 15, 20, 25] + avalon.range(0, -10, -1) + => [0, -1, -2, -3, -4, -5, -6, -7, -8, -9] + avalon.range(0) + => []*/ + range: function(start, end, step) { // 用于生成整数数组 + step || (step = 1) + if (end == null) { + end = start || 0 + start = 0 + } + var index = -1, + length = Math.max(0, Math.ceil((end - start) / step)), + result = new Array(length) + while (++index < length) { + result[index] = start + start += step + } + return result + }, + eventHooks: {}, + /*绑定事件*/ + bind: function(el, type, fn, phase) { + var hooks = avalon.eventHooks + var hook = hooks[type] + if (typeof hook === "object") { + type = hook.type + if (hook.deel) { + fn = hook.deel(el, type, fn, phase) + } + } + var callback = W3C ? fn : function(e) { + fn.call(el, fixEvent(e)); + } + if (W3C) { + el.addEventListener(type, callback, !!phase) + } else { + el.attachEvent("on" + type, callback) + } + return callback + }, + /*卸载事件*/ + unbind: function(el, type, fn, phase) { + var hooks = avalon.eventHooks + var hook = hooks[type] + var callback = fn || noop + if (typeof hook === "object") { + type = hook.type + if (hook.deel) { + fn = hook.deel(el, type, fn, false) + } + } + if (W3C) { + el.removeEventListener(type, callback, !!phase) + } else { + el.detachEvent("on" + type, callback) + } + }, + /*读写删除元素节点的样式*/ + css: function(node, name, value) { + if (node instanceof avalon) { + node = node[0] + } + var prop = /[_-]/.test(name) ? camelize(name) : name, fn + name = avalon.cssName(prop) || prop + if (value === void 0 || typeof value === "boolean") { //获取样式 + fn = cssHooks[prop + ":get"] || cssHooks["@:get"] + if (name === "background") { + name = "backgroundColor" + } + var val = fn(node, name) + return value === true ? parseFloat(val) || 0 : val + } else if (value === "") { //请除样式 + node.style[name] = "" + } else { //设置样式 + if (value == null || value !== value) { + return + } + if (isFinite(value) && !avalon.cssNumber[prop]) { + value += "px" + } + fn = cssHooks[prop + ":set"] || cssHooks["@:set"] + fn(node, name, value) + } + }, + /*遍历数组与对象,回调的第一个参数为索引或键名,第二个或元素或键值*/ + each: function(obj, fn) { + if (obj) { //排除null, undefined + var i = 0 + if (isArrayLike(obj)) { + for (var n = obj.length; i < n; i++) { + if (fn(i, obj[i]) === false) + break + } + } else { + for (i in obj) { + if (obj.hasOwnProperty(i) && fn(i, obj[i]) === false) { + break + } + } + } + } + }, + //收集元素的data-{{prefix}}-*属性，并转换为对象 + getWidgetData: function(elem, prefix) { + var raw = avalon(elem).data() + var result = {} + for (var i in raw) { + if (i.indexOf(prefix) === 0) { + result[i.replace(prefix, "").replace(/\w/, function(a) { + return a.toLowerCase() + })] = raw[i] + } + } + return result + }, + Array: { + /*只有当前数组不存在此元素时只添加它*/ + ensure: function(target, item) { + if (target.indexOf(item) === -1) { + return target.push(item) + } + }, + /*移除数组中指定位置的元素，返回布尔表示成功与否*/ + removeAt: function(target, index) { + return !!target.splice(index, 1).length + }, + /*移除数组中第一个匹配传参的那个元素，返回布尔表示成功与否*/ + remove: function(target, item) { + var index = target.indexOf(item) + if (~index) + return avalon.Array.removeAt(target, index) + return false + } + } + }) + + var bindingHandlers = avalon.bindingHandlers = {} + var bindingExecutors = avalon.bindingExecutors = {} + + /*判定是否类数组，如节点集合，纯数组，arguments与拥有非负整数的length属性的纯JS对象*/ + function isArrayLike(obj) { + if (!obj) + return false + var n = obj.length + if (n === (n >>> 0)) { //检测length属性是否为非负整数 + var type = serialize.call(obj).slice(8, -1) + if (/(?:regexp|string|function|window|global)$/i.test(type)) + return false + if (type === "Array") + return true + try { + if ({}.propertyIsEnumerable.call(obj, "length") === false) { //如果是原生对象 + return /^\s?function/.test(obj.item || obj.callee) + } + return true + } catch (e) { //IE的NodeList直接抛错 + return !obj.window //IE6-8 window + } + } + return false + } + + +// https://github.com/rsms/js-lru + var Cache = new function() {// jshint ignore:line + function LRU(maxLength) { + this.size = 0 + this.limit = maxLength + this.head = this.tail = void 0 + this._keymap = {} + } + + var p = LRU.prototype + + p.put = function(key, value) { + var entry = { + key: key, + value: value + } + this._keymap[key] = entry + if (this.tail) { + this.tail.newer = entry + entry.older = this.tail + } else { + this.head = entry + } + this.tail = entry + if (this.size === this.limit) { + this.shift() + } else { + this.size++ + } + return value + } + + p.shift = function() { + var entry = this.head + if (entry) { + this.head = this.head.newer + this.head.older = + entry.newer = + entry.older = + this._keymap[entry.key] = void 0 + } + } + p.get = function(key) { + var entry = this._keymap[key] + if (entry === void 0) + return + if (entry === this.tail) { + return entry.value + } + // HEAD--------------TAIL + // <.older .newer> + // <--- add direction -- + // A B C E + if (entry.newer) { + if (entry === this.head) { + this.head = entry.newer + } + entry.newer.older = entry.older // C <-- E. + } + if (entry.older) { + entry.older.newer = entry.newer // C. --> E + } + entry.newer = void 0 // D --x + entry.older = this.tail // D. --> E + if (this.tail) { + this.tail.newer = entry // E. <-- D + } + this.tail = entry + return entry.value + } + return LRU + }// jshint ignore:line + + /********************************************************************* + * javascript 底层补丁 * + **********************************************************************/ + if (!"司徒正美".trim) { + var rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g + String.prototype.trim = function () { + return this.replace(rtrim, "") + } + } + var hasDontEnumBug = !({ + 'toString': null + }).propertyIsEnumerable('toString'), + hasProtoEnumBug = (function () { + }).propertyIsEnumerable('prototype'), + dontEnums = [ + "toString", + "toLocaleString", + "valueOf", + "hasOwnProperty", + "isPrototypeOf", + "propertyIsEnumerable", + "constructor" + ], + dontEnumsLength = dontEnums.length; + if (!Object.keys) { + Object.keys = function (object) { //ecma262v5 15.2.3.14 + var theKeys = [] + var skipProto = hasProtoEnumBug && typeof object === "function" + if (typeof object === "string" || (object && object.callee)) { + for (var i = 0; i < object.length; ++i) { + theKeys.push(String(i)) + } + } else { + for (var name in object) { + if (!(skipProto && name === "prototype") && ohasOwn.call(object, name)) { + theKeys.push(String(name)) + } + } + } + + if (hasDontEnumBug) { + var ctor = object.constructor, + skipConstructor = ctor && ctor.prototype === object + for (var j = 0; j < dontEnumsLength; j++) { + var dontEnum = dontEnums[j] + if (!(skipConstructor && dontEnum === "constructor") && ohasOwn.call(object, dontEnum)) { + theKeys.push(dontEnum) + } + } + } + return theKeys + } + } + if (!Array.isArray) { + Array.isArray = function (a) { + return serialize.call(a) === "[object Array]" + } + } + + if (!noop.bind) { + Function.prototype.bind = function (scope) { + if (arguments.length < 2 && scope === void 0) + return this + var fn = this, + argv = arguments + return function () { + var args = [], + i + for (i = 1; i < argv.length; i++) + args.push(argv[i]) + for (i = 0; i < arguments.length; i++) + args.push(arguments[i]) + return fn.apply(scope, args) + } + } + } + + function iterator(vars, body, ret) { + var fun = 'for(var ' + vars + 'i=0,n = this.length; i < n; i++){' + body.replace('_', '((i in this) && fn.call(scope,this[i],i,this))') + '}' + ret + /* jshint ignore:start */ + return Function("fn,scope", fun) + /* jshint ignore:end */ + } + if (!rnative.test([].map)) { + avalon.mix(ap, { + //定位操作，返回数组中第一个等于给定参数的元素的索引值。 + indexOf: function (item, index) { + var n = this.length, + i = ~~index + if (i < 0) + i += n + for (; i < n; i++) + if (this[i] === item) + return i + return -1 + }, + //定位操作，同上，不过是从后遍历。 + lastIndexOf: function (item, index) { + var n = this.length, + i = index == null ? n - 1 : index + if (i < 0) + i = Math.max(0, n + i) + for (; i >= 0; i--) + if (this[i] === item) + return i + return -1 + }, + //迭代操作，将数组的元素挨个儿传入一个函数中执行。Prototype.js的对应名字为each。 + forEach: iterator("", '_', ""), + //迭代类 在数组中的每个项上运行一个函数，如果此函数的值为真，则此元素作为新数组的元素收集起来，并返回新数组 + filter: iterator('r=[],j=0,', 'if(_)r[j++]=this[i]', 'return r'), + //收集操作，将数组的元素挨个儿传入一个函数中执行，然后把它们的返回值组成一个新数组返回。Prototype.js的对应名字为collect。 + map: iterator('r=[],', 'r[i]=_', 'return r'), + //只要数组中有一个元素满足条件（放进给定函数返回true），那么它就返回true。Prototype.js的对应名字为any。 + some: iterator("", 'if(_)return true', 'return false'), + //只有数组中的元素都满足条件（放进给定函数返回true），它才返回true。Prototype.js的对应名字为all。 + every: iterator("", 'if(!_)return false', 'return true') + }) + } + /********************************************************************* + * DOM 底层补丁 * + **********************************************************************/ + + function fixContains(root, el) { + try { //IE6-8,游离于DOM树外的文本节点，访问parentNode有时会抛错 + while ((el = el.parentNode)) + if (el === root) + return true + return false + } catch (e) { + return false + } + } + avalon.contains = fixContains +//IE6-11的文档对象没有contains + if (!DOC.contains) { + DOC.contains = function (b) { + return fixContains(DOC, b) + } + } + + function outerHTML() { + return new XMLSerializer().serializeToString(this) + } + + if (window.SVGElement) { + //safari5+是把contains方法放在Element.prototype上而不是Node.prototype + if (!DOC.createTextNode("x").contains) { + Node.prototype.contains = function (arg) {//IE6-8没有Node对象 + return !!(this.compareDocumentPosition(arg) & 16) + } + } + var svgns = "http://www.w3.org/2000/svg" + var svg = DOC.createElementNS(svgns, "svg") + svg.innerHTML = '' + if (!rsvg.test(svg.firstChild)) { // #409 + function enumerateNode(node, targetNode) {// jshint ignore:line + if (node && node.childNodes) { + var nodes = node.childNodes + for (var i = 0, el; el = nodes[i++]; ) { + if (el.tagName) { + var svg = DOC.createElementNS(svgns, + el.tagName.toLowerCase()) + ap.forEach.call(el.attributes, function (attr) { + svg.setAttribute(attr.name, attr.value) //复制属性 + })// jshint ignore:line + // 递归处理子节点 + enumerateNode(el, svg) + targetNode.appendChild(svg) + } + } + } + } + Object.defineProperties(SVGElement.prototype, { + "outerHTML": {//IE9-11,firefox不支持SVG元素的innerHTML,outerHTML属性 + enumerable: true, + configurable: true, + get: outerHTML, + set: function (html) { + var tagName = this.tagName.toLowerCase(), + par = this.parentNode, + frag = avalon.parseHTML(html) + // 操作的svg，直接插入 + if (tagName === "svg") { + par.insertBefore(frag, this) + // svg节点的子节点类似 + } else { + var newFrag = DOC.createDocumentFragment() + enumerateNode(frag, newFrag) + par.insertBefore(newFrag, this) + } + par.removeChild(this) + } + }, + "innerHTML": { + enumerable: true, + configurable: true, + get: function () { + var s = this.outerHTML + var ropen = new RegExp("<" + this.nodeName + '\\b(?:(["\'])[^"]*?(\\1)|[^>])*>', "i") + var rclose = new RegExp("<\/" + this.nodeName + ">$", "i") + return s.replace(ropen, "").replace(rclose, "") + }, + set: function (html) { + if (avalon.clearHTML) { + avalon.clearHTML(this) + var frag = avalon.parseHTML(html) + enumerateNode(frag, this) + } + } + } + }) + } + } + if (!root.outerHTML && window.HTMLElement) { //firefox 到11时才有outerHTML + HTMLElement.prototype.__defineGetter__("outerHTML", outerHTML); + } + +//============================= event binding ======================= + var rmouseEvent = /^(?:mouse|contextmenu|drag)|click/ + function fixEvent(event) { + var ret = {} + for (var i in event) { + ret[i] = event[i] + } + var target = ret.target = event.srcElement + if (event.type.indexOf("key") === 0) { + ret.which = event.charCode != null ? event.charCode : event.keyCode + } else if (rmouseEvent.test(event.type)) { + var doc = target.ownerDocument || DOC + var box = doc.compatMode === "BackCompat" ? doc.body : doc.documentElement + ret.pageX = event.clientX + (box.scrollLeft >> 0) - (box.clientLeft >> 0) + ret.pageY = event.clientY + (box.scrollTop >> 0) - (box.clientTop >> 0) + ret.wheelDeltaY = ret.wheelDelta + ret.wheelDeltaX = 0 + } + ret.timeStamp = new Date() - 0 + ret.originalEvent = event + ret.preventDefault = function () { //阻止默认行为 + event.returnValue = false + } + ret.stopPropagation = function () { //阻止事件在DOM树中的传播 + event.cancelBubble = true + } + return ret + } + + var eventHooks = avalon.eventHooks +//针对firefox, chrome修正mouseenter, mouseleave + if (!("onmouseenter" in root)) { + avalon.each({ + mouseenter: "mouseover", + mouseleave: "mouseout" + }, function (origType, fixType) { + eventHooks[origType] = { + type: fixType, + deel: function (elem, _, fn) { + return function (e) { + var t = e.relatedTarget + if (!t || (t !== elem && !(elem.compareDocumentPosition(t) & 16))) { + delete e.type + e.type = origType + return fn.call(elem, e) + } + } + } + } + }) + } +//针对IE9+, w3c修正animationend + avalon.each({ + AnimationEvent: "animationend", + WebKitAnimationEvent: "webkitAnimationEnd" + }, function (construct, fixType) { + if (window[construct] && !eventHooks.animationend) { + eventHooks.animationend = { + type: fixType + } + } + }) +//针对IE6-8修正input + if (!("oninput" in DOC.createElement("input"))) { + eventHooks.input = { + type: "propertychange", + deel: function (elem, _, fn) { + return function (e) { + if (e.propertyName === "value") { + e.type = "input" + return fn.call(elem, e) + } + } + } + } + } + if (DOC.onmousewheel === void 0) { + /* IE6-11 chrome mousewheel wheelDetla 下 -120 上 120 + firefox DOMMouseScroll detail 下3 上-3 + firefox wheel detlaY 下3 上-3 + IE9-11 wheel deltaY 下40 上-40 + chrome wheel deltaY 下100 上-100 */ + var fixWheelType = DOC.onwheel !== void 0 ? "wheel" : "DOMMouseScroll" + var fixWheelDelta = fixWheelType === "wheel" ? "deltaY" : "detail" + eventHooks.mousewheel = { + type: fixWheelType, + deel: function (elem, _, fn) { + return function (e) { + e.wheelDeltaY = e.wheelDelta = e[fixWheelDelta] > 0 ? -120 : 120 + e.wheelDeltaX = 0 + if (Object.defineProperty) { + Object.defineProperty(e, "type", { + value: "mousewheel" + }) + } + fn.call(elem, e) + } + } + } + } + + + /********************************************************************* + * 配置系统 * + **********************************************************************/ + + function kernel(settings) { + for (var p in settings) { + if (!ohasOwn.call(settings, p)) + continue + var val = settings[p] + if (typeof kernel.plugins[p] === "function") { + kernel.plugins[p](val) + } else if (typeof kernel[p] === "object") { + avalon.mix(kernel[p], val) + } else { + kernel[p] = val + } + } + return this + } + var openTag, closeTag, rexpr, rexprg, rbind, rregexp = /[-.*+?^${}()|[\]\/\\]/g + + function escapeRegExp(target) { + //http://stevenlevithan.com/regex/xregexp/ + //将字符串安全格式化为正则表达式的源码 + return (target + "").replace(rregexp, "\\$&") + } + + var plugins = { + loader: function (builtin) { + var flag = innerRequire && builtin + window.require = flag ? innerRequire : otherRequire + window.define = flag ? innerRequire.define : otherDefine + }, + interpolate: function (array) { + openTag = array[0] + closeTag = array[1] + if (openTag === closeTag) { + throw new SyntaxError("openTag!==closeTag") + } else if (array + "" === "") { + kernel.commentInterpolate = true + } else { + var test = openTag + "test" + closeTag + cinerator.innerHTML = test + if (cinerator.innerHTML !== test && cinerator.innerHTML.indexOf("<") > -1) { + throw new SyntaxError("此定界符不合法") + } + cinerator.innerHTML = "" + } + var o = escapeRegExp(openTag), + c = escapeRegExp(closeTag) + rexpr = new RegExp(o + "(.*?)" + c) + rexprg = new RegExp(o + "(.*?)" + c, "g") + rbind = new RegExp(o + ".*?" + c + "|\\sms-") + } + } + + kernel.debug = true + kernel.plugins = plugins + kernel.plugins['interpolate'](["{{", "}}"]) + kernel.paths = {} + kernel.shim = {} + kernel.maxRepeatSize = 100 + avalon.config = kernel + var ravalon = /(\w+)\[(avalonctrl)="(\S+)"\]/ + var findNodes = DOC.querySelectorAll ? function(str) { + return DOC.querySelectorAll(str) + } : function(str) { + var match = str.match(ravalon) + var all = DOC.getElementsByTagName(match[1]) + var nodes = [] + for (var i = 0, el; el = all[i++]; ) { + if (el.getAttribute(match[2]) === match[3]) { + nodes.push(el) + } + } + return nodes + } + /********************************************************************* + * 事件总线 * + **********************************************************************/ + var EventBus = { + $watch: function (type, callback) { + if (typeof callback === "function") { + var callbacks = this.$events[type] + if (callbacks) { + callbacks.push(callback) + } else { + this.$events[type] = [callback] + } + } else { //重新开始监听此VM的第一重简单属性的变动 + this.$events = this.$watch.backup + } + return this + }, + $unwatch: function (type, callback) { + var n = arguments.length + if (n === 0) { //让此VM的所有$watch回调无效化 + this.$watch.backup = this.$events + this.$events = {} + } else if (n === 1) { + this.$events[type] = [] + } else { + var callbacks = this.$events[type] || [] + var i = callbacks.length + while (~--i < 0) { + if (callbacks[i] === callback) { + return callbacks.splice(i, 1) + } + } + } + return this + }, + $fire: function (type) { + var special, i, v, callback + if (/^(\w+)!(\S+)$/.test(type)) { + special = RegExp.$1 + type = RegExp.$2 + } + var events = this.$events + if (!events) + return + var args = aslice.call(arguments, 1) + var detail = [type].concat(args) + if (special === "all") { + for (i in avalon.vmodels) { + v = avalon.vmodels[i] + if (v !== this) { + v.$fire.apply(v, detail) + } + } + } else if (special === "up" || special === "down") { + var elements = events.expr ? findNodes(events.expr) : [] + if (elements.length === 0) + return + for (i in avalon.vmodels) { + v = avalon.vmodels[i] + if (v !== this) { + if (v.$events.expr) { + var eventNodes = findNodes(v.$events.expr) + if (eventNodes.length === 0) { + continue + } + //循环两个vmodel中的节点，查找匹配（向上匹配或者向下匹配）的节点并设置标识 + /* jshint ignore:start */ + ap.forEach.call(eventNodes, function (node) { + ap.forEach.call(elements, function (element) { + var ok = special === "down" ? element.contains(node) : //向下捕获 + node.contains(element) //向上冒泡 + if (ok) { + node._avalon = v //符合条件的加一个标识 + } + }); + }) + /* jshint ignore:end */ + } + } + } + var nodes = DOC.getElementsByTagName("*") //实现节点排序 + var alls = [] + ap.forEach.call(nodes, function (el) { + if (el._avalon) { + alls.push(el._avalon) + el._avalon = "" + el.removeAttribute("_avalon") + } + }) + if (special === "up") { + alls.reverse() + } + for (i = 0; callback = alls[i++]; ) { + if (callback.$fire.apply(callback, detail) === false) { + break + } + } + } else { + var callbacks = events[type] || [] + var all = events.$all || [] + for (i = 0; callback = callbacks[i++]; ) { + if (isFunction(callback)) + callback.apply(this, args) + } + for (i = 0; callback = all[i++]; ) { + if (isFunction(callback)) + callback.apply(this, arguments) + } + } + } + } + + /********************************************************************* + * modelFactory * + **********************************************************************/ +//avalon最核心的方法的两个方法之一（另一个是avalon.scan），返回一个ViewModel(VM) + var VMODELS = avalon.vmodels = {} //所有vmodel都储存在这里 + avalon.define = function (id, factory) { + var $id = id.$id || id + if (!$id) { + log("warning: vm必须指定$id") + } + if (VMODELS[$id]) { + log("warning: " + $id + " 已经存在于avalon.vmodels中") + } + if (typeof id === "object") { + var model = modelFactory(id) + } else { + var scope = { + $watch: noop + } + factory(scope) //得到所有定义 + + model = modelFactory(scope) //偷天换日，将scope换为model + stopRepeatAssign = true + factory(model) + stopRepeatAssign = false + } + model.$id = $id + return VMODELS[$id] = model + } + +//一些不需要被监听的属性 + var $$skipArray = String("$id,$watch,$unwatch,$fire,$events,$model,$skipArray,$proxy,$compute").match(rword) + var defineProperty = Object.defineProperty + var canHideOwn = true +//如果浏览器不支持ecma262v5的Object.defineProperties或者存在BUG，比如IE8 +//标准浏览器使用__defineGetter__, __defineSetter__实现 + try { + defineProperty({}, "_", { + value: "x" + }) + var defineProperties = Object.defineProperties + } catch (e) { + canHideOwn = false + } + + function modelFactory(source, $special, $model) { + if (Array.isArray(source)) { + var arr = source.concat() + source.length = 0 + var collection = arrayFactory(source) + collection.pushArray(arr) + return collection + } + //0 null undefined || Node || VModel(fix IE6-8 createWithProxy $val: val引发的BUG) + if (!source || source.nodeType > 0 || (source.$id && source.$events)) { + return source + } + var $skipArray = Array.isArray(source.$skipArray) ? source.$skipArray : [] + $skipArray.$special = $special || {} //强制要监听的属性 + var $vmodel = {} //要返回的对象, 它在IE6-8下可能被偷龙转凤 + $model = $model || {} //vmodels.$model属性 + var $events = {} //vmodel.$events属性 + var accessors = {} //监控属性 + var computed = [] + $$skipArray.forEach(function (name) { + delete source[name] + }) + + for (var i in source) { + (function (name, val, accessor) { + $model[name] = val + if (!isObservable(name, val, $skipArray)) { + return //过滤所有非监控属性 + } + //总共产生三种accessor + $events[name] = [] + var valueType = avalon.type(val) + //总共产生三种accessor + if (valueType === "object" && isFunction(val.get) && Object.keys(val).length <= 2) { + accessor = makeComputedAccessor(name, val) + computed.push(accessor) + } else if (rcomplexType.test(valueType)) { + accessor = makeComplexAccessor(name, val, valueType, $events[name]) + } else { + accessor = makeSimpleAccessor(name, val) + } + accessors[name] = accessor + })(i, source[i])// jshint ignore:line + } + + $vmodel = defineProperties($vmodel, descriptorFactory(accessors), source) //生成一个空的ViewModel + for (var name in source) { + if (!accessors[name]) { + $vmodel[name] = source[name] + } + } + //添加$id, $model, $events, $watch, $unwatch, $fire + $vmodel.$id = generateID() + $vmodel.$model = $model + $vmodel.$events = $events + for (i in EventBus) { + var fn = EventBus[i] + if (!W3C) { //在IE6-8下，VB对象的方法里的this并不指向自身，需要用bind处理一下 + fn = fn.bind($vmodel) + } + $vmodel[i] = fn + } + if (canHideOwn) { + Object.defineProperty($vmodel, "hasOwnProperty", { + value: function (name) { + return name in this.$model + }, + writable: false, + enumerable: false, + configurable: true + }) + + } else { + /* jshint ignore:start */ + $vmodel.hasOwnProperty = function (name) { + return name in $vmodel.$model + } + /* jshint ignore:end */ + } + + $vmodel.$compute = function () { + computed.forEach(function (accessor) { + dependencyDetection.begin({ + callback: function (vm, dependency) {//dependency为一个accessor + var name = dependency._name + if (dependency !== accessor) { + var list = vm.$events[name] + accessor.vm = $vmodel + injectDependency(list, accessor.digest) + } + } + }) + try { + accessor.get.call($vmodel) + } finally { + dependencyDetection.end() + } + }) + } + $vmodel.$compute() + return $vmodel + } +//创建一个简单访问器 + function makeSimpleAccessor(name, value) { + function accessor(value) { + var oldValue = accessor._value + if (arguments.length > 0) { + if (!stopRepeatAssign && !isEqual(value, oldValue)) { + accessor.updateValue(this, value) + accessor.notify(this, value, oldValue) + } + return this + } else { + dependencyDetection.collectDependency(this, accessor) + return oldValue + } + } + accessorFactory(accessor, name) + accessor._value = value + return accessor; + } + +//创建一个计算访问器 + function makeComputedAccessor(name, options) { + options.set = options.set || noop + function accessor(value) {//计算属性 + var oldValue = accessor._value + var init = "_value" in accessor + if (arguments.length > 0) { + if (stopRepeatAssign) { + return this + } + accessor.set.call(this, value) + return this + } else { + //将依赖于自己的高层访问器或视图刷新函数（以绑定对象形式）放到自己的订阅数组中 + value = accessor.get.call(this) + if (oldValue !== value) { + accessor.updateValue(this, value) + init && accessor.notify(this, value, oldValue) //触发$watch回调 + } + //将自己注入到低层访问器的订阅数组中 + return value + } + } + accessor.set = options.set || noop + accessor.get = options.get + accessorFactory(accessor, name) + var id + accessor.digest = function () { + accessor.updateValue = globalUpdateModelValue + accessor.notify = noop + accessor.call(accessor.vm) + clearTimeout(id)//如果计算属性存在多个依赖项，那么等它们都更新了才更新视图 + id = setTimeout(function () { + accessorFactory(accessor, accessor._name) + accessor.call(accessor.vm) + }) + } + return accessor + } + +//创建一个复杂访问器 + function makeComplexAccessor(name, initValue, valueType, list) { + function accessor(value) { + var oldValue = accessor._value + var son = accessor._vmodel + if (arguments.length > 0) { + if (stopRepeatAssign) { + return this + } + if (valueType === "array") { + var old = son._ + son._ = [] + son.clear() + son._ = old + son.pushArray(value) + } else if (valueType === "object") { + var $proxy = son.$proxy + var observes = this.$events[name] || [] + son = accessor._vmodel = modelFactory(value) + son.$events[subscribers] = observes + son.$proxy = $proxy + if (observes.length) { + observes.forEach(function (el) { + var fn = bindingHandlers[el.type] + if (fn) { //#753 + el.rollback && el.rollback() //还原 ms-with ms-on + fn(el, el.vmodels) + } + }) + } + } + accessor.updateValue(this, son.$model) + accessor.notify(this, this._value, oldValue) + return this + } else { + dependencyDetection.collectDependency(this, accessor) + return son + } + } + accessorFactory(accessor, name) + var son = accessor._vmodel = modelFactory(initValue) + son.$events[subscribers] = list + return accessor + } + + function globalUpdateValue(vmodel, value) { + vmodel.$model[this._name] = this._value = value + } + function globalUpdateModelValue(vmodel, value) { + vmodel.$model[this._name] = value + } + function globalNotify(vmodel, value, oldValue) { + var name = this._name + var array = vmodel.$events[name] //刷新值 + if (array) { + fireDependencies(array) //同步视图 + EventBus.$fire.call(vmodel, name, value, oldValue) //触发$watch回调 + } + } + + function accessorFactory(accessor, name) { + accessor._name = name + //同时更新_value与model + accessor.updateValue = globalUpdateValue + accessor.notify = globalNotify + } + +//比较两个值是否相等 + var isEqual = Object.is || function (v1, v2) { + if (v1 === 0 && v2 === 0) { + return 1 / v1 === 1 / v2 + } else if (v1 !== v1) { + return v2 !== v2 + } else { + return v1 === v2 + } + } + + function isObservable(name, value, $skipArray) { + if (isFunction(value) || value && value.nodeType) { + return false + } + if ($skipArray.indexOf(name) !== -1) { + return false + } + var $special = $skipArray.$special + if (name && name.charAt(0) === "$" && !$special[name]) { + return false + } + return true + } + + var descriptorFactory = W3C ? function (obj) { + var descriptors = {} + for (var i in obj) { + descriptors[i] = { + get: obj[i], + set: obj[i], + enumerable: true, + configurable: true + } + } + return descriptors + } : function (a) { + return a + } + + +//===================修复浏览器对Object.defineProperties的支持================= + if (!canHideOwn) { + if ("__defineGetter__" in avalon) { + defineProperty = function (obj, prop, desc) { + if ('value' in desc) { + obj[prop] = desc.value + } + if ("get" in desc) { + obj.__defineGetter__(prop, desc.get) + } + if ('set' in desc) { + obj.__defineSetter__(prop, desc.set) + } + return obj + } + defineProperties = function (obj, descs) { + for (var prop in descs) { + if (descs.hasOwnProperty(prop)) { + defineProperty(obj, prop, descs[prop]) + } + } + return obj + } + } + if (IEVersion) { + var VBClassPool = {} + window.execScript([// jshint ignore:line + "Function parseVB(code)", + "\tExecuteGlobal(code)", + "End Function" //转换一段文本为VB代码 + ].join("\n"), "VBScript") + function VBMediator(instance, accessors, name, value) {// jshint ignore:line + var accessor = accessors[name] + if (arguments.length === 4) { + accessor.call(instance, value) + } else { + return accessor.call(instance) + } + } + defineProperties = function (name, accessors, properties) { + // jshint ignore:line + var buffer = [] + buffer.push( + "\r\n\tPrivate [__data__], [__proxy__]", + "\tPublic Default Function [__const__](d, p)", + "\t\tSet [__data__] = d: set [__proxy__] = p", + "\t\tSet [__const__] = Me", //链式调用 + "\tEnd Function") + //添加普通属性,因为VBScript对象不能像JS那样随意增删属性，必须在这里预先定义好 + for (name in properties) { + if (!accessors.hasOwnProperty(name)) { + buffer.push("\tPublic [" + name + "]") + } + } + $$skipArray.forEach(function (name) { + if (!accessors.hasOwnProperty(name)) { + buffer.push("\tPublic [" + name + "]") + } + }) + buffer.push("\tPublic [" + 'hasOwnProperty' + "]") + //添加访问器属性 + for (name in accessors) { + buffer.push( + //由于不知对方会传入什么,因此set, let都用上 + "\tPublic Property Let [" + name + "](val" + expose + ")", //setter + "\t\tCall [__proxy__](Me,[__data__], \"" + name + "\", val" + expose + ")", + "\tEnd Property", + "\tPublic Property Set [" + name + "](val" + expose + ")", //setter + "\t\tCall [__proxy__](Me,[__data__], \"" + name + "\", val" + expose + ")", + "\tEnd Property", + "\tPublic Property Get [" + name + "]", //getter + "\tOn Error Resume Next", //必须优先使用set语句,否则它会误将数组当字符串返回 + "\t\tSet[" + name + "] = [__proxy__](Me,[__data__],\"" + name + "\")", + "\tIf Err.Number <> 0 Then", + "\t\t[" + name + "] = [__proxy__](Me,[__data__],\"" + name + "\")", + "\tEnd If", + "\tOn Error Goto 0", + "\tEnd Property") + + } + + buffer.push("End Class") + var body = buffer.join("\r\n") + var className =VBClassPool[body] + if (!className) { + className = generateID("VBClass") + window.parseVB("Class " + className + body) + window.parseVB([ + "Function " + className + "Factory(a, b)", //创建实例并传入两个关键的参数 + "\tDim o", + "\tSet o = (New " + className + ")(a, b)", + "\tSet " + className + "Factory = o", + "End Function" + ].join("\r\n")) + VBClassPool[body] = className + } + var ret = window[className + "Factory"](accessors, VBMediator) //得到其产品 + return ret //得到其产品 + } + } + } + + /********************************************************************* + * 监控数组（与ms-each, ms-repeat配合使用） * + **********************************************************************/ + + function arrayFactory(model) { + var array = [] + array.$id = generateID() + array.$model = model //数据模型 + array.$events = {} + array.$events[subscribers] = [] + array._ = modelFactory({ + length: model.length + }) + array._.$watch("length", function (a, b) { + array.$fire("length", a, b) + }) + for (var i in EventBus) { + array[i] = EventBus[i] + } + array.$map = { + el: 1 + } + array.$proxy = [] + avalon.mix(array, arrayPrototype) + return array + } + + function mutateArray(method, pos, n, index, method2, pos2, n2) { + var oldLen = this.length, loop = 2 + while (--loop) { + switch (method) { + case "add": + /* jshint ignore:start */ + var m = pos + n + var array = this.$model.slice(pos, m).map(function (el) { + if (rcomplexType.test(avalon.type(el))) {//转换为VM + return el.$id ? el : modelFactory(el, 0, el) + } else { + return el + } + }) + _splice.apply(this, [pos, 0].concat(array)) + /* jshint ignore:end */ + for (var i = pos; i < m; i++) {//生成代理VM + var proxy = eachProxyAgent(i, this) + this.$proxy.splice(i, 0, proxy) + } + this._fire("add", pos, n) + break + case "del": + var ret = this._splice(pos, n) + var removed = this.$proxy.splice(pos, n) //回收代理VM + eachProxyRecycler(removed, "each") + this._fire("del", pos, n) + break + } + if (method2) { + method = method2 + pos = pos2 + n = n2 + loop = 2 + method2 = 0 + } + } + resetIndex(this.$proxy, index) + if (this.length !== oldLen) { + this._.length = this.length + } + return ret + } + + var _splice = ap.splice + var arrayPrototype = { + _splice: _splice, + _fire: function (method, a, b) { + fireDependencies(this.$events[subscribers], method, a, b) + }, + size: function () { //取得数组长度，这个函数可以同步视图，length不能 + return this._.length + }, + pushArray: function (array) { + var m = array.length, n = this.length + if (m) { + ap.push.apply(this.$model, array) + mutateArray.call(this, "add", n, m, Math.max(0, n - 1)) + } + return m + n + }, + push: function () { + //http://jsperf.com/closure-with-arguments + var array = [] + var i, n = arguments.length + for (i = 0; i < n; i++) { + array[i] = arguments[i] + } + return this.pushArray(array) + }, + unshift: function () { + var m = arguments.length, n = this.length + if (m) { + ap.unshift.apply(this.$model, arguments) + mutateArray.call(this, "add", 0, m, 0) + } + return m + n //IE67的unshift不会返回长度 + }, + shift: function () { + if (this.length) { + var el = this.$model.shift() + mutateArray.call(this, "del", 0, 1, 0) + return el //返回被移除的元素 + } + }, + pop: function () { + var n = this.length + if (n) { + var el = this.$model.pop() + mutateArray.call(this, "del", n - 1, 1, Math.max(0, n - 2)) + return el //返回被移除的元素 + } + }, + splice: function (start) { + var m = arguments.length, args = [], change + var removed = _splice.apply(this.$model, arguments) + if (removed.length) { //如果用户删掉了元素 + args.push("del", start, removed.length, 0) + change = true + } + if (m > 2) { //如果用户添加了元素 + if (change) { + args.splice(3, 1, 0, "add", start, m - 2) + } else { + args.push("add", start, m - 2, 0) + } + change = true + } + if (change) { //返回被移除的元素 + return mutateArray.apply(this, args) + } else { + return [] + } + }, + contains: function (el) { //判定是否包含 + return this.indexOf(el) !== -1 + }, + remove: function (el) { //移除第一个等于给定值的元素 + return this.removeAt(this.indexOf(el)) + }, + removeAt: function (index) { //移除指定索引上的元素 + if (index >= 0) { + this.$model.splice(index, 1) + return mutateArray.call(this, "del", index, 1, 0) + } + return [] + }, + clear: function () { + eachProxyRecycler(this.$proxy, "each") + this.$model.length = this.$proxy.length = this.length = this._.length = 0 //清空数组 + this._fire("clear", 0) + return this + }, + removeAll: function (all) { //移除N个元素 + if (Array.isArray(all)) { + for (var i = this.length - 1; i >= 0; i--) { + if (all.indexOf(this[i]) !== -1) { + this.removeAt(i) + } + } + } else if (typeof all === "function") { + for (i = this.length - 1; i >= 0; i--) { + if (all(this[i], i)) { + this.removeAt(i) + } + } + } else { + this.clear() + } + }, + ensure: function (el) { + if (!this.contains(el)) { //只有不存在才push + this.push(el) + } + return this + }, + set: function (index, val) { + if (index >= 0) { + var valueType = avalon.type(val) + if (val && val.$model) { + val = val.$model + } + var target = this[index] + if (valueType === "object") { + for (var i in val) { + if (target.hasOwnProperty(i)) { + target[i] = val[i] + } + } + } else if (valueType === "array") { + target.clear().push.apply(target, val) + } else if (target !== val) { + this[index] = val + this.$model[index] = val + var proxy = this.$proxy[index] + if (proxy) { + fireDependencies(proxy.$events.$index) + } + } + } + return this + } + } +//相当于原来bindingExecutors.repeat 的index分支 + function resetIndex(array, pos) { + var last = array.length - 1 + for (var el; el = array[pos]; pos++) { + el.$index = pos + el.$first = pos === 0 + el.$last = pos === last + } + } + + function sortByIndex(array, indexes) { + var map = {}; + for (var i = 0, n = indexes.length; i < n; i++) { + map[i] = array[i] // preserve + var j = indexes[i] + if (j in map) { + array[i] = map[j] + delete map[j] + } else { + array[i] = array[j] + } + } + } + + "sort,reverse".replace(rword, function (method) { + arrayPrototype[method] = function () { + var newArray = this.$model//这是要排序的新数组 + var oldArray = newArray.concat() //保持原来状态的旧数组 + var mask = Math.random() + var indexes = [] + var hasSort + ap[method].apply(newArray, arguments) //排序 + for (var i = 0, n = oldArray.length; i < n; i++) { + var neo = newArray[i] + var old = oldArray[i] + if (isEqual(neo, old)) { + indexes.push(i) + } else { + var index = oldArray.indexOf(neo) + indexes.push(index)//得到新数组的每个元素在旧数组对应的位置 + oldArray[index] = mask //屏蔽已经找过的元素 + hasSort = true + } + } + if (hasSort) { + sortByIndex(this, indexes) + sortByIndex(this.$proxy, indexes) + this._fire("move", indexes) + resetIndex(this.$proxy, 0) + } + return this + } + }) + + var eachProxyPool = [] + + function eachProxyFactory() { + var source = { + $index: NaN, + $first: NaN, + $last: NaN, + $map: {}, + $host: {}, + $outer: {}, + $remove: avalon.noop, + el: { + get: function () { + //avalon1.4.4中，计算属性的订阅数组不再添加绑定对象 + return this.$host[this.$index] + }, + set: function (val) { + this.$host.set(this.$index, val) + } + } + } + + var second = { + $last: 1, + $first: 1, + $index: 1 + } + var proxy = modelFactory(source, second) + proxy.$id = generateID("$proxy$each") + return proxy + } + + function eachProxyAgent(index, host) { + var proxy = eachProxyPool.shift() + if (!proxy) { + proxy = eachProxyFactory( ) + }else{ + proxy.$compute() + } + var last = host.length - 1 + proxy.$host = host + proxy.$index = index + proxy.$first = index === 0 + proxy.$last = index === last + proxy.$map = host.$map + proxy.$remove = function () { + return host.removeAt(proxy.$index) + } + return proxy + } + + /********************************************************************* + * 依赖调度系统 * + **********************************************************************/ +//检测两个对象间的依赖关系 + var dependencyDetection = (function () { + var outerFrames = [] + var currentFrame + return { + begin: function (accessorObject) { + //accessorObject为一个拥有callback的对象 + outerFrames.push(currentFrame) + currentFrame = accessorObject + }, + end: function () { + currentFrame = outerFrames.pop() + }, + collectDependency: function (vmodel, accessor) { + if (currentFrame) { + //被dependencyDetection.begin调用 + currentFrame.callback(vmodel, accessor); + } + } + }; + })() +//将绑定对象注入到其依赖项的订阅数组中 + var ronduplex = /^(duplex|on)$/ + avalon.injectBinding = function (data) { + var fn = data.evaluator + if (fn) { //如果是求值函数 + dependencyDetection.begin({ + callback: function (vmodel, dependency) { + injectDependency(vmodel.$events[dependency._name], data) + } + }) + try { + var c = ronduplex.test(data.type) ? data : fn.apply(0, data.args) + data.handler(c, data.element, data) + } catch (e) { + //log("warning:exception throwed in [avalon.injectBinding] " + e) + delete data.evaluator + var node = data.element + if (node.nodeType === 3) { + var parent = node.parentNode + if (kernel.commentInterpolate) { + parent.replaceChild(DOC.createComment(data.value), node) + } else { + node.data = openTag + data.value + closeTag + } + } + } finally { + dependencyDetection.end() + } + } + } + +//将依赖项(比它高层的访问器或构建视图刷新函数的绑定对象)注入到订阅者数组 + function injectDependency(list, data) { + data = data || Registry[expose] + if (list && data && avalon.Array.ensure(list, data) && data.element) { + injectDisposeQueue(data, list) + } + } + +//通知依赖于这个访问器的订阅者更新自身 + function fireDependencies(list) { + if (list && list.length) { + if (new Date() - beginTime > 444 && typeof list[0] === "object") { + rejectDisposeQueue() + } + var args = aslice.call(arguments, 1) + for (var i = list.length, fn; fn = list[--i]; ) { + var el = fn.element + if (el && el.parentNode) { + try { + if (fn.$repeat) { + fn.handler.apply(fn, args) //处理监控数组的方法 + } else if (fn.type !== "on") { //事件绑定只能由用户触发,不能由程序触发 + var fun = fn.evaluator || noop + fn.handler(fun.apply(0, fn.args || []), el, fn) + + } + } catch (e) { + } + } + } + } + } + /********************************************************************* + * 定时GC回收机制 * + **********************************************************************/ + var disposeCount = 0 + var disposeQueue = avalon.$$subscribers = [] + var beginTime = new Date() + var oldInfo = {} + function getUid(obj) { //IE9+,标准浏览器 + return obj.uniqueNumber || (obj.uniqueNumber = ++disposeCount) + } + +//添加到回收列队中 + function injectDisposeQueue(data, list) { + var elem = data.element + if (!data.uuid) { + if (elem.nodeType !== 1) { + data.uuid = data.type + (data.pos || 0) + "-" + getUid(elem.parentNode) + } else { + data.uuid = data.name + "-" + getUid(elem) + } + } + var lists = data.lists || (data.lists = []) + avalon.Array.ensure(lists, list) + list.$uuid = list.$uuid || generateID() + if (!disposeQueue[data.uuid]) { + disposeQueue[data.uuid] = 1 + disposeQueue.push(data) + } + } + + function rejectDisposeQueue(data) { + if(avalon.optimize) + return + var i = disposeQueue.length + var n = i + var allTypes = [] + var iffishTypes = {} + var newInfo = {} + //对页面上所有绑定对象进行分门别类, 只检测个数发生变化的类型 + while (data = disposeQueue[--i]) { + var type = data.type + if (newInfo[type]) { + newInfo[type]++ + } else { + newInfo[type] = 1 + allTypes.push(type) + } + } + var diff = false + allTypes.forEach(function (type) { + if (oldInfo[type] !== newInfo[type]) { + iffishTypes[type] = 1 + diff = true + } + }) + i = n + if (diff) { + while (data = disposeQueue[--i]) { + if (!data.element) + continue + if (iffishTypes[data.type] && shouldDispose(data.element)) { //如果它没有在DOM树 + disposeQueue.splice(i, 1) + delete disposeQueue[data.uuid] + var lists = data.lists + for (var k = 0, list; list = lists[k++]; ) { + avalon.Array.remove(lists, list) + avalon.Array.remove(list, data) + } + disposeData(data) + } + } + } + oldInfo = newInfo + beginTime = new Date() + } + + function disposeData(data) { + data.element = null + data.rollback && data.rollback() + for (var key in data) { + data[key] = null + } + } + + function shouldDispose(el) { + try {//IE下，如果文本节点脱离DOM树，访问parentNode会报错 + if (!el.parentNode) { + return true + } + } catch (e) { + return true + } + + return el.msRetain ? 0 : (el.nodeType === 1 ? !root.contains(el) : !avalon.contains(root, el)) + } + + /************************************************************************ + * HTML处理(parseHTML, innerHTML, clearHTML) * + ************************************************************************/ +// We have to close these tags to support XHTML + var tagHooks = { + area: [1, "", ""], + param: [1, "", ""], + col: [2, "", "
"], + legend: [1, "
", "
"], + option: [1, ""], + thead: [1, "", "
"], + tr: [2, "", "
"], + td: [3, "", "
"], + g: [1, '', ''], + //IE6-8在用innerHTML生成节点时，不能直接创建no-scope元素与HTML5的新标签 + _default: W3C ? [0, "", ""] : [1, "X
", "
"] //div可以不用闭合 + } + tagHooks.th = tagHooks.td + tagHooks.optgroup = tagHooks.option + tagHooks.tbody = tagHooks.tfoot = tagHooks.colgroup = tagHooks.caption = tagHooks.thead + String("circle,defs,ellipse,image,line,path,polygon,polyline,rect,symbol,text,use").replace(rword, function (tag) { + tagHooks[tag] = tagHooks.g //处理SVG + }) + var rtagName = /<([\w:]+)/ //取得其tagName + var rxhtml = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig + var rcreate = W3C ? /[^\d\D]/ : /(<(?:script|link|style|meta|noscript))/ig + var scriptTypes = oneObject(["", "text/javascript", "text/ecmascript", "application/ecmascript", "application/javascript"]) + var rnest = /<(?:tb|td|tf|th|tr|col|opt|leg|cap|area)/ //需要处理套嵌关系的标签 + var script = DOC.createElement("script") + var rhtml = /<|&#?\w+;/ + avalon.parseHTML = function (html) { + var fragment = avalonFragment.cloneNode(false) + if (typeof html !== "string") { + return fragment + } + if (!rhtml.test(html)) { + fragment.appendChild(DOC.createTextNode(html)) + return fragment + } + html = html.replace(rxhtml, "<$1>").trim() + var tag = (rtagName.exec(html) || ["", ""])[1].toLowerCase(), + //取得其标签名 + wrap = tagHooks[tag] || tagHooks._default, + wrapper = cinerator, + firstChild, neo + if (!W3C) { //fix IE + html = html.replace(rcreate, "
$1") //在link style script等标签之前添加一个补丁 + } + wrapper.innerHTML = wrap[1] + html + wrap[2] + var els = wrapper.getElementsByTagName("script") + if (els.length) { //使用innerHTML生成的script节点不会发出请求与执行text属性 + for (var i = 0, el; el = els[i++]; ) { + if (scriptTypes[el.type]) { + //以偷龙转凤方式恢复执行脚本功能 + neo = script.cloneNode(false) //FF不能省略参数 + ap.forEach.call(el.attributes, function (attr) { + if (attr && attr.specified) { + neo[attr.name] = attr.value //复制其属性 + neo.setAttribute(attr.name, attr.value) + } + }) // jshint ignore:line + neo.text = el.text + el.parentNode.replaceChild(neo, el) //替换节点 + } + } + } + if (!W3C) { //fix IE + var target = wrap[1] === "X
" ? wrapper.lastChild.firstChild : wrapper.lastChild + if (target && target.tagName === "TABLE" && tag !== "tbody") { + //IE6-7处理 --> , + // --> , + // -->
+ for (els = target.childNodes, i = 0; el = els[i++]; ) { + if (el.tagName === "TBODY" && !el.innerHTML) { + target.removeChild(el) + break + } + } + } + els = wrapper.getElementsByTagName("br") + var n = els.length + while (el = els[--n]) { + if (el.className === "msNoScope") { + el.parentNode.removeChild(el) + } + } + for (els = wrapper.all, i = 0; el = els[i++]; ) { //fix VML + if (isVML(el)) { + fixVML(el) + } + } + } + //移除我们为了符合套嵌关系而添加的标签 + for (i = wrap[0]; i--; wrapper = wrapper.lastChild) { + } + while (firstChild = wrapper.firstChild) { // 将wrapper上的节点转移到文档碎片上！ + fragment.appendChild(firstChild) + } + return fragment + } + + function isVML(src) { + var nodeName = src.nodeName + return nodeName.toLowerCase() === nodeName && src.scopeName && src.outerText === "" + } + + function fixVML(node) { + if (node.currentStyle.behavior !== "url(#default#VML)") { + node.style.behavior = "url(#default#VML)" + node.style.display = "inline-block" + node.style.zoom = 1 //hasLayout + } + } + avalon.innerHTML = function (node, html) { + if (!W3C && (!rcreate.test(html) && !rnest.test(html))) { + try { + node.innerHTML = html + return + } catch (e) { + } + } + var a = this.parseHTML(html) + this.clearHTML(node).appendChild(a) + } + avalon.clearHTML = function (node) { + node.textContent = "" + while (node.firstChild) { + node.removeChild(node.firstChild) + } + return node + } + + /********************************************************************* + * avalon的原型方法定义区 * + **********************************************************************/ + + function hyphen(target) { + //转换为连字符线风格 + return target.replace(/([a-z\d])([A-Z]+)/g, "$1-$2").toLowerCase() + } + + function camelize(target) { + //提前判断，提高getStyle等的效率 + if (!target || target.indexOf("-") < 0 && target.indexOf("_") < 0) { + return target + } + //转换为驼峰风格 + return target.replace(/[-_][^-_]/g, function(match) { + return match.charAt(1).toUpperCase() + }) + } + + var fakeClassListMethods = { + _toString: function() { + var node = this.node + var cls = node.className + var str = typeof cls === "string" ? cls : cls.baseVal + return str.split(/\s+/).join(" ") + }, + _contains: function(cls) { + return (" " + this + " ").indexOf(" " + cls + " ") > -1 + }, + _add: function(cls) { + if (!this.contains(cls)) { + this._set(this + " " + cls) + } + }, + _remove: function(cls) { + this._set((" " + this + " ").replace(" " + cls + " ", " ")) + }, + __set: function(cls) { + cls = cls.trim() + var node = this.node + if (rsvg.test(node)) { + //SVG元素的className是一个对象 SVGAnimatedString { baseVal="", animVal=""}，只能通过set/getAttribute操作 + node.setAttribute("class", cls) + } else { + node.className = cls + } + } //toggle存在版本差异，因此不使用它 + } + + function fakeClassList(node) { + if (!("classList" in node)) { + node.classList = { + node: node + } + for (var k in fakeClassListMethods) { + node.classList[k.slice(1)] = fakeClassListMethods[k] + } + } + return node.classList + } + + + "add,remove".replace(rword, function(method) { + avalon.fn[method + "Class"] = function(cls) { + var el = this[0] + //https://developer.mozilla.org/zh-CN/docs/Mozilla/Firefox/Releases/26 + if (cls && typeof cls === "string" && el && el.nodeType === 1) { + cls.replace(/\S+/g, function(c) { + fakeClassList(el)[method](c) + }) + } + return this + } + }) + avalon.fn.mix({ + hasClass: function(cls) { + var el = this[0] || {} + return el.nodeType === 1 && fakeClassList(el).contains(cls) + }, + toggleClass: function(value, stateVal) { + var className, i = 0 + var classNames = String(value).split(/\s+/) + var isBool = typeof stateVal === "boolean" + while ((className = classNames[i++])) { + var state = isBool ? stateVal : !this.hasClass(className) + this[state ? "addClass" : "removeClass"](className) + } + return this + }, + attr: function(name, value) { + if (arguments.length === 2) { + this[0].setAttribute(name, value) + return this + } else { + return this[0].getAttribute(name) + } + }, + data: function(name, value) { + name = "data-" + hyphen(name || "") + switch (arguments.length) { + case 2: + this.attr(name, value) + return this + case 1: + var val = this.attr(name) + return parseData(val) + case 0: + var ret = {} + ap.forEach.call(this[0].attributes, function(attr) { + if (attr) { + name = attr.name + if (!name.indexOf("data-")) { + name = camelize(name.slice(5)) + ret[name] = parseData(attr.value) + } + } + }) + return ret + } + }, + removeData: function(name) { + name = "data-" + hyphen(name) + this[0].removeAttribute(name) + return this + }, + css: function(name, value) { + if (avalon.isPlainObject(name)) { + for (var i in name) { + avalon.css(this, i, name[i]) + } + } else { + var ret = avalon.css(this, name, value) + } + return ret !== void 0 ? ret : this + }, + position: function() { + var offsetParent, offset, + elem = this[0], + parentOffset = { + top: 0, + left: 0 + } + if (!elem) { + return + } + if (this.css("position") === "fixed") { + offset = elem.getBoundingClientRect() + } else { + offsetParent = this.offsetParent() //得到真正的offsetParent + offset = this.offset() // 得到正确的offsetParent + if (offsetParent[0].tagName !== "HTML") { + parentOffset = offsetParent.offset() + } + parentOffset.top += avalon.css(offsetParent[0], "borderTopWidth", true) + parentOffset.left += avalon.css(offsetParent[0], "borderLeftWidth", true) + + // Subtract offsetParent scroll positions + parentOffset.top -= offsetParent.scrollTop() + parentOffset.left -= offsetParent.scrollLeft() + } + return { + top: offset.top - parentOffset.top - avalon.css(elem, "marginTop", true), + left: offset.left - parentOffset.left - avalon.css(elem, "marginLeft", true) + } + }, + offsetParent: function() { + var offsetParent = this[0].offsetParent + while (offsetParent && avalon.css(offsetParent, "position") === "static") { + offsetParent = offsetParent.offsetParent; + } + return avalon(offsetParent || root) + }, + bind: function(type, fn, phase) { + if (this[0]) { //此方法不会链 + return avalon.bind(this[0], type, fn, phase) + } + }, + unbind: function(type, fn, phase) { + if (this[0]) { + avalon.unbind(this[0], type, fn, phase) + } + return this + }, + val: function(value) { + var node = this[0] + if (node && node.nodeType === 1) { + var get = arguments.length === 0 + var access = get ? ":get" : ":set" + var fn = valHooks[getValType(node) + access] + if (fn) { + var val = fn(node, value) + } else if (get) { + return (node.value || "").replace(/\r/g, "") + } else { + node.value = value + } + } + return get ? val : this + } + }) + + function parseData(data) { + try { + if (typeof data === "object") + return data + data = data === "true" ? true : + data === "false" ? false : + data === "null" ? null : +data + "" === data ? +data : rbrace.test(data) ? avalon.parseJSON(data) : data + } catch (e) {} + return data + } + var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/, + rvalidchars = /^[\],:{}\s]*$/, + rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, + rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g, + rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g + avalon.parseJSON = window.JSON ? JSON.parse : function(data) { + if (typeof data === "string") { + data = data.trim(); + if (data) { + if (rvalidchars.test(data.replace(rvalidescape, "@") + .replace(rvalidtokens, "]") + .replace(rvalidbraces, ""))) { + return (new Function("return " + data))() // jshint ignore:line + } + } + avalon.error("Invalid JSON: " + data) + } + return data + } + +//生成avalon.fn.scrollLeft, avalon.fn.scrollTop方法 + avalon.each({ + scrollLeft: "pageXOffset", + scrollTop: "pageYOffset" + }, function(method, prop) { + avalon.fn[method] = function(val) { + var node = this[0] || {}, win = getWindow(node), + top = method === "scrollTop" + if (!arguments.length) { + return win ? (prop in win) ? win[prop] : root[method] : node[method] + } else { + if (win) { + win.scrollTo(!top ? val : avalon(win).scrollLeft(), top ? val : avalon(win).scrollTop()) + } else { + node[method] = val + } + } + } + }) + + function getWindow(node) { + return node.window && node.document ? node : node.nodeType === 9 ? node.defaultView || node.parentWindow : false; + } +//=============================css相关======================= + var cssHooks = avalon.cssHooks = {} + var prefixes = ["", "-webkit-", "-o-", "-moz-", "-ms-"] + var cssMap = { + "float": W3C ? "cssFloat" : "styleFloat" + } + avalon.cssNumber = oneObject("columnCount,order,fillOpacity,fontWeight,lineHeight,opacity,orphans,widows,zIndex,zoom") + + avalon.cssName = function(name, host, camelCase) { + if (cssMap[name]) { + return cssMap[name] + } + host = host || root.style + for (var i = 0, n = prefixes.length; i < n; i++) { + camelCase = camelize(prefixes[i] + name) + if (camelCase in host) { + return (cssMap[name] = camelCase) + } + } + return null + } + cssHooks["@:set"] = function(node, name, value) { + try { //node.style.width = NaN;node.style.width = "xxxxxxx";node.style.width = undefine 在旧式IE下会抛异常 + node.style[name] = value + } catch (e) {} + } + if (window.getComputedStyle) { + cssHooks["@:get"] = function(node, name) { + if (!node || !node.style) { + throw new Error("getComputedStyle要求传入一个节点 " + node) + } + var ret, styles = getComputedStyle(node, null) + if (styles) { + ret = name === "filter" ? styles.getPropertyValue(name) : styles[name] + if (ret === "") { + ret = node.style[name] //其他浏览器需要我们手动取内联样式 + } + } + return ret + } + cssHooks["opacity:get"] = function(node) { + var ret = cssHooks["@:get"](node, "opacity") + return ret === "" ? "1" : ret + } + } else { + var rnumnonpx = /^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i + var rposition = /^(top|right|bottom|left)$/ + var ralpha = /alpha\([^)]*\)/i + var ie8 = !! window.XDomainRequest + var salpha = "DXImageTransform.Microsoft.Alpha" + var border = { + thin: ie8 ? '1px' : '2px', + medium: ie8 ? '3px' : '4px', + thick: ie8 ? '5px' : '6px' + } + cssHooks["@:get"] = function(node, name) { + //取得精确值，不过它有可能是带em,pc,mm,pt,%等单位 + var currentStyle = node.currentStyle + var ret = currentStyle[name] + if ((rnumnonpx.test(ret) && !rposition.test(ret))) { + //①，保存原有的style.left, runtimeStyle.left, + var style = node.style, + left = style.left, + rsLeft = node.runtimeStyle.left + //②由于③处的style.left = xxx会影响到currentStyle.left， + //因此把它currentStyle.left放到runtimeStyle.left， + //runtimeStyle.left拥有最高优先级，不会style.left影响 + node.runtimeStyle.left = currentStyle.left + //③将精确值赋给到style.left，然后通过IE的另一个私有属性 style.pixelLeft + //得到单位为px的结果；fontSize的分支见http://bugs.jquery.com/ticket/760 + style.left = name === 'fontSize' ? '1em' : (ret || 0) + ret = style.pixelLeft + "px" + //④还原 style.left，runtimeStyle.left + style.left = left + node.runtimeStyle.left = rsLeft + } + if (ret === "medium") { + name = name.replace("Width", "Style") + //border width 默认值为medium，即使其为0" + if (currentStyle[name] === "none") { + ret = "0px" + } + } + return ret === "" ? "auto" : border[ret] || ret + } + cssHooks["opacity:set"] = function(node, name, value) { + var style = node.style + var opacity = isFinite(value) && value <= 1 ? "alpha(opacity=" + value * 100 + ")" : "" + var filter = style.filter || ""; + style.zoom = 1 + //不能使用以下方式设置透明度 + //node.filters.alpha.opacity = value * 100 + style.filter = (ralpha.test(filter) ? + filter.replace(ralpha, opacity) : + filter + " " + opacity).trim() + if (!style.filter) { + style.removeAttribute("filter") + } + } + cssHooks["opacity:get"] = function(node) { + //这是最快的获取IE透明值的方式，不需要动用正则了！ + var alpha = node.filters.alpha || node.filters[salpha], + op = alpha && alpha.enabled ? alpha.opacity : 100 + return (op / 100) + "" //确保返回的是字符串 + } + } + + "top,left".replace(rword, function(name) { + cssHooks[name + ":get"] = function(node) { + var computed = cssHooks["@:get"](node, name) + return /px$/.test(computed) ? computed : + avalon(node).position()[name] + "px" + } + }) + + var cssShow = { + position: "absolute", + visibility: "hidden", + display: "block" + } + + var rdisplayswap = /^(none|table(?!-c[ea]).+)/ + + function showHidden(node, array) { + //http://www.cnblogs.com/rubylouvre/archive/2012/10/27/2742529.html + if (node.offsetWidth <= 0) { //opera.offsetWidth可能小于0 + if (rdisplayswap.test(cssHooks["@:get"](node, "display"))) { + var obj = { + node: node + } + for (var name in cssShow) { + obj[name] = node.style[name] + node.style[name] = cssShow[name] + } + array.push(obj) + } + var parent = node.parentNode + if (parent && parent.nodeType === 1) { + showHidden(parent, array) + } + } + } + "Width,Height".replace(rword, function(name) { //fix 481 + var method = name.toLowerCase(), + clientProp = "client" + name, + scrollProp = "scroll" + name, + offsetProp = "offset" + name + cssHooks[method + ":get"] = function(node, which, override) { + var boxSizing = -4 + if (typeof override === "number") { + boxSizing = override + } + which = name === "Width" ? ["Left", "Right"] : ["Top", "Bottom"] + var ret = node[offsetProp] // border-box 0 + if (boxSizing === 2) { // margin-box 2 + return ret + avalon.css(node, "margin" + which[0], true) + avalon.css(node, "margin" + which[1], true) + } + if (boxSizing < 0) { // padding-box -2 + ret = ret - avalon.css(node, "border" + which[0] + "Width", true) - avalon.css(node, "border" + which[1] + "Width", true) + } + if (boxSizing === -4) { // content-box -4 + ret = ret - avalon.css(node, "padding" + which[0], true) - avalon.css(node, "padding" + which[1], true) + } + return ret + } + cssHooks[method + "&get"] = function(node) { + var hidden = []; + showHidden(node, hidden); + var val = cssHooks[method + ":get"](node) + for (var i = 0, obj; obj = hidden[i++];) { + node = obj.node + for (var n in obj) { + if (typeof obj[n] === "string") { + node.style[n] = obj[n] + } + } + } + return val; + } + avalon.fn[method] = function(value) { //会忽视其display + var node = this[0] + if (arguments.length === 0) { + if (node.setTimeout) { //取得窗口尺寸,IE9后可以用node.innerWidth /innerHeight代替 + return node["inner" + name] || node.document.documentElement[clientProp] + } + if (node.nodeType === 9) { //取得页面尺寸 + var doc = node.documentElement + //FF chrome html.scrollHeight< body.scrollHeight + //IE 标准模式 : html.scrollHeight> body.scrollHeight + //IE 怪异模式 : html.scrollHeight 最大等于可视窗口多一点？ + return Math.max(node.body[scrollProp], doc[scrollProp], node.body[offsetProp], doc[offsetProp], doc[clientProp]) + } + return cssHooks[method + "&get"](node) + } else { + return this.css(method, value) + } + } + avalon.fn["inner" + name] = function() { + return cssHooks[method + ":get"](this[0], void 0, -2) + } + avalon.fn["outer" + name] = function(includeMargin) { + return cssHooks[method + ":get"](this[0], void 0, includeMargin === true ? 2 : 0) + } + }) + avalon.fn.offset = function() { //取得距离页面左右角的坐标 + var node = this[0], + box = { + left: 0, + top: 0 + } + if (!node || !node.tagName || !node.ownerDocument) { + return box + } + var doc = node.ownerDocument, + body = doc.body, + root = doc.documentElement, + win = doc.defaultView || doc.parentWindow + if (!avalon.contains(root, node)) { + return box + } + //http://hkom.blog1.fc2.com/?mode=m&no=750 body的偏移量是不包含margin的 + //我们可以通过getBoundingClientRect来获得元素相对于client的rect. + //http://msdn.microsoft.com/en-us/library/ms536433.aspx + if (node.getBoundingClientRect) { + box = node.getBoundingClientRect() // BlackBerry 5, iOS 3 (original iPhone) + } + //chrome/IE6: body.scrollTop, firefox/other: root.scrollTop + var clientTop = root.clientTop || body.clientTop, + clientLeft = root.clientLeft || body.clientLeft, + scrollTop = Math.max(win.pageYOffset || 0, root.scrollTop, body.scrollTop), + scrollLeft = Math.max(win.pageXOffset || 0, root.scrollLeft, body.scrollLeft) + // 把滚动距离加到left,top中去。 + // IE一些版本中会自动为HTML元素加上2px的border，我们需要去掉它 + // http://msdn.microsoft.com/en-us/library/ms533564(VS.85).aspx + return { + top: box.top + scrollTop - clientTop, + left: box.left + scrollLeft - clientLeft + } + } + + //==================================val相关============================ + + function getValType(elem) { + var ret = elem.tagName.toLowerCase() + return ret === "input" && /checkbox|radio/.test(elem.type) ? "checked" : ret + } + var roption = /^]+))?)*\s+value[\s=]/i + var valHooks = { + "option:get": IEVersion ? function(node) { + //在IE11及W3C，如果没有指定value，那么node.value默认为node.text（存在trim作），但IE9-10则是取innerHTML(没trim操作) + //specified并不可靠，因此通过分析outerHTML判定用户有没有显示定义value + return roption.test(node.outerHTML) ? node.value : node.text.trim() + } : function(node) { + return node.value + }, + "select:get": function(node, value) { + var option, options = node.options, + index = node.selectedIndex, + getter = valHooks["option:get"], + one = node.type === "select-one" || index < 0, + values = one ? null : [], + max = one ? index + 1 : options.length, + i = index < 0 ? max : one ? index : 0 + for (; i < max; i++) { + option = options[i] + //旧式IE在reset后不会改变selected，需要改用i === index判定 + //我们过滤所有disabled的option元素，但在safari5下，如果设置select为disable，那么其所有孩子都disable + //因此当一个元素为disable，需要检测其是否显式设置了disable及其父节点的disable情况 + if ((option.selected || i === index) && !option.disabled) { + value = getter(option) + if (one) { + return value + } + //收集所有selected值组成数组返回 + values.push(value) + } + } + return values + }, + "select:set": function(node, values, optionSet) { + values = [].concat(values) //强制转换为数组 + var getter = valHooks["option:get"] + for (var i = 0, el; el = node.options[i++];) { + if ((el.selected = values.indexOf(getter(el)) > -1)) { + optionSet = true + } + } + if (!optionSet) { + node.selectedIndex = -1 + } + } + } + + /********************************************************************* + * 编译系统 * + **********************************************************************/ + var meta = { + '\b': '\\b', + '\t': '\\t', + '\n': '\\n', + '\f': '\\f', + '\r': '\\r', + '"': '\\"', + '\\': '\\\\' + } + var quote = window.JSON && JSON.stringify || function(str) { + return '"' + str.replace(/[\\\"\x00-\x1f]/g, function(a) { + var c = meta[a]; + return typeof c === 'string' ? c : + '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4); + }) + '"' + } + + var keywords = [ + "break,case,catch,continue,debugger,default,delete,do,else,false", + "finally,for,function,if,in,instanceof,new,null,return,switch,this", + "throw,true,try,typeof,var,void,while,with", /* 关键字*/ + "abstract,boolean,byte,char,class,const,double,enum,export,extends", + "final,float,goto,implements,import,int,interface,long,native", + "package,private,protected,public,short,static,super,synchronized", + "throws,transient,volatile", /*保留字*/ + "arguments,let,yield,undefined" /* ECMA 5 - use strict*/].join(",") + var rrexpstr = /\/\*[\w\W]*?\*\/|\/\/[^\n]*\n|\/\/[^\n]*$|"(?:[^"\\]|\\[\w\W])*"|'(?:[^'\\]|\\[\w\W])*'|[\s\t\n]*\.[\s\t\n]*[$\w\.]+/g + var rsplit = /[^\w$]+/g + var rkeywords = new RegExp(["\\b" + keywords.replace(/,/g, '\\b|\\b') + "\\b"].join('|'), 'g') + var rnumber = /\b\d[^,]*/g + var rcomma = /^,+|,+$/g + var variablePool = new Cache(512) + var getVariables = function (code) { + var key = "," + code.trim() + var ret = variablePool.get(key) + if (ret) { + return ret + } + var match = code + .replace(rrexpstr, "") + .replace(rsplit, ",") + .replace(rkeywords, "") + .replace(rnumber, "") + .replace(rcomma, "") + .split(/^$|,+/) + return variablePool.put(key, uniqSet(match)) + } + /*添加赋值语句*/ + + function addAssign(vars, scope, name, data) { + var ret = [], + prefix = " = " + name + "." + var isProxy = /\$proxy\$each/.test(scope.$id) + for (var i = vars.length, prop; prop = vars[--i]; ) { + var el = isProxy && scope.$map[prop] ? "el" : prop + if (scope.hasOwnProperty(el)) { + ret.push(prop + prefix + el) + data.vars.push(prop) + if (data.type === "duplex") { + vars.get = name + "." + el + } + vars.splice(i, 1) + } + } + return ret + } + + function uniqSet(array) { + var ret = [], + unique = {} + for (var i = 0; i < array.length; i++) { + var el = array[i] + var id = el && typeof el.$id === "string" ? el.$id : el + if (!unique[id]) { + unique[id] = ret.push(el) + } + } + return ret + } +//缓存求值函数，以便多次利用 + var evaluatorPool = new Cache(128) +//取得求值函数及其传参 + var rduplex = /\w\[.*\]|\w\.\w/ + var rproxy = /(\$proxy\$[a-z]+)\d+$/ + var rthimRightParentheses = /\)\s*$/ + var rthimOtherParentheses = /\)\s*\|/g + var rquoteFilterName = /\|\s*([$\w]+)/g + var rpatchBracket = /"\s*\["/g + var rthimLeftParentheses = /"\s*\(/g + function parseFilter(val, filters) { + filters = filters + .replace(rthimRightParentheses, "")//处理最后的小括号 + .replace(rthimOtherParentheses, function () {//处理其他小括号 + return "],|" + }) + .replace(rquoteFilterName, function (a, b) { //处理|及它后面的过滤器的名字 + return "[" + quote(b) + }) + .replace(rpatchBracket, function () { + return '"],["' + }) + .replace(rthimLeftParentheses, function () { + return '",' + }) + "]" + return "return avalon.filters.$filter(" + val + ", " + filters + ")" + } + + function parseExpr(code, scopes, data) { + var dataType = data.type + var filters = data.filters || "" + var exprId = scopes.map(function (el) { + return String(el.$id).replace(rproxy, "$1") + }) + code + dataType + filters + var vars = getVariables(code).concat(), + assigns = [], + names = [], + args = [], + prefix = "" + //args 是一个对象数组， names 是将要生成的求值函数的参数 + scopes = uniqSet(scopes) + data.vars = [] + for (var i = 0, sn = scopes.length; i < sn; i++) { + if (vars.length) { + var name = "vm" + expose + "_" + i + names.push(name) + args.push(scopes[i]) + assigns.push.apply(assigns, addAssign(vars, scopes[i], name, data)) + } + } + if (!assigns.length && dataType === "duplex") { + return + } + if (dataType !== "duplex" && (code.indexOf("||") > -1 || code.indexOf("&&") > -1)) { + //https://github.com/RubyLouvre/avalon/issues/583 + data.vars.forEach(function (v) { + var reg = new RegExp("\\b" + v + "(?:\\.\\w+|\\[\\w+\\])+", "ig") + code = code.replace(reg, function (_) { + var c = _.charAt(v.length) + var r = IEVersion ? code.slice(arguments[1] + _.length) : RegExp.rightContext + var method = /^\s*\(/.test(r) + if (c === "." || c === "[" || method) {//比如v为aa,我们只匹配aa.bb,aa[cc],不匹配aaa.xxx + var name = "var" + String(Math.random()).replace(/^0\./, "") + if (method) {//array.size() + var array = _.split(".") + if (array.length > 2) { + var last = array.pop() + assigns.push(name + " = " + array.join(".")) + return name + "." + last + } else { + return _ + } + } + assigns.push(name + " = " + _) + return name + } else { + return _ + } + }) + }) + } + //---------------args---------------- + data.args = args + //---------------cache---------------- + delete data.vars + var fn = evaluatorPool.get(exprId) //直接从缓存，免得重复生成 + if (fn) { + data.evaluator = fn + return + } + prefix = assigns.join(", ") + if (prefix) { + prefix = "var " + prefix + } + if (/\S/.test(filters)) { //文本绑定，双工绑定才有过滤器 + if (!/text|html/.test(data.type)) { + throw Error("ms-" + data.type + "不支持过滤器") + } + code = "\nvar ret" + expose + " = " + code + ";\r\n" + code += parseFilter("ret" + expose, filters) + } else if (dataType === "duplex") { //双工绑定 + var _body = "'use strict';\nreturn function(vvv){\n\t" + + prefix + + ";\n\tif(!arguments.length){\n\t\treturn " + + code + + "\n\t}\n\t" + (!rduplex.test(code) ? vars.get : code) + + "= vvv;\n} " + try { + fn = Function.apply(noop, names.concat(_body)) + data.evaluator = evaluatorPool.put(exprId, fn) + } catch (e) { + log("debug: parse error," + e.message) + } + return + } else if (dataType === "on") { //事件绑定 + if (code.indexOf("(") === -1) { + code += ".call(this, $event)" + } else { + code = code.replace("(", ".call(this,") + } + names.push("$event") + code = "\nreturn " + code + ";" //IE全家 Function("return ")出错，需要Function("return ;") + var lastIndex = code.lastIndexOf("\nreturn") + var header = code.slice(0, lastIndex) + var footer = code.slice(lastIndex) + code = header + "\n" + footer + } else { //其他绑定 + code = "\nreturn " + code + ";" //IE全家 Function("return ")出错，需要Function("return ;") + } + try { + fn = Function.apply(noop, names.concat("'use strict';\n" + prefix + code)) + data.evaluator = evaluatorPool.put(exprId, fn) + } catch (e) { + log("debug: parse error," + e.message) + } finally { + vars = assigns = names = null //释放内存 + } + } + + +//parseExpr的智能引用代理 + + function parseExprProxy(code, scopes, data, tokens, noRegister) { + if (Array.isArray(tokens)) { + code = tokens.map(function (el) { + return el.expr ? "(" + el.value + ")" : quote(el.value) + }).join(" + ") + } + parseExpr(code, scopes, data) + if (data.evaluator && !noRegister) { + data.handler = bindingExecutors[data.handlerName || data.type] + //方便调试 + //这里非常重要,我们通过判定视图刷新函数的element是否在DOM树决定 + //将它移出订阅者列表 + avalon.injectBinding(data) + } + } + avalon.parseExprProxy = parseExprProxy + /********************************************************************* + * 扫描系统 * + **********************************************************************/ + + avalon.scan = function(elem, vmodel) { + elem = elem || root + var vmodels = vmodel ? [].concat(vmodel) : [] + scanTag(elem, vmodels) + } + +//http://www.w3.org/TR/html5/syntax.html#void-elements + var stopScan = oneObject("area,base,basefont,br,col,command,embed,hr,img,input,link,meta,param,source,track,wbr,noscript,script,style,textarea".toUpperCase()) + + function checkScan(elem, callback, innerHTML) { + var id = setTimeout(function() { + var currHTML = elem.innerHTML + clearTimeout(id) + if (currHTML === innerHTML) { + callback() + } else { + checkScan(elem, callback, currHTML) + } + }) + } + + + function createSignalTower(elem, vmodel) { + var id = elem.getAttribute("avalonctrl") || vmodel.$id + elem.setAttribute("avalonctrl", id) + vmodel.$events.expr = elem.tagName + '[avalonctrl="' + id + '"]' + } + + var getBindingCallback = function(elem, name, vmodels) { + var callback = elem.getAttribute(name) + if (callback) { + for (var i = 0, vm; vm = vmodels[i++]; ) { + if (vm.hasOwnProperty(callback) && typeof vm[callback] === "function") { + return vm[callback] + } + } + } + } + + function executeBindings(bindings, vmodels) { + for (var i = 0, data; data = bindings[i++]; ) { + data.vmodels = vmodels + bindingHandlers[data.type](data, vmodels) + if (data.evaluator && data.element && data.element.nodeType === 1) { //移除数据绑定，防止被二次解析 + //chrome使用removeAttributeNode移除不存在的特性节点时会报错 https://github.com/RubyLouvre/avalon/issues/99 + data.element.removeAttribute(data.name) + } + } + bindings.length = 0 + } + +//https://github.com/RubyLouvre/avalon/issues/636 + var mergeTextNodes = IEVersion && window.MutationObserver ? function (elem) { + var node = elem.firstChild, text + while (node) { + var aaa = node.nextSibling + if (node.nodeType === 3) { + if (text) { + text.nodeValue += node.nodeValue + elem.removeChild(node) + } else { + text = node + } + } else { + text = null + } + node = aaa + } + } : 0 + + var rmsAttr = /ms-(\w+)-?(.*)/ + var priorityMap = { + "if": 10, + "repeat": 90, + "data": 100, + "widget": 110, + "each": 1400, + "with": 1500, + "duplex": 2000, + "on": 3000 + } + + var events = oneObject("animationend,blur,change,input,click,dblclick,focus,keydown,keypress,keyup,mousedown,mouseenter,mouseleave,mousemove,mouseout,mouseover,mouseup,scan,scroll,submit") + var obsoleteAttrs = oneObject("value,title,alt,checked,selected,disabled,readonly,enabled") + function bindingSorter(a, b) { + return a.priority - b.priority + } + + function scanAttr(elem, vmodels, match) { + var scanNode = true + if (vmodels.length) { + var attributes = getAttributes ? getAttributes(elem) : elem.attributes + var bindings = [] + var fixAttrs = [] + var msData = {} + for (var i = 0, attr; attr = attributes[i++]; ) { + if (attr.specified) { + if (match = attr.name.match(rmsAttr)) { + //如果是以指定前缀命名的 + var type = match[1] + var param = match[2] || "" + var value = attr.value + var name = attr.name + if (events[type]) { + param = type + type = "on" + } else if (obsoleteAttrs[type]) { + if (type === "enabled") {//吃掉ms-enabled绑定,用ms-disabled代替 + log("warning!ms-enabled或ms-attr-enabled已经被废弃") + type = "disabled" + value = "!(" + value + ")" + } + param = type + type = "attr" + name = "ms-" + type + "-"+ param + fixAttrs.push([attr.name, name, value]) + } + msData[name] = value + if (typeof bindingHandlers[type] === "function") { + var binding = { + type: type, + param: param, + element: elem, + name: name, + value: value, + //chrome与firefox下Number(param)得到的值不一样 #855 + priority: (priorityMap[type] || type.charCodeAt(0) * 10 )+ (Number(param.replace(/\D/g, "")) || 0) + } + if (type === "html" || type === "text") { + var token = getToken(value) + avalon.mix(binding, token) + binding.filters = binding.filters.replace(rhasHtml, function () { + binding.type = "html" + binding.group = 1 + return "" + })// jshint ignore:line + } else if (type === "duplex") { + var hasDuplex = name + } else if (name === "ms-if-loop") { + binding.priority += 100 + } + bindings.push(binding) + if (type === "widget") { + elem.msData = elem.msData || msData + } + } + } + } + } + if (bindings.length) { + bindings.sort(bindingSorter) + fixAttrs.forEach(function (arr) { + log("warning!请改用" + arr[1] + "代替" + arr[0] + "!") + elem.removeAttribute(arr[0]) + elem.setAttribute(arr[1], arr[2]) + }) + //http://bugs.jquery.com/ticket/7071 + //在IE下对VML读取type属性,会让此元素所有属性都变成 + if (hasDuplex) { + if (msData["ms-attr-checked"]) { + log("warning!一个控件不能同时定义ms-attr-checked与" + hasDuplex) + } + if (msData["ms-attr-value"]) { + log("warning!一个控件不能同时定义ms-attr-value与" + hasDuplex) + } + } + for (i = 0; binding = bindings[i]; i++) { + type = binding.type + if (rnoscanAttrBinding.test(type)) { + return executeBindings(bindings.slice(0, i + 1), vmodels) + } else if (scanNode) { + scanNode = !rnoscanNodeBinding.test(type) + } + } + executeBindings(bindings, vmodels) + } + } + if (scanNode && !stopScan[elem.tagName] && rbind.test(elem.innerHTML.replace(rlt, "<").replace(rgt, ">"))) { + mergeTextNodes && mergeTextNodes(elem) + scanNodeList(elem, vmodels) //扫描子孙元素 + } + } + + var rnoscanAttrBinding = /^if|widget|repeat$/ + var rnoscanNodeBinding = /^each|with|html|include$/ +//IE67下，在循环绑定中，一个节点如果是通过cloneNode得到，自定义属性的specified为false，无法进入里面的分支， +//但如果我们去掉scanAttr中的attr.specified检测，一个元素会有80+个特性节点（因为它不区分固有属性与自定义属性），很容易卡死页面 + if (!"1" [0]) { + var attrPool = new Cache(512) + var rattrs = /\s+(ms-[^=\s]+)(?:=("[^"]*"|'[^']*'|[^\s>]+))?/g, + rquote = /^['"]/, + rtag = /<\w+\b(?:(["'])[^"]*?(\1)|[^>])*>/i, + ramp = /&/g + //IE6-8解析HTML5新标签，会将它分解两个元素节点与一个文本节点 + //
ddd
+ // window.onload = function() { + // var body = document.body + // for (var i = 0, el; el = body.children[i++]; ) { + // avalon.log(el.outerHTML) + // } + // } + //依次输出
,
+ var getAttributes = function (elem) { + var html = elem.outerHTML + //处理IE6-8解析HTML5新标签的情况，及
等半闭合标签outerHTML为空的情况 + if (html.slice(0, 2) === " ms-important(1) --> ms-controller(2) --> ms-if(10) --> ms-repeat(100) + //--> ms-if-loop(110) --> ms-attr(970) ...--> ms-each(1400)-->ms-with(1500)--〉ms-duplex(2000)垫后 + var a = elem.getAttribute("ms-skip") + //#360 在旧式IE中 Object标签在引入Flash等资源时,可能出现没有getAttributeNode,innerHTML的情形 + if (!elem.getAttributeNode) { + return log("warning " + elem.tagName + " no getAttributeNode method") + } + var b = elem.getAttributeNode("ms-important") + var c = elem.getAttributeNode("ms-controller") + if (typeof a === "string") { + return + } else if (node = b || c) { + var newVmodel = avalon.vmodels[node.value] + if (!newVmodel) { + return + } + //ms-important不包含父VM，ms-controller相反 + vmodels = node === b ? [newVmodel] : [newVmodel].concat(vmodels) + var name = node.name + elem.removeAttribute(name) //removeAttributeNode不会刷新[ms-controller]样式规则 + avalon(elem).removeClass(name) + createSignalTower(elem, newVmodel) + } + scanAttr(elem, vmodels) //扫描特性节点 + } + var rhasHtml = /\|\s*html\s*/, + r11a = /\|\|/g, + rlt = /</g, + rgt = />/g, + rstringLiteral = /(['"])(\\\1|.)+?\1/g + function getToken(value, pos) { + if (value.indexOf("|") > 0) { + var scapegoat = value.replace( rstringLiteral, function(_){ + return Array(_.length+1).join("1")// jshint ignore:line + }) + var index = scapegoat.replace(r11a, "\u1122\u3344").indexOf("|") //干掉所有短路或 + if (index > -1) { + return { + filters: value.slice(index), + value: value.slice(0, index), + pos: pos || 0, + expr: true + } + } + } + return { + value: value, + filters: "", + expr: true + } + } + + function scanExpr(str) { + var tokens = [], + value, start = 0, + stop + do { + stop = str.indexOf(openTag, start) + if (stop === -1) { + break + } + value = str.slice(start, stop) + if (value) { // {{ 左边的文本 + tokens.push({ + value: value, + filters: "", + expr: false + }) + } + start = stop + openTag.length + stop = str.indexOf(closeTag, start) + if (stop === -1) { + break + } + value = str.slice(start, stop) + if (value) { //处理{{ }}插值表达式 + tokens.push(getToken(value, start)) + } + start = stop + closeTag.length + } while (1) + value = str.slice(start) + if (value) { //}} 右边的文本 + tokens.push({ + value: value, + expr: false, + filters: "" + }) + } + return tokens + } + + function scanText(textNode, vmodels) { + var bindings = [] + if (textNode.nodeType === 8) { + var token = getToken(textNode.nodeValue) + var tokens = [token] + } else { + tokens = scanExpr(textNode.data) + } + if (tokens.length) { + for (var i = 0; token = tokens[i++]; ) { + var node = DOC.createTextNode(token.value) //将文本转换为文本节点，并替换原来的文本节点 + if (token.expr) { + token.type = "text" + token.element = node + token.filters = token.filters.replace(rhasHtml, function() { + token.type = "html" + return "" + })// jshint ignore:line + bindings.push(token) //收集带有插值表达式的文本 + } + avalonFragment.appendChild(node) + } + textNode.parentNode.replaceChild(avalonFragment, textNode) + if (bindings.length) + executeBindings(bindings, vmodels) + } + } + + var bools = ["autofocus,autoplay,async,allowTransparency,checked,controls", + "declare,disabled,defer,defaultChecked,defaultSelected", + "contentEditable,isMap,loop,multiple,noHref,noResize,noShade", + "open,readOnly,selected" + ].join(",") + var boolMap = {} + bools.replace(rword, function(name) { + boolMap[name.toLowerCase()] = name + }) + + var propMap = { //属性名映射 + "accept-charset": "acceptCharset", + "char": "ch", + "charoff": "chOff", + "class": "className", + "for": "htmlFor", + "http-equiv": "httpEquiv" + } + + var anomaly = ["accessKey,bgColor,cellPadding,cellSpacing,codeBase,codeType,colSpan", + "dateTime,defaultValue,frameBorder,longDesc,maxLength,marginWidth,marginHeight", + "rowSpan,tabIndex,useMap,vSpace,valueType,vAlign" + ].join(",") + anomaly.replace(rword, function(name) { + propMap[name.toLowerCase()] = name + }) + + var rnoscripts = /(?:[\s\S]+?)<\/noscript>/img + var rnoscriptText = /([\s\S]+?)<\/noscript>/im + + var getXHR = function() { + return new(window.XMLHttpRequest || ActiveXObject)("Microsoft.XMLHTTP") // jshint ignore:line + } + + var templatePool = avalon.templateCache = {} + + bindingHandlers.attr = function(data, vmodels) { + var text = data.value.trim(), + simple = true + if (text.indexOf(openTag) > -1 && text.indexOf(closeTag) > 2) { + simple = false + if (rexpr.test(text) && RegExp.rightContext === "" && RegExp.leftContext === "") { + simple = true + text = RegExp.$1 + } + } + if (data.type === "include") { + var elem = data.element + data.includeRendered = getBindingCallback(elem, "data-include-rendered", vmodels) + data.includeLoaded = getBindingCallback(elem, "data-include-loaded", vmodels) + var outer = data.includeReplace = !! avalon(elem).data("includeReplace") + if (avalon(elem).data("includeCache")) { + data.templateCache = {} + } + data.startInclude = DOC.createComment("ms-include") + data.endInclude = DOC.createComment("ms-include-end") + if (outer) { + data.element = data.startInclude + elem.parentNode.insertBefore(data.startInclude, elem) + elem.parentNode.insertBefore(data.endInclude, elem.nextSibling) + } else { + elem.insertBefore(data.startInclude, elem.firstChild) + elem.appendChild(data.endInclude) + } + } + data.handlerName = "attr" //handleName用于处理多种绑定共用同一种bindingExecutor的情况 + parseExprProxy(text, vmodels, data, (simple ? 0 : scanExpr(data.value))) + } + + bindingExecutors.attr = function(val, elem, data) { + var method = data.type, + attrName = data.param + if (method === "css") { + avalon(elem).css(attrName, val) + } else if (method === "attr") { + + // ms-attr-class="xxx" vm.xxx="aaa bbb ccc"将元素的className设置为aaa bbb ccc + // ms-attr-class="xxx" vm.xxx=false 清空元素的所有类名 + // ms-attr-name="yyy" vm.yyy="ooo" 为元素设置name属性 + var toRemove = (val === false) || (val === null) || (val === void 0) + + if (!W3C && propMap[attrName]) { //旧式IE下需要进行名字映射 + attrName = propMap[attrName] + } + var bool = boolMap[attrName] + if (typeof elem[bool] === "boolean") { + elem[bool] = !! val //布尔属性必须使用el.xxx = true|false方式设值 + if (!val) { //如果为false, IE全系列下相当于setAttribute(xxx,''),会影响到样式,需要进一步处理 + toRemove = true + } + } + if (toRemove) { + return elem.removeAttribute(attrName) + } + //SVG只能使用setAttribute(xxx, yyy), VML只能使用elem.xxx = yyy ,HTML的固有属性必须elem.xxx = yyy + var isInnate = rsvg.test(elem) ? false : (DOC.namespaces && isVML(elem)) ? true : attrName in elem.cloneNode(false) + if (isInnate) { + elem[attrName] = val + } else { + elem.setAttribute(attrName, val) + } + } else if (method === "include" && val) { + var vmodels = data.vmodels + var rendered = data.includeRendered + var loaded = data.includeLoaded + var replace = data.includeReplace + var target = replace ? elem.parentNode : elem + var scanTemplate = function(text) { + if (loaded) { + var newText = loaded.apply(target, [text].concat(vmodels)) + if (typeof newText === "string") + text = newText + } + if (rendered) { + checkScan(target, function() { + rendered.call(target) + }, NaN) + } + var lastID = data.includeLastID + if (data.templateCache && lastID && lastID !== val) { + var lastTemplate = data.templateCache[lastID] + if (!lastTemplate) { + lastTemplate = data.templateCache[lastID] = DOC.createElement("div") + ifGroup.appendChild(lastTemplate) + } + } + data.includeLastID = val + while (true) { + var node = data.startInclude.nextSibling + if (node && node !== data.endInclude) { + target.removeChild(node) + if (lastTemplate) + lastTemplate.appendChild(node) + } else { + break + } + } + var dom = getTemplateNodes(data, val, text) + var nodes = avalon.slice(dom.childNodes) + target.insertBefore(dom, data.endInclude) + scanNodeArray(nodes, vmodels) + } + + if (data.param === "src") { + if (typeof templatePool[val] === "string") { + avalon.nextTick(function() { + scanTemplate(templatePool[val]) + }) + } else if (Array.isArray(templatePool[val])) { //#805 防止在循环绑定中发出许多相同的请求 + templatePool[val].push(scanTemplate) + } else { + var xhr = getXHR() + xhr.onreadystatechange = function() { + if (xhr.readyState === 4) { + var s = xhr.status + if (s >= 200 && s < 300 || s === 304 || s === 1223) { + var text = xhr.responseText + for (var f = 0, fn; fn = templatePool[val][f++];) { + fn(text) + } + templatePool[val] = text + } + } + } + templatePool[val] = [scanTemplate] + xhr.open("GET", val, true) + if ("withCredentials" in xhr) { + xhr.withCredentials = true + } + xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest") + xhr.send(null) + } + } else { + //IE系列与够新的标准浏览器支持通过ID取得元素（firefox14+） + //http://tjvantoll.com/2012/07/19/dom-element-references-as-global-variables/ + var el = val && val.nodeType === 1 ? val : DOC.getElementById(val) + if (el) { + if (el.tagName === "NOSCRIPT" && !(el.innerHTML || el.fixIE78)) { //IE7-8 innerText,innerHTML都无法取得其内容，IE6能取得其innerHTML + xhr = getXHR() //IE9-11与chrome的innerHTML会得到转义的内容，它们的innerText可以 + xhr.open("GET", location, false) //谢谢Nodejs 乱炖群 深圳-纯属虚构 + xhr.send(null) + //http://bbs.csdn.net/topics/390349046?page=1#post-393492653 + var noscripts = DOC.getElementsByTagName("noscript") + var array = (xhr.responseText || "").match(rnoscripts) || [] + var n = array.length + for (var i = 0; i < n; i++) { + var tag = noscripts[i] + if (tag) { //IE6-8中noscript标签的innerHTML,innerText是只读的 + tag.style.display = "none" //http://haslayout.net/css/noscript-Ghost-Bug + tag.fixIE78 = (array[i].match(rnoscriptText) || ["", " "])[1] + } + } + } + avalon.nextTick(function() { + scanTemplate(el.fixIE78 || el.value || el.innerText || el.innerHTML) + }) + } + } + } else { + if (!root.hasAttribute && typeof val === "string" && (method === "src" || method === "href")) { + val = val.replace(/&/g, "&") //处理IE67自动转义的问题 + } + elem[method] = val + if (window.chrome && elem.tagName === "EMBED") { + var parent = elem.parentNode //#525 chrome1-37下embed标签动态设置src不能发生请求 + var comment = document.createComment("ms-src") + parent.replaceChild(comment, elem) + parent.replaceChild(elem, comment) + } + } + } + + function getTemplateNodes(data, id, text) { + var div = data.templateCache && data.templateCache[id] + if (div) { + var dom = DOC.createDocumentFragment(), + firstChild + while (firstChild = div.firstChild) { + dom.appendChild(firstChild) + } + return dom + } + return avalon.parseHTML(text) + } + +//这几个指令都可以使用插值表达式，如ms-src="aaa/{{b}}/{{c}}.html" + "title,alt,src,value,css,include,href".replace(rword, function(name) { + bindingHandlers[name] = bindingHandlers.attr + }) +//根据VM的属性值或表达式的值切换类名，ms-class="xxx yyy zzz:flag" +//http://www.cnblogs.com/rubylouvre/archive/2012/12/17/2818540.html + bindingHandlers["class"] = function(data, vmodels) { + var oldStyle = data.param, + text = data.value, + rightExpr + data.handlerName = "class" + if (!oldStyle || isFinite(oldStyle)) { + data.param = "" //去掉数字 + var noExpr = text.replace(rexprg, function(a) { + return a.replace(/./g, "0") + //return Math.pow(10, a.length - 1) //将插值表达式插入10的N-1次方来占位 + }) + var colonIndex = noExpr.indexOf(":") //取得第一个冒号的位置 + if (colonIndex === -1) { // 比如 ms-class="aaa bbb ccc" 的情况 + var className = text + } else { // 比如 ms-class-1="ui-state-active:checked" 的情况 + className = text.slice(0, colonIndex) + rightExpr = text.slice(colonIndex + 1) + parseExpr(rightExpr, vmodels, data) //决定是添加还是删除 + if (!data.evaluator) { + log("debug: ms-class '" + (rightExpr || "").trim() + "' 不存在于VM中") + return false + } else { + data._evaluator = data.evaluator + data._args = data.args + } + } + var hasExpr = rexpr.test(className) //比如ms-class="width{{w}}"的情况 + if (!hasExpr) { + data.immobileClass = className + } + parseExprProxy("", vmodels, data, (hasExpr ? scanExpr(className) : 0)) + } else { + data.immobileClass = data.oldStyle = data.param + parseExprProxy(text, vmodels, data) + } + } + + bindingExecutors["class"] = function(val, elem, data) { + var $elem = avalon(elem), + method = data.type + if (method === "class" && data.oldStyle) { //如果是旧风格 + $elem.toggleClass(data.oldStyle, !! val) + } else { + //如果存在冒号就有求值函数 + data.toggleClass = data._evaluator ? !! data._evaluator.apply(elem, data._args) : true + data.newClass = data.immobileClass || val + if (data.oldClass && data.newClass !== data.oldClass) { + $elem.removeClass(data.oldClass) + } + data.oldClass = data.newClass + switch (method) { + case "class": + $elem.toggleClass(data.newClass, data.toggleClass) + break + case "hover": + case "active": + if (!data.hasBindEvent) { //确保只绑定一次 + var activate = "mouseenter" //在移出移入时切换类名 + var abandon = "mouseleave" + if (method === "active") { //在聚焦失焦中切换类名 + elem.tabIndex = elem.tabIndex || -1 + activate = "mousedown" + abandon = "mouseup" + var fn0 = $elem.bind("mouseleave", function() { + data.toggleClass && $elem.removeClass(data.newClass) + }) + } + var fn1 = $elem.bind(activate, function() { + data.toggleClass && $elem.addClass(data.newClass) + }) + var fn2 = $elem.bind(abandon, function() { + data.toggleClass && $elem.removeClass(data.newClass) + }) + data.rollback = function() { + $elem.unbind("mouseleave", fn0) + $elem.unbind(activate, fn1) + $elem.unbind(abandon, fn2) + } + data.hasBindEvent = true + } + break; + } + } + } + + "hover,active".replace(rword, function(method) { + bindingHandlers[method] = bindingHandlers["class"] + }) +//ms-controller绑定已经在scanTag 方法中实现 +//ms-css绑定已由ms-attr绑定实现 + + +// bindingHandlers.data 定义在if.js + bindingExecutors.data = function(val, elem, data) { + var key = "data-" + data.param + if (val && typeof val === "object") { + elem[key] = val + } else { + elem.setAttribute(key, String(val)) + } + } +//双工绑定 + var duplexBinding = bindingHandlers.duplex = function(data, vmodels) { + var elem = data.element, + hasCast + parseExprProxy(data.value, vmodels, data, 0, 1) + + data.changed = getBindingCallback(elem, "data-duplex-changed", vmodels) || noop + if (data.evaluator && data.args) { + var params = [] + var casting = oneObject("string,number,boolean,checked") + if (elem.type === "radio" && data.param === "") { + data.param = "checked" + } + if (elem.msData) { + elem.msData["ms-duplex"] = data.value + } + data.param.replace(/\w+/g, function(name) { + if (/^(checkbox|radio)$/.test(elem.type) && /^(radio|checked)$/.test(name)) { + if (name === "radio") + log("ms-duplex-radio已经更名为ms-duplex-checked") + name = "checked" + data.isChecked = true + } + if (name === "bool") { + name = "boolean" + log("ms-duplex-bool已经更名为ms-duplex-boolean") + } else if (name === "text") { + name = "string" + log("ms-duplex-text已经更名为ms-duplex-string") + } + if (casting[name]) { + hasCast = true + } + avalon.Array.ensure(params, name) + }) + if (!hasCast) { + params.push("string") + } + data.param = params.join("-") + data.bound = function(type, callback) { + if (elem.addEventListener) { + elem.addEventListener(type, callback, false) + } else { + elem.attachEvent("on" + type, callback) + } + var old = data.rollback + data.rollback = function() { + elem.avalonSetter = null + avalon.unbind(elem, type, callback) + old && old() + } + } + for (var i in avalon.vmodels) { + var v = avalon.vmodels[i] + v.$fire("avalon-ms-duplex-init", data) + } + var cpipe = data.pipe || (data.pipe = pipe) + cpipe(null, data, "init") + var tagName = elem.tagName + duplexBinding[tagName] && duplexBinding[tagName](elem, data.evaluator.apply(null, data.args), data) + } + } +//不存在 bindingExecutors.duplex + + function fixNull(val) { + return val == null ? "" : val + } + avalon.duplexHooks = { + checked: { + get: function(val, data) { + return !data.element.oldValue + } + }, + string: { + get: function(val) { //同步到VM + return val + }, + set: fixNull + }, + "boolean": { + get: function(val) { + return val === "true" + }, + set: fixNull + }, + number: { + get: function(val, data) { + var number = parseFloat(val) + if (-val === -number) { + return number + } + var arr = /strong|medium|weak/.exec(data.element.getAttribute("data-duplex-number")) || ["medium"] + switch (arr[0]) { + case "strong": + return 0 + case "medium": + return val === "" ? "" : 0 + case "weak": + return val + } + }, + set: fixNull + } + } + + function pipe(val, data, action, e) { + data.param.replace(/\w+/g, function(name) { + var hook = avalon.duplexHooks[name] + if (hook && typeof hook[action] === "function") { + val = hook[action](val, data) + } + }) + return val + } + + var TimerID, ribbon = [] + + avalon.tick = function(fn) { + if (ribbon.push(fn) === 1) { + TimerID = setInterval(ticker, 60) + } + } + + function ticker() { + for (var n = ribbon.length - 1; n >= 0; n--) { + var el = ribbon[n] + if (el() === false) { + ribbon.splice(n, 1) + } + } + if (!ribbon.length) { + clearInterval(TimerID) + } + } + + var watchValueInTimer = noop + var rmsinput = /text|password|hidden/ + new function() { // jshint ignore:line + try { //#272 IE9-IE11, firefox + var setters = {} + var aproto = HTMLInputElement.prototype + var bproto = HTMLTextAreaElement.prototype + + function newSetter(value) { // jshint ignore:line + if (avalon.optimize || this.parentNode) { + setters[this.tagName].call(this, value) + if (!rmsinput.test(this.type)) + return + if (!this.msFocus && this.avalonSetter) { + this.avalonSetter() + } + } + } + var inputProto = HTMLInputElement.prototype + Object.getOwnPropertyNames(inputProto) //故意引发IE6-8等浏览器报错 + setters["INPUT"] = Object.getOwnPropertyDescriptor(aproto, "value").set + Object.defineProperty(aproto, "value", { + set: newSetter + }) + setters["TEXTAREA"] = Object.getOwnPropertyDescriptor(bproto, "value").set + Object.defineProperty(bproto, "value", { + set: newSetter + }) + } catch (e) { + //在chrome 43中 ms-duplex终于不需要使用定时器实现双向绑定了 + // http://updates.html5rocks.com/2015/04/DOM-attributes-now-on-the-prototype + // https://docs.google.com/document/d/1jwA8mtClwxI-QJuHT7872Z0pxpZz8PBkf2bGAbsUtqs/edit?pli=1 + watchValueInTimer = avalon.tick + } + } // jshint ignore:line + if (IEVersion) { + avalon.bind(DOC, "selectionchange", function(e) { + var el = DOC.activeElement + if (el && typeof el.avalonSetter === "function") { + el.avalonSetter() + } + }) + } + +//处理radio, checkbox, text, textarea, password + duplexBinding.INPUT = function(element, evaluator, data) { + var $type = element.type, + bound = data.bound, + $elem = avalon(element), + composing = false + + function callback(value) { + data.changed.call(this, value, data) + } + + function compositionStart() { + composing = true + } + + function compositionEnd() { + composing = false + } + //当value变化时改变model的值 + var updateVModel = function() { + if (composing) //处理中文输入法在minlengh下引发的BUG + return + var val = element.oldValue = element.value //防止递归调用形成死循环 + var lastValue = data.pipe(val, data, "get") + if ($elem.data("duplexObserve") !== false) { + evaluator(lastValue) + callback.call(element, lastValue) + if ($elem.data("duplex-focus")) { + avalon.nextTick(function() { + element.focus() + }) + } + } + } + //当model变化时,它就会改变value的值 + data.handler = function() { + var val = data.pipe(evaluator(), data, "set") + "" //fix #673 + if (val !== element.oldValue) { + element.value = val + } + } + if (data.isChecked || $type === "radio") { + var IE6 = IEVersion === 6 + updateVModel = function() { + if ($elem.data("duplexObserve") !== false) { + var lastValue = data.pipe(element.value, data, "get") + evaluator(lastValue) + callback.call(element, lastValue) + } + } + data.handler = function() { + var val = evaluator() + var checked = data.isChecked ? !! val : val + "" === element.value + element.oldValue = checked + if (IE6) { + setTimeout(function() { + //IE8 checkbox, radio是使用defaultChecked控制选中状态， + //并且要先设置defaultChecked后设置checked + //并且必须设置延迟 + element.defaultChecked = checked + element.checked = checked + }, 31) + } else { + element.checked = checked + } + } + bound("click", updateVModel) + } else if ($type === "checkbox") { + updateVModel = function() { + if ($elem.data("duplexObserve") !== false) { + var method = element.checked ? "ensure" : "remove" + var array = evaluator() + if (!Array.isArray(array)) { + log("ms-duplex应用于checkbox上要对应一个数组") + array = [array] + } + avalon.Array[method](array, data.pipe(element.value, data, "get")) + callback.call(element, array) + } + } + + data.handler = function() { + var array = [].concat(evaluator()) //强制转换为数组 + element.checked = array.indexOf(data.pipe(element.value, data, "get")) > -1 + } + bound(W3C ? "change" : "click", updateVModel) + } else { + var events = element.getAttribute("data-duplex-event") || "input" + if (element.attributes["data-event"]) { + log("data-event指令已经废弃，请改用data-duplex-event") + } + + function delay(e) { // jshint ignore:line + setTimeout(function() { + updateVModel(e) + }) + } + events.replace(rword, function(name) { + switch (name) { + case "input": + if (!IEVersion) { // W3C + bound("input", updateVModel) + //非IE浏览器才用这个 + bound("compositionstart", compositionStart) + bound("compositionend", compositionEnd) + bound("DOMAutoComplete", updateVModel) + } else { //onpropertychange事件无法区分是程序触发还是用户触发 + // IE下通过selectionchange事件监听IE9+点击input右边的X的清空行为，及粘贴，剪切，删除行为 + if (IEVersion > 8) { + bound("input", updateVModel) //IE9使用propertychange无法监听中文输入改动 + } else { + bound("propertychange", function(e) { //IE6-8下第一次修改时不会触发,需要使用keydown或selectionchange修正 + if (e.propertyName === "value") { + updateVModel() + } + }) + } + bound("dragend", delay) + //http://www.cnblogs.com/rubylouvre/archive/2013/02/17/2914604.html + //http://www.matts411.com/post/internet-explorer-9-oninput/ + } + break + default: + bound(name, updateVModel) + break + } + }) + bound("focus", function() { + element.msFocus = true + }) + bound("blur", function() { + element.msFocus = false + }) + + if (rmsinput.test($type)) { + watchValueInTimer(function() { + if (avalon.optimize || element.parentNode) { + if (!element.msFocus && element.oldValue !== element.value) { + updateVModel() + } + } else if (!element.msRetain) { + return false + } + }) + } + + element.avalonSetter = updateVModel //#765 + } + + element.oldValue = element.value + avalon.injectBinding(data) + callback.call(element, element.value) + } + duplexBinding.TEXTAREA = duplexBinding.INPUT + duplexBinding.SELECT = function(element, evaluator, data) { + var $elem = avalon(element) + + function updateVModel() { + if ($elem.data("duplexObserve") !== false) { + var val = $elem.val() //字符串或字符串数组 + if (Array.isArray(val)) { + val = val.map(function(v) { + return data.pipe(v, data, "get") + }) + } else { + val = data.pipe(val, data, "get") + } + if (val + "" !== element.oldValue) { + evaluator(val) + } + data.changed.call(element, val, data) + } + } + data.handler = function() { + var val = evaluator() + val = val && val.$model || val + if (Array.isArray(val)) { + if (!element.multiple) { + log("ms-duplex在不能对应一个数组") + } + } + //必须变成字符串后才能比较 + val = Array.isArray(val) ? val.map(String) : val + "" + if (val + "" !== element.oldValue) { + $elem.val(val) + element.oldValue = val + "" + } + } + data.bound("change", updateVModel) + element.msCallback = function() { + avalon.injectBinding(data) + data.changed.call(element, evaluator(), data) + } + } +// bindingHandlers.html 定义在if.js + bindingExecutors.html = function (val, elem, data) { + var isHtmlFilter = elem.nodeType !== 1 + var parent = isHtmlFilter ? elem.parentNode : elem + if (!parent) + return + val = val == null ? "" : val + if (data.oldText !== val) { + data.oldText = val + } else { + return + } + if (elem.nodeType === 3) { + var signature = generateID("html") + parent.insertBefore(DOC.createComment(signature), elem) + data.element = DOC.createComment(signature + ":end") + parent.replaceChild(data.element, elem) + elem = data.element + } + if (typeof val !== "object") {//string, number, boolean + var fragment = avalon.parseHTML(String(val)) + } else if (val.nodeType === 11) { //将val转换为文档碎片 + fragment = val + } else if (val.nodeType === 1 || val.item) { + var nodes = val.nodeType === 1 ? val.childNodes : val.item + fragment = avalonFragment.cloneNode(true) + while (nodes[0]) { + fragment.appendChild(nodes[0]) + } + } + + nodes = avalon.slice(fragment.childNodes) + //插入占位符, 如果是过滤器,需要有节制地移除指定的数量,如果是html指令,直接清空 + if (isHtmlFilter) { + var endValue = elem.nodeValue.slice(0, -4) + while (true) { + var node = elem.previousSibling + if (!node || node.nodeType === 8 && node.nodeValue === endValue) { + break + } else { + parent.removeChild(node) + } + } + parent.insertBefore(fragment, elem) + } else { + avalon.clearHTML(elem).appendChild(fragment) + } + scanNodeArray(nodes, data.vmodels) + } + bindingHandlers["if"] = + bindingHandlers.data = + bindingHandlers.text = + bindingHandlers.html = + function(data, vmodels) { + parseExprProxy(data.value, vmodels, data) + } + + bindingExecutors["if"] = function(val, elem, data) { + try { + if(!elem.parentNode) return + } catch(e) {return} + if (val) { //插回DOM树 + if (elem.nodeType === 8) { + elem.parentNode.replaceChild(data.template, elem) + // animate.enter(data.template, elem.parentNode) + elem = data.element = data.template //这时可能为null + } + if (elem.getAttribute(data.name)) { + elem.removeAttribute(data.name) + scanAttr(elem, data.vmodels) + } + data.rollback = null + } else { //移出DOM树，并用注释节点占据原位置 + if (elem.nodeType === 1) { + var node = data.element = DOC.createComment("ms-if") + elem.parentNode.replaceChild(node, elem) + // animate.leave(elem, node.parentNode, node) + data.template = elem //元素节点 + ifGroup.appendChild(elem) + data.rollback = function() { + if (elem.parentNode === ifGroup) { + ifGroup.removeChild(elem) + } + } + } + } + } +//ms-important绑定已经在scanTag 方法中实现 +//ms-include绑定已由ms-attr绑定实现 + + var rdash = /\(([^)]*)\)/ + bindingHandlers.on = function(data, vmodels) { + var value = data.value + data.type = "on" + var eventType = data.param.replace(/-\d+$/, "") // ms-on-mousemove-10 + if (typeof bindingHandlers.on[eventType + "Hook"] === "function") { + bindingHandlers.on[eventType + "Hook"](data) + } + if (value.indexOf("(") > 0 && value.indexOf(")") > -1) { + var matched = (value.match(rdash) || ["", ""])[1].trim() + if (matched === "" || matched === "$event") { // aaa() aaa($event)当成aaa处理 + value = value.replace(rdash, "") + } + } + parseExprProxy(value, vmodels, data) + } + + bindingExecutors.on = function(callback, elem, data) { + callback = function(e) { + var fn = data.evaluator || noop + return fn.apply(this, data.args.concat(e)) + } + var eventType = data.param.replace(/-\d+$/, "") // ms-on-mousemove-10 + if (eventType === "scan") { + callback.call(elem, { + type: eventType + }) + } else if (typeof data.specialBind === "function") { + data.specialBind(elem, callback) + } else { + var removeFn = avalon.bind(elem, eventType, callback) + } + data.rollback = function() { + if (typeof data.specialUnbind === "function") { + data.specialUnbind() + } else { + avalon.unbind(elem, eventType, removeFn) + } + } + } + bindingHandlers.repeat = function (data, vmodels) { + var type = data.type + parseExprProxy(data.value, vmodels, data, 0, 1) + var freturn = false + try { + var $repeat = data.$repeat = data.evaluator.apply(0, data.args || []) + var xtype = avalon.type($repeat) + if (xtype !== "object" && xtype !== "array") { + freturn = true + avalon.log("warning:" + data.value + "只能是对象或数组") + } + } catch (e) { + freturn = true + } + var arr = data.value.split(".") || [] + if (arr.length > 1) { + arr.pop() + var n = arr[0] + for (var i = 0, v; v = vmodels[i++]; ) { + if (v && v.hasOwnProperty(n)) { + var events = v[n].$events || {} + events[subscribers] = events[subscribers] || [] + events[subscribers].push(data) + break + } + } + } + + var elem = data.element + if (elem.nodeType === 1) { + elem.removeAttribute(data.name) + data.sortedCallback = getBindingCallback(elem, "data-with-sorted", vmodels) + data.renderedCallback = getBindingCallback(elem, "data-" + type + "-rendered", vmodels) + var signature = generateID(type) + var start = DOC.createComment(signature) + var end = DOC.createComment(signature + ":end") + data.signature = signature + data.template = avalonFragment.cloneNode(false) + if (type === "repeat") { + var parent = elem.parentNode + parent.replaceChild(end, elem) + parent.insertBefore(start, end) + data.template.appendChild(elem) + } else { + while (elem.firstChild) { + data.template.appendChild(elem.firstChild) + } + elem.appendChild(start) + elem.appendChild(end) + } + data.element = end + data.handler = bindingExecutors.repeat + data.rollback = function () { + var elem = data.element + if (!elem) + return + data.handler("clear") + } + } + + if (freturn) { + return + } + + data.$outer = {} + var check0 = "$key" + var check1 = "$val" + if (Array.isArray($repeat)) { + if (!$repeat.$map) { + $repeat.$map = { + el: 1 + } + var m = $repeat.length + var $proxy = [] + for (i = 0; i < m; i++) {//生成代理VM + $proxy.push(eachProxyAgent(i, $repeat)) + } + $repeat.$proxy = $proxy + } + $repeat.$map[data.param || "el"] = 1 + check0 = "$first" + check1 = "$last" + } + for (i = 0; v = vmodels[i++]; ) { + if (v.hasOwnProperty(check0) && v.hasOwnProperty(check1)) { + data.$outer = v + break + } + } + var $events = $repeat.$events + var $list = ($events || {})[subscribers] + injectDependency($list, data) + if (xtype === "object") { + data.$with = true + $repeat.$proxy || ($repeat.$proxy = {}) + data.handler("append", $repeat) + } else if ($repeat.length) { + data.handler("add", 0, $repeat.length) + } + } + + bindingExecutors.repeat = function (method, pos, el) { + if (method) { + var data = this, start, fragment + var end = data.element + var comments = getComments(data) + var parent = end.parentNode + var transation = avalonFragment.cloneNode(false) + switch (method) { + case "add": //在pos位置后添加el数组（pos为插入位置,el为要插入的个数） + var n = pos + el + var fragments = [] + var array = data.$repeat + for (var i = pos; i < n; i++) { + var proxy = array.$proxy[i] + proxy.$outer = data.$outer + shimController(data, transation, proxy, fragments) + } + var now = new Date - 0 + avalon.optimize = avalon.optimize || now + for (i = 0; fragment = fragments[i++]; ) { + scanNodeArray(fragment.nodes, fragment.vmodels) + fragment.nodes = fragment.vmodels = null + } + if(avalon.optimize === now){ + delete avalon.optimize + } + parent.insertBefore(transation, comments[pos] || end) + avalon.profile("插入操作花费了 "+ (new Date - now)) + break + case "del": //将pos后的el个元素删掉(pos, el都是数字) + sweepNodes(comments[pos], comments[pos + el] || end) + break + case "clear": + start = comments[0] + if (start) { + sweepNodes(start, end) + } + break + case "move": + start = comments[0] + if (start) { + var signature = start.nodeValue + var rooms = [] + var room = [], + node + sweepNodes(start, end, function () { + room.unshift(this) + if (this.nodeValue === signature) { + rooms.unshift(room) + room = [] + } + }) + sortByIndex(rooms, pos) + while (room = rooms.shift()) { + while (node = room.shift()) { + transation.appendChild(node) + } + } + parent.insertBefore(transation, end) + } + break + case "append": + var object = pos //原来第2参数， 被循环对象 + var pool = object.$proxy //代理对象组成的hash + var keys = [] + fragments = [] + for (var key in pool) { + if (!object.hasOwnProperty(key)) { + proxyRecycler(pool[key], withProxyPool) //去掉之前的代理VM + delete(pool[key]) + } + } + for (key in object) { //得到所有键名 + if (object.hasOwnProperty(key) && key !== "hasOwnProperty" && key !== "$proxy") { + keys.push(key) + } + } + if (data.sortedCallback) { //如果有回调，则让它们排序 + var keys2 = data.sortedCallback.call(parent, keys) + if (keys2 && Array.isArray(keys2) && keys2.length) { + keys = keys2 + } + } + + for (i = 0; key = keys[i++]; ) { + if (key !== "hasOwnProperty") { + pool[key] = withProxyAgent(pool[key], key, data) + shimController(data, transation, pool[key], fragments) + } + } + + parent.insertBefore(transation, end) + for (i = 0; fragment = fragments[i++]; ) { + scanNodeArray(fragment.nodes, fragment.vmodels) + fragment.nodes = fragment.vmodels = null + } + break + } + if (method === "clear") + method = "del" + var callback = data.renderedCallback || noop, + args = arguments + checkScan(parent, function () { + callback.apply(parent, args) + if (parent.oldValue && parent.tagName === "SELECT") { //fix #503 + avalon(parent).val(parent.oldValue.split(",")) + } + }, NaN) + } + } + + "with,each".replace(rword, function (name) { + bindingHandlers[name] = bindingHandlers.repeat + }) + avalon.pool = eachProxyPool + function shimController(data, transation, proxy, fragments) { + var content = data.template.cloneNode(true) + var nodes = avalon.slice(content.childNodes) + if (!data.$with) { + content.insertBefore(DOC.createComment(data.signature), content.firstChild) + } + transation.appendChild(content) + var nv = [proxy].concat(data.vmodels) + var fragment = { + nodes: nodes, + vmodels: nv + } + fragments.push(fragment) + } + + function getComments(data) { + var end = data.element + var signature = end.nodeValue.replace(":end", "") + var node = end.previousSibling + var array = [] + while (node) { + if (node.nodeValue === signature) { + array.unshift(node) + } + node = node.previousSibling + } + return array + } + + +//移除掉start与end之间的节点(保留end) + function sweepNodes(start, end, callback) { + while (true) { + var node = end.previousSibling + if (!node) + break + node.parentNode.removeChild(node) + callback && callback.call(node) + if (node === start) { + break + } + } + } + +// 为ms-each,ms-with, ms-repeat会创建一个代理VM， +// 通过它们保持一个下上文，让用户能调用$index,$first,$last,$remove,$key,$val,$outer等属性与方法 +// 所有代理VM的产生,消费,收集,存放通过xxxProxyFactory,xxxProxyAgent, recycleProxies,xxxProxyPool实现 + var withProxyPool = [] + function withProxyFactory() { + var proxy = modelFactory({ + $key: "", + $outer: {}, + $host: {}, + $val: { + get: function () { + return this.$host[this.$key] + }, + set: function (val) { + this.$host[this.$key] = val + } + } + }, { + $val: 1 + }) + proxy.$id = generateID("$proxy$with") + return proxy + } + + function withProxyAgent(proxy, key, data) { + proxy = proxy || withProxyPool.pop() + if (!proxy) { + proxy = withProxyFactory() + } + var host = data.$repeat + proxy.$key = key + proxy.$host = host + proxy.$outer = data.$outer + if (host.$events) { + proxy.$events.$val = host.$events[key] + } else { + proxy.$events = {} + } + return proxy + } + + function eachProxyRecycler(proxies) { + proxies.forEach(function (proxy) { + proxyRecycler(proxy, eachProxyPool) + }) + proxies.length = 0 + } + + function proxyRecycler(proxy, proxyPool) { + for (var i in proxy.$events) { + if (Array.isArray(proxy.$events[i])) { + proxy.$events[i].forEach(function (data) { + if (typeof data === "object") + disposeData(data) + })// jshint ignore:line + proxy.$events[i].length = 0 + } + } + proxy.$host = proxy.$outer = {} + if (proxyPool.unshift(proxy) > kernel.maxRepeatSize) { + proxyPool.pop() + } + } + /********************************************************************* + * 各种指令 * + **********************************************************************/ +//ms-skip绑定已经在scanTag 方法中实现 +// bindingHandlers.text 定义在if.js + bindingExecutors.text = function(val, elem) { + val = val == null ? "" : val //不在页面上显示undefined null + if (elem.nodeType === 3) { //绑定在文本节点上 + try { //IE对游离于DOM树外的节点赋值会报错 + elem.data = val + } catch (e) {} + } else { //绑定在特性节点上 + if ("textContent" in elem) { + elem.textContent = val + } else { + elem.innerText = val + } + } + } + function parseDisplay(nodeName, val) { + //用于取得此类标签的默认display值 + var key = "_" + nodeName + if (!parseDisplay[key]) { + var node = DOC.createElement(nodeName) + root.appendChild(node) + if (W3C) { + val = getComputedStyle(node, null).display + } else { + val = node.currentStyle.display + } + root.removeChild(node) + parseDisplay[key] = val + } + return parseDisplay[key] + } + + avalon.parseDisplay = parseDisplay + + bindingHandlers.visible = function(data, vmodels) { + var elem = avalon(data.element) + var display = elem.css("display") + if (display === "none") { + var style = elem[0].style + var has = /visibility/i.test(style.cssText) + var visible = elem.css("visibility") + style.display = "" + style.visibility = "hidden" + display = elem.css("display") + if (display === "none") { + display = parseDisplay(elem[0].nodeName) + } + style.visibility = has ? visible : "" + } + data.display = display + parseExprProxy(data.value, vmodels, data) + } + + bindingExecutors.visible = function(val, elem, data) { + elem.style.display = val ? data.display : "none" + } + bindingHandlers.widget = function(data, vmodels) { + var args = data.value.match(rword) + var elem = data.element + var widget = args[0] + var id = args[1] + if (!id || id === "$") { //没有定义或为$时，取组件名+随机数 + id = generateID(widget) + } + var optName = args[2] || widget //没有定义，取组件名 + var constructor = avalon.ui[widget] + if (typeof constructor === "function") { //ms-widget="tabs,tabsAAA,optname" + vmodels = elem.vmodels || vmodels + for (var i = 0, v; v = vmodels[i++];) { + if (v.hasOwnProperty(optName) && typeof v[optName] === "object") { + var vmOptions = v[optName] + vmOptions = vmOptions.$model || vmOptions + break + } + } + if (vmOptions) { + var wid = vmOptions[widget + "Id"] + if (typeof wid === "string") { + log("warning!不再支持" + widget + "Id") + id = wid + } + } + //抽取data-tooltip-text、data-tooltip-attr属性，组成一个配置对象 + var widgetData = avalon.getWidgetData(elem, widget) + data.value = [widget, id, optName].join(",") + data[widget + "Id"] = id + data.evaluator = noop + elem.msData["ms-widget-id"] = id + var options = data[widget + "Options"] = avalon.mix({}, constructor.defaults, vmOptions || {}, widgetData) + elem.removeAttribute("ms-widget") + var vmodel = constructor(elem, data, vmodels) || {} //防止组件不返回VM + if (vmodel.$id) { + avalon.vmodels[id] = vmodel + createSignalTower(elem, vmodel) + try { + vmodel.$init(function() { + avalon.scan(elem, [vmodel].concat(vmodels)) + if (typeof options.onInit === "function") { + options.onInit.call(elem, vmodel, options, vmodels) + } + }) + } catch (e) {} + data.rollback = function() { + try { + vmodel.widgetElement = null + vmodel.$remove() + } catch (e) {} + elem.msData = {} + delete avalon.vmodels[vmodel.$id] + } + injectDisposeQueue(data, widgetList) + if (window.chrome) { + elem.addEventListener("DOMNodeRemovedFromDocument", function() { + setTimeout(rejectDisposeQueue) + }) + } + } else { + avalon.scan(elem, vmodels) + } + } else if (vmodels.length) { //如果该组件还没有加载，那么保存当前的vmodels + elem.vmodels = vmodels + } + } + var widgetList = [] +//不存在 bindingExecutors.widget + /********************************************************************* + * 自带过滤器 * + **********************************************************************/ + var rscripts = /]*>([\S\s]*?)<\/script\s*>/gim + var ron = /\s+(on[^=\s]+)(?:=("[^"]*"|'[^']*'|[^\s>]+))?/g + var ropen = /<\w+\b(?:(["'])[^"]*?(\1)|[^>])*>/ig + var rsanitize = { + a: /\b(href)\=("javascript[^"]*"|'javascript[^']*')/ig, + img: /\b(src)\=("javascript[^"]*"|'javascript[^']*')/ig, + form: /\b(action)\=("javascript[^"]*"|'javascript[^']*')/ig + } + var rsurrogate = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g + var rnoalphanumeric = /([^\#-~| |!])/g; + + function numberFormat(number, decimals, point, thousands) { + //form http://phpjs.org/functions/number_format/ + //number 必需，要格式化的数字 + //decimals 可选，规定多少个小数位。 + //point 可选，规定用作小数点的字符串（默认为 . ）。 + //thousands 可选，规定用作千位分隔符的字符串（默认为 , ），如果设置了该参数，那么所有其他参数都是必需的。 + number = (number + '') + .replace(/[^0-9+\-Ee.]/g, '') + var n = !isFinite(+number) ? 0 : +number, + prec = !isFinite(+decimals) ? 3 : Math.abs(decimals), + sep = thousands || ",", + dec = point || ".", + s = '', + toFixedFix = function(n, prec) { + var k = Math.pow(10, prec) + return '' + (Math.round(n * k) / k) + .toFixed(prec) + } + // Fix for IE parseFloat(0.55).toFixed(0) = 0; + s = (prec ? toFixedFix(n, prec) : '' + Math.round(n)) + .split('.') + if (s[0].length > 3) { + s[0] = s[0].replace(/\B(?=(?:\d{3})+(?!\d))/g, sep) + } + if ((s[1] || '') + .length < prec) { + s[1] = s[1] || '' + s[1] += new Array(prec - s[1].length + 1) + .join('0') + } + return s.join(dec) + } + + + var filters = avalon.filters = { + uppercase: function(str) { + return str.toUpperCase() + }, + lowercase: function(str) { + return str.toLowerCase() + }, + truncate: function(str, length, truncation) { + //length，新字符串长度，truncation，新字符串的结尾的字段,返回新字符串 + length = length || 30 + truncation = typeof truncation === "string" ? truncation : "..." + return str.length > length ? str.slice(0, length - truncation.length) + truncation : String(str) + }, + $filter: function(val) { + for (var i = 1, n = arguments.length; i < n; i++) { + var array = arguments[i] + var fn = avalon.filters[array.shift()] + if (typeof fn === "function") { + var arr = [val].concat(array) + val = fn.apply(null, arr) + } + } + return val + }, + camelize: camelize, + //https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet + // chrome + // chrome + // IE67chrome + // IE67chrome + // IE67chrome + sanitize: function(str) { + return str.replace(rscripts, "").replace(ropen, function(a, b) { + var match = a.toLowerCase().match(/<(\w+)\s/) + if (match) { //处理a标签的href属性，img标签的src属性，form标签的action属性 + var reg = rsanitize[match[1]] + if (reg) { + a = a.replace(reg, function(s, name, value) { + var quote = value.charAt(0) + return name + "=" + quote + "javascript:void(0)" + quote// jshint ignore:line + }) + } + } + return a.replace(ron, " ").replace(/\s+/g, " ") //移除onXXX事件 + }) + }, + escape: function(str) { + //将字符串经过 str 转义得到适合在页面中显示的内容, 例如替换 < 为 < + return String(str). + replace(/&/g, '&'). + replace(rsurrogate, function(value) { + var hi = value.charCodeAt(0) + var low = value.charCodeAt(1) + return '&#' + (((hi - 0xD800) * 0x400) + (low - 0xDC00) + 0x10000) + ';' + }). + replace(rnoalphanumeric, function(value) { + return '&#' + value.charCodeAt(0) + ';' + }). + replace(//g, '>') + }, + currency: function(amount, symbol, fractionSize) { + return (symbol || "\uFFE5") + numberFormat(amount, isFinite(fractionSize) ? fractionSize : 2) + }, + number: numberFormat + } + /* + 'yyyy': 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010) + 'yy': 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10) + 'y': 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199) + 'MMMM': Month in year (January-December) + 'MMM': Month in year (Jan-Dec) + 'MM': Month in year, padded (01-12) + 'M': Month in year (1-12) + 'dd': Day in month, padded (01-31) + 'd': Day in month (1-31) + 'EEEE': Day in Week,(Sunday-Saturday) + 'EEE': Day in Week, (Sun-Sat) + 'HH': Hour in day, padded (00-23) + 'H': Hour in day (0-23) + 'hh': Hour in am/pm, padded (01-12) + 'h': Hour in am/pm, (1-12) + 'mm': Minute in hour, padded (00-59) + 'm': Minute in hour (0-59) + 'ss': Second in minute, padded (00-59) + 's': Second in minute (0-59) + 'a': am/pm marker + 'Z': 4 digit (+sign) representation of the timezone offset (-1200-+1200) + format string can also be one of the following predefined localizable formats: + + 'medium': equivalent to 'MMM d, y h:mm:ss a' for en_US locale (e.g. Sep 3, 2010 12:05:08 pm) + 'short': equivalent to 'M/d/yy h:mm a' for en_US locale (e.g. 9/3/10 12:05 pm) + 'fullDate': equivalent to 'EEEE, MMMM d,y' for en_US locale (e.g. Friday, September 3, 2010) + 'longDate': equivalent to 'MMMM d, y' for en_US locale (e.g. September 3, 2010 + 'mediumDate': equivalent to 'MMM d, y' for en_US locale (e.g. Sep 3, 2010) + 'shortDate': equivalent to 'M/d/yy' for en_US locale (e.g. 9/3/10) + 'mediumTime': equivalent to 'h:mm:ss a' for en_US locale (e.g. 12:05:08 pm) + 'shortTime': equivalent to 'h:mm a' for en_US locale (e.g. 12:05 pm) + */ + new function() {// jshint ignore:line + function toInt(str) { + return parseInt(str, 10) || 0 + } + + function padNumber(num, digits, trim) { + var neg = "" + if (num < 0) { + neg = '-' + num = -num + } + num = "" + num + while (num.length < digits) + num = "0" + num + if (trim) + num = num.substr(num.length - digits) + return neg + num + } + + function dateGetter(name, size, offset, trim) { + return function(date) { + var value = date["get" + name]() + if (offset > 0 || value > -offset) + value += offset + if (value === 0 && offset === -12) { + value = 12 + } + return padNumber(value, size, trim) + } + } + + function dateStrGetter(name, shortForm) { + return function(date, formats) { + var value = date["get" + name]() + var get = (shortForm ? ("SHORT" + name) : name).toUpperCase() + return formats[get][value] + } + } + + function timeZoneGetter(date) { + var zone = -1 * date.getTimezoneOffset() + var paddedZone = (zone >= 0) ? "+" : "" + paddedZone += padNumber(Math[zone > 0 ? "floor" : "ceil"](zone / 60), 2) + padNumber(Math.abs(zone % 60), 2) + return paddedZone + } + //取得上午下午 + + function ampmGetter(date, formats) { + return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1] + } + var DATE_FORMATS = { + yyyy: dateGetter("FullYear", 4), + yy: dateGetter("FullYear", 2, 0, true), + y: dateGetter("FullYear", 1), + MMMM: dateStrGetter("Month"), + MMM: dateStrGetter("Month", true), + MM: dateGetter("Month", 2, 1), + M: dateGetter("Month", 1, 1), + dd: dateGetter("Date", 2), + d: dateGetter("Date", 1), + HH: dateGetter("Hours", 2), + H: dateGetter("Hours", 1), + hh: dateGetter("Hours", 2, -12), + h: dateGetter("Hours", 1, -12), + mm: dateGetter("Minutes", 2), + m: dateGetter("Minutes", 1), + ss: dateGetter("Seconds", 2), + s: dateGetter("Seconds", 1), + sss: dateGetter("Milliseconds", 3), + EEEE: dateStrGetter("Day"), + EEE: dateStrGetter("Day", true), + a: ampmGetter, + Z: timeZoneGetter + } + var rdateFormat = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/ + var raspnetjson = /^\/Date\((\d+)\)\/$/ + filters.date = function(date, format) { + var locate = filters.date.locate, + text = "", + parts = [], + fn, match + format = format || "mediumDate" + format = locate[format] || format + if (typeof date === "string") { + if (/^\d+$/.test(date)) { + date = toInt(date) + } else if (raspnetjson.test(date)) { + date = +RegExp.$1 + } else { + var trimDate = date.trim() + var dateArray = [0, 0, 0, 0, 0, 0, 0] + var oDate = new Date(0) + //取得年月日 + trimDate = trimDate.replace(/^(\d+)\D(\d+)\D(\d+)/, function(_, a, b, c) { + var array = c.length === 4 ? [c, a, b] : [a, b, c] + dateArray[0] = toInt(array[0]) //年 + dateArray[1] = toInt(array[1]) - 1 //月 + dateArray[2] = toInt(array[2]) //日 + return "" + }) + var dateSetter = oDate.setFullYear + var timeSetter = oDate.setHours + trimDate = trimDate.replace(/[T\s](\d+):(\d+):?(\d+)?\.?(\d)?/, function(_, a, b, c, d) { + dateArray[3] = toInt(a) //小时 + dateArray[4] = toInt(b) //分钟 + dateArray[5] = toInt(c) //秒 + if (d) { //毫秒 + dateArray[6] = Math.round(parseFloat("0." + d) * 1000) + } + return "" + }) + var tzHour = 0 + var tzMin = 0 + trimDate = trimDate.replace(/Z|([+-])(\d\d):?(\d\d)/, function(z, symbol, c, d) { + dateSetter = oDate.setUTCFullYear + timeSetter = oDate.setUTCHours + if (symbol) { + tzHour = toInt(symbol + c) + tzMin = toInt(symbol + d) + } + return "" + }) + + dateArray[3] -= tzHour + dateArray[4] -= tzMin + dateSetter.apply(oDate, dateArray.slice(0, 3)) + timeSetter.apply(oDate, dateArray.slice(3)) + date = oDate + } + } + if (typeof date === "number") { + date = new Date(date) + } + if (avalon.type(date) !== "date") { + return + } + while (format) { + match = rdateFormat.exec(format) + if (match) { + parts = parts.concat(match.slice(1)) + format = parts.pop() + } else { + parts.push(format) + format = null + } + } + parts.forEach(function(value) { + fn = DATE_FORMATS[value] + text += fn ? fn(date, locate) : value.replace(/(^'|'$)/g, "").replace(/''/g, "'") + }) + return text + } + var locate = { + AMPMS: { + 0: "上午", + 1: "下午" + }, + DAY: { + 0: "星期日", + 1: "星期一", + 2: "星期二", + 3: "星期三", + 4: "星期四", + 5: "星期五", + 6: "星期六" + }, + MONTH: { + 0: "1月", + 1: "2月", + 2: "3月", + 3: "4月", + 4: "5月", + 5: "6月", + 6: "7月", + 7: "8月", + 8: "9月", + 9: "10月", + 10: "11月", + 11: "12月" + }, + SHORTDAY: { + "0": "周日", + "1": "周一", + "2": "周二", + "3": "周三", + "4": "周四", + "5": "周五", + "6": "周六" + }, + fullDate: "y年M月d日EEEE", + longDate: "y年M月d日", + medium: "yyyy-M-d H:mm:ss", + mediumDate: "yyyy-M-d", + mediumTime: "H:mm:ss", + "short": "yy-M-d ah:mm", + shortDate: "yy-M-d", + shortTime: "ah:mm" + } + locate.SHORTMONTH = locate.MONTH + filters.date.locate = locate + }// jshint ignore:line + /********************************************************************* + * AMD加载器 * + **********************************************************************/ +//https://www.devbridge.com/articles/understanding-amd-requirejs/ +//http://maxogden.com/nested-dependencies.html + /*var modules = avalon.modules = { + "domReady!": { + exports: avalon, + state: 3 + }, + "avalon": { + exports: avalon, + state: 4 + } + } +//Object(modules[id]).state拥有如下值 +// undefined 没有定义 +// 1(send) 已经发出请求 +// 2(loading) 已经被执行但还没有执行完成，在这个阶段define方法会被执行 +// 3(loaded) 执行完毕，通过onload/onreadystatechange回调判定，在这个阶段checkDeps方法会执行 +// 4(execute) 其依赖也执行完毕, 值放到exports对象上，在这个阶段fireFactory方法会执行 + modules.exports = modules.avalon + + new function () {// jshint ignore:line + var loadings = [] //正在加载中的模块列表 + var factorys = [] //放置define方法的factory函数 + var rjsext = /\.js$/i + function makeRequest(name, config) { +//1. 去掉资源前缀 + var res = "js" + name = name.replace(/^(\w+)\!/, function (a, b) { + res = b + return "" + }) + if (res === "ready") { + log("debug: ready!已经被废弃，请使用domReady!") + res = "domReady" + } +//2. 去掉querystring, hash + var query = "" + name = name.replace(rquery, function (a) { + query = a + return "" + }) + //3. 去掉扩展名 + var suffix = "." + res + var ext = /js|css/.test(suffix) ? suffix : "" + name = name.replace(/\.[a-z0-9]+$/g, function (a) { + if (a === suffix) { + ext = a + return "" + } else { + return a + } + }) + var req = avalon.mix({ + query: query, + ext: ext, + res: res, + name: name, + toUrl: toUrl + }, config) + req.toUrl(name) + return req + } + + function fireRequest(req) { + var name = req.name + var res = req.res + //1. 如果该模块已经发出请求，直接返回 + var module = modules[name] + var urlNoQuery = name && req.urlNoQuery + if (module && module.state >= 1) { + return name + } + module = modules[urlNoQuery] + if (module && module.state >= 3) { + innerRequire(module.deps || [], module.factory, urlNoQuery) + return urlNoQuery + } + if (name && !module) { + module = modules[urlNoQuery] = { + id: urlNoQuery, + state: 1 //send + } + var wrap = function (obj) { + resources[res] = obj + obj.load(name, req, function (a) { + if (arguments.length && a !== void 0) { + module.exports = a + } + module.state = 4 + checkDeps() + }) + } + + if (!resources[res]) { + innerRequire([res], wrap) + } else { + wrap(resources[res]) + } + } + return name ? urlNoQuery : res + "!" + } + +//核心API之一 require + var requireQueue = [] + var isUserFirstRequire = false + innerRequire = avalon.require = function (array, factory, parentUrl, defineConfig) { + if (!isUserFirstRequire) { + requireQueue.push(avalon.slice(arguments)) + if (arguments.length <= 2) { + isUserFirstRequire = true + var queue = requireQueue.splice(0, requireQueue.length), args + while (args = queue.shift()) { + innerRequire.apply(null, args) + } + } + return + } + + if (!Array.isArray(array)) { + avalon.error("require方法的第一个参数应为数组 " + array) + } + var deps = [] // 放置所有依赖项的完整路径 + var uniq = {} + var id = parentUrl || "callback" + setTimeout("1")// jshint ignore:line + defineConfig = defineConfig || {} + defineConfig.baseUrl = kernel.baseUrl + var isBuilt = !!defineConfig.built + if (parentUrl) { + defineConfig.parentUrl = parentUrl.substr(0, parentUrl.lastIndexOf("/")) + defineConfig.mapUrl = parentUrl.replace(rjsext, "") + } + if (isBuilt) { + var req = makeRequest(defineConfig.defineName, defineConfig) + id = req.urlNoQuery + } else { + array.forEach(function (name) { + var req = makeRequest(name, defineConfig) + var url = fireRequest(req) //加载资源，并返回该资源的完整地址 + if (url) { + if (!uniq[url]) { + deps.push(url) + uniq[url] = "司徒正美" //去重 + } + } + }) + } + + var module = modules[id] + if (!module || module.state !== 4) { + modules[id] = { + id: id, + deps: isBuilt ? array.concat() : deps, + factory: factory || noop, + state: 3 + } + } + if (!module) { + //如果此模块是定义在另一个JS文件中, 那必须等该文件加载完毕, 才能放到检测列队中 + loadings.push(id) + } + checkDeps() + } + +//核心API之二 require + innerRequire.define = function (name, deps, factory) { //模块名,依赖列表,模块本身 + if (typeof name !== "string") { + factory = deps + deps = name + name = "anonymous" + } + if (!Array.isArray(deps)) { + factory = deps + deps = [] + } + var config = { + built: !isUserFirstRequire, //用r.js打包后,所有define会放到requirejs之前 + defineName: name + } + var args = [deps, factory, config] + factory.require = function (url) { + args.splice(2, 0, url) + if (modules[url]) { + modules[url].state = 3 //loaded + var isCycle = false + try { + isCycle = checkCycle(modules[url].deps, url) + } catch (e) { + } + if (isCycle) { + avalon.error(url + "模块与之前的模块存在循环依赖，请不要直接用script标签引入" + url + "模块") + } + } + delete factory.require //释放内存 + innerRequire.apply(null, args) //0,1,2 --> 1,2,0 + } +//根据标准,所有遵循W3C标准的浏览器,script标签会按标签的出现顺序执行。 +//老的浏览器中，加载也是按顺序的：一个文件下载完成后，才开始下载下一个文件。 +//较新的浏览器中（IE8+ 、FireFox3.5+ 、Chrome4+ 、Safari4+），为了减小请求时间以优化体验， +//下载可以是并行的，但是执行顺序还是按照标签出现的顺序。 +//但如果script标签是动态插入的, 就未必按照先请求先执行的原则了,目测只有firefox遵守 +//唯一比较一致的是,IE10+及其他标准浏览器,一旦开始解析脚本, 就会一直堵在那里,直接脚本解析完毕 +//亦即，先进入loading阶段的script标签(模块)必然会先进入loaded阶段 + var url = config.built ? "unknown" : getCurrentScript() + if (url) { + var module = modules[url] + if (module) { + module.state = 2 + } + factory.require(url) + } else {//合并前后的safari，合并后的IE6-9走此分支 + factorys.push(factory) + } + } +//核心API之三 require.config(settings) + innerRequire.config = kernel + //核心API之四 define.amd 标识其符合AMD规范 + innerRequire.define.amd = modules + + //==========================对用户配置项进行再加工========================== + var allpaths = kernel["orig.paths"] = {} + var allmaps = kernel["orig.map"] = {} + var allpackages = kernel["packages"] = [] + var allargs = kernel["orig.args"] = {} + avalon.mix(plugins, { + paths: function (hash) { + avalon.mix(allpaths, hash) + kernel.paths = makeIndexArray(allpaths) + }, + map: function (hash) { + avalon.mix(allmaps, hash) + var list = makeIndexArray(allmaps, 1, 1) + avalon.each(list, function (_, item) { + item.val = makeIndexArray(item.val) + }) + kernel.map = list + }, + packages: function (array) { + array = array.concat(allpackages) + var uniq = {} + var ret = [] + for (var i = 0, pkg; pkg = array[i++]; ) { + pkg = typeof pkg === "string" ? {name: pkg} : pkg + var name = pkg.name + if (!uniq[name]) { + var url = joinPath(pkg.location || name, pkg.main || "main") + url = url.replace(rjsext, "") + ret.push(pkg) + uniq[name] = pkg.location = url + pkg.reg = makeMatcher(name) + } + } + kernel.packages = ret.sort() + }, + urlArgs: function (hash) { + if (typeof hash === "string") { + hash = {"*": hash} + } + avalon.mix(allargs, hash) + kernel.urlArgs = makeIndexArray(allargs, 1) + }, + baseUrl: function (url) { + if (!isAbsUrl(url)) { + var baseElement = head.getElementsByTagName("base")[0] + if (baseElement) { + head.removeChild(baseElement) + } + var node = DOC.createElement("a") + node.href = url + url = getFullUrl(node, "href") + if (baseElement) { + head.insertBefore(baseElement, head.firstChild) + } + } + if (url.length > 3) + kernel.baseUrl = url + }, + shim: function (obj) { + for (var i in obj) { + var value = obj[i] + if (Array.isArray(value)) { + value = obj[i] = { + deps: value + } + } + if (!value.exportsFn && (value.exports || value.init)) { + value.exportsFn = makeExports(value) + } + } + kernel.shim = obj + } + + }) + + + //==============================内部方法================================= + function checkCycle(deps, nick) { + //检测是否存在循环依赖 + for (var i = 0, id; id = deps[i++]; ) { + if (modules[id].state !== 4 && + (id === nick || checkCycle(modules[id].deps, nick))) { + return true + } + } + } + + function checkFail(node, onError, fuckIE) { + var id = trimQuery(node.src) //检测是否死链 + node.onload = node.onreadystatechange = node.onerror = null + if (onError || (fuckIE && modules[id] && !modules[id].state)) { + setTimeout(function () { + head.removeChild(node) + node = null // 处理旧式IE下的循环引用问题 + }) + log("debug: 加载 " + id + " 失败" + onError + " " + (!modules[id].state)) + } else { + return true + } + } + + function checkDeps() { + //检测此JS模块的依赖是否都已安装完毕,是则安装自身 + loop: for (var i = loadings.length, id; id = loadings[--i]; ) { + var obj = modules[id], + deps = obj.deps + if (!deps) + continue + for (var j = 0, key; key = deps[j]; j++) { + if (Object(modules[key]).state !== 4) { + continue loop + } + } + //如果deps是空对象或者其依赖的模块的状态都是2 + if (obj.state !== 4) { + loadings.splice(i, 1) //必须先移除再安装，防止在IE下DOM树建完后手动刷新页面，会多次执行它 + fireFactory(obj.id, obj.deps, obj.factory) + checkDeps() //如果成功,则再执行一次,以防有些模块就差本模块没有安装好 + } + } + } + + var rreadyState = /complete|loaded/ + function loadJS(url, id, callback) { + //通过script节点加载目标模块 + var node = DOC.createElement("script") + node.className = subscribers //让getCurrentScript只处理类名为subscribers的script节点 + var supportLoad = "onload" in node + var onEvent = supportLoad ? "onload" : "onreadystatechange" + function onload() { + var factory = factorys.pop() + factory && factory.require(id) + if (callback) { + callback() + } + if (checkFail(node, false, !supportLoad)) { + log("debug: 已成功加载 " + url) + id && loadings.push(id) + checkDeps() + } + } + var index = 0, loadID + node[onEvent] = supportLoad ? onload : function () { + if (rreadyState.test(node.readyState)) { + ++index + if (index === 1) { + loadID = setTimeout(onload, 500) + } else { + clearTimeout(loadID) + onload() + } + } + } + node.onerror = function () { + checkFail(node, true) + } + + head.insertBefore(node, head.firstChild) //chrome下第二个参数不能为null + node.src = url //插入到head的第一个节点前，防止IE6下head标签没闭合前使用appendChild抛错 + log("debug: 正准备加载 " + url) //更重要的是IE6下可以收窄getCurrentScript的寻找范围 + } + + var resources = innerRequire.plugins = { + //三大常用资源插件 js!, css!, text!, ready! + ready: { + load: noop + }, + js: { + load: function (name, req, onLoad) { + var url = req.url + var id = req.urlNoQuery + var shim = kernel.shim[name.replace(rjsext, "")] + if (shim) { //shim机制 + innerRequire(shim.deps || [], function () { + var args = avalon.slice(arguments) + loadJS(url, id, function () { + onLoad(shim.exportsFn ? shim.exportsFn.apply(0, args) : void 0) + }) + }) + } else { + loadJS(url, id) + } + } + }, + css: { + load: function (name, req, onLoad) { + var url = req.url + var node = DOC.createElement("link") + node.rel = "stylesheet" + node.href = url + head.insertBefore(node, head.firstChild) + log("debug: 已成功加载 " + url) + onLoad() + } + }, + text: { + load: function (name, req, onLoad) { + var url = req.url + var xhr = getXHR() + xhr.onreadystatechange = function () { + if (xhr.readyState === 4) { + var status = xhr.status; + if (status > 399 && status < 600) { + avalon.error(url + " 对应资源不存在或没有开启 CORS") + } else { + log("debug: 已成功加载 " + url) + onLoad(xhr.responseText) + } + } + } + var time = "_=" + (new Date() - 0) + var _url = url.indexOf("?") === -1 ? url + "?" + time : url + "&" + time + xhr.open("GET", _url, true) + if ("withCredentials" in xhr) {//这是处理跨域 + xhr.withCredentials = true + } + xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest")//告诉后端这是AJAX请求 + xhr.send() + log("debug: 正准备加载 " + url) + } + } + } + innerRequire.checkDeps = checkDeps + + var rquery = /(\?[^#]*)$/ + function trimQuery(url) { + return (url || "").replace(rquery, "") + } + + function isAbsUrl(path) { + //http://stackoverflow.com/questions/10687099/how-to-test-if-a-url-string-is-absolute-or-relative + return /^(?:[a-z]+:)?\/\//i.test(String(path)) + } + + function getFullUrl(node, src) { + return"1"[0] ? node[src] : node.getAttribute(src, 4) + } + + function getCurrentScript() { + // inspireb by https://github.com/samyk/jiagra/blob/master/jiagra.js + var stack + try { + a.b.c() //强制报错,以便捕获e.stack + } catch (e) { //safari5的sourceURL，firefox的fileName，它们的效果与e.stack不一样 + stack = e.stack + if (!stack && window.opera) { + //opera 9没有e.stack,但有e.Backtrace,但不能直接取得,需要对e对象转字符串进行抽取 + stack = (String(e).match(/of linked script \S+/g) || []).join(" ") + } + } + if (stack) { + /!**e.stack最后一行在所有支持的浏览器大致如下: + *chrome23: + * at http://113.93.50.63/data.js:4:1 + *firefox17: + *@http://113.93.50.63/query.js:4 + *opera12:http://www.oldapps.com/opera.php?system=Windows_XP + *@http://113.93.50.63/data.js:4 + *IE10: + * at Global code (http://113.93.50.63/data.js:4:1) + * //firefox4+ 可以用document.currentScript + *!/ + stack = stack.split(/[@ ]/g).pop() //取得最后一行,最后一个空格或@之后的部分 + stack = stack[0] === "(" ? stack.slice(1, -1) : stack.replace(/\s/, "") //去掉换行符 + return trimQuery(stack.replace(/(:\d+)?:\d+$/i, "")) //去掉行号与或许存在的出错字符起始位置 + } + var nodes = head.getElementsByTagName("script") //只在head标签中寻找 + for (var i = nodes.length, node; node = nodes[--i]; ) { + if (node.className === subscribers && node.readyState === "interactive") { + var url = getFullUrl(node, "src") + return node.className = trimQuery(url) + } + } + } + + var rcallback = /^callback\d+$/ + function fireFactory(id, deps, factory) { + var module = Object(modules[id]) + module.state = 4 + for (var i = 0, array = [], d; d = deps[i++]; ) { + if (d === "exports") { + var obj = module.exports || (module.exports = {}) + array.push(obj) + } else { + array.push(modules[d].exports) + } + } + try { + var ret = factory.apply(window, array) + } catch (e) { + log("执行[" + id + "]模块的factory抛错： " + e) + } + if (ret !== void 0) { + module.exports = ret + } + if (rcallback.test(id)) { + delete modules[id] + } + delete module.factory + return ret + } + function toUrl(id) { + if (id.indexOf(this.res + "!") === 0) { + id = id.slice(this.res.length + 1) //处理define("css!style",[], function(){})的情况 + } + var url = id + //1. 是否命中paths配置项 + var usePath = 0 + var baseUrl = this.baseUrl + var rootUrl = this.parentUrl || baseUrl + eachIndexArray(id, kernel.paths, function (value, key) { + url = url.replace(key, value) + usePath = 1 + }) + //2. 是否命中packages配置项 + if (!usePath) { + eachIndexArray(id, kernel.packages, function (value, key, item) { + url = url.replace(item.name, item.location) + }) + } + //3. 是否命中map配置项 + if (this.mapUrl) { + eachIndexArray(this.mapUrl, kernel.map, function (array) { + eachIndexArray(url, array, function (mdValue, mdKey) { + url = url.replace(mdKey, mdValue) + rootUrl = baseUrl + }) + }) + } + var ext = this.ext + if (ext && usePath && url.slice(-ext.length) === ext) { + url = url.slice(0, -ext.length) + } + //4. 转换为绝对路径 + if (!isAbsUrl(url)) { + rootUrl = this.built || /^\w/.test(url) ? baseUrl : rootUrl + url = joinPath(rootUrl, url) + } + //5. 还原扩展名，query + var urlNoQuery = url + ext + url = urlNoQuery + this.query + //6. 处理urlArgs + eachIndexArray(id, kernel.urlArgs, function (value) { + url += (url.indexOf("?") === -1 ? "?" : "&") + value; + }) + this.url = url + return this.urlNoQuery = urlNoQuery + } + + function makeIndexArray(hash, useStar, part) { + //创建一个经过特殊算法排好序的数组 + var index = hash2array(hash, useStar, part) + index.sort(descSorterByName) + return index + } + + function makeMatcher(prefix) { + return new RegExp('^' + prefix + '(/|$)') + } + + function makeExports(value) { + return function () { + var ret + if (value.init) { + ret = value.init.apply(window, arguments) + } + return ret || (value.exports && getGlobal(value.exports)) + } + } + + + function hash2array(hash, useStar, part) { + var array = []; + for (var key in hash) { + if (ohasOwn.call(hash, key)) { + var item = { + name: key, + val: hash[key] + } + array.push(item) + item.reg = key === "*" && useStar ? /^/ : makeMatcher(key) + if (part && key !== "*") { + item.reg = new RegExp('\/' + key.replace(/^\//, "") + '(/|$)') + } + } + } + return array + } + + function eachIndexArray(moduleID, array, matcher) { + array = array || [] + for (var i = 0, el; el = array[i++]; ) { + if (el.reg.test(moduleID)) { + matcher(el.val, el.name, el) + return false + } + } + } + // 根据元素的name项进行数组字符数逆序的排序函数 + function descSorterByName(a, b) { + var aaa = a.name + var bbb = b.name + if (bbb === "*") { + return -1 + } + if (aaa === "*") { + return 1 + } + return bbb.length - aaa.length + } + + var rdeuce = /\/\w+\/\.\./ + function joinPath(a, b) { + if (a.charAt(a.length - 1) !== "/") { + a += "/" + } + if (b.slice(0, 2) === "./") { //相对于兄弟路径 + return a + b.slice(2) + } + if (b.slice(0, 2) === "..") { //相对于父路径 + a += b + while (rdeuce.test(a)) { + a = a.replace(rdeuce, "") + } + return a + } + if (b.slice(0, 1) === "/") { + return a + b.slice(1) + } + return a + b + } + + function getGlobal(value) { + if (!value) { + return value + } + var g = window + value.split(".").forEach(function (part) { + g = g[part] + }) + return g + } + + var mainNode = DOC.scripts[DOC.scripts.length - 1] + var dataMain = mainNode.getAttribute("data-main") + if (dataMain) { + plugins.baseUrl(dataMain) + var href = kernel.baseUrl + kernel.baseUrl = href.slice(0, href.lastIndexOf("/") + 1) + loadJS(href.replace(rjsext, "") + ".js") + } else { + var loaderUrl = trimQuery(getFullUrl(mainNode, "src")) + kernel.baseUrl = loaderUrl.slice(0, loaderUrl.lastIndexOf("/") + 1) + } + }// jshint ignore:line*/ + + /********************************************************************* + * DOMReady * + **********************************************************************/ + + var readyList = [], isReady + var fireReady = function(fn) { + isReady = true + if (innerRequire) { + modules["domReady!"].state = 4 + innerRequire.checkDeps() + } + while(fn = readyList.shift()){ + fn(avalon) + } + } + + function doScrollCheck() { + try { //IE下通过doScrollCheck检测DOM树是否建完 + root.doScroll("left") + fireReady() + } catch (e) { + setTimeout(doScrollCheck) + } + } + + if (DOC.readyState === "complete") { + setTimeout(fireReady) //如果在domReady之外加载 + } else if (W3C) { + DOC.addEventListener("DOMContentLoaded", fireReady) + } else { + DOC.attachEvent("onreadystatechange", function() { + if (DOC.readyState === "complete") { + fireReady() + } + }) + try { + var isTop = window.frameElement === null + } catch (e) { + } + if (root.doScroll && isTop && window.external) {//fix IE iframe BUG + doScrollCheck() + } + } + avalon.bind(window, "load", fireReady) + + avalon.ready = function(fn) { + if (!isReady) { + readyList.push(fn) + } else { + fn(avalon) + } + } + + avalon.config({ + loader: false + }) + + avalon.ready(function() { + avalon.scan(DOC.body) + }) + +// Register as a named AMD module, since avalon can be concatenated with other +// files that may use define, but not via a proper concatenation script that +// understands anonymous AMD modules. A named AMD is safest and most robust +// way to register. Lowercase avalon is used because AMD module names are +// derived from file names, and Avalon is normally delivered in a lowercase +// file name. Do this after creating the global so that if an AMD module wants +// to call noConflict to hide this version of avalon, it will work. + +// Note that for maximum portability, libraries that are not avalon should +// declare themselves as anonymous modules, and avoid setting a global if an +// AMD loader is present. avalon is a special case. For more information, see +// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon + if (typeof define === "function" && define.amd) { + define("avalon", [], function() { + return avalon + }) + } +// Map over avalon in case of overwrite + var _avalon = window.avalon + avalon.noConflict = function(deep) { + if (deep && window.avalon === avalon) { + window.avalon = _avalon + } + return avalon + } +// Expose avalon identifiers, even in AMD +// and CommonJS for browser emulators + if (noGlobal === void 0) { + window.avalon = avalon + } + return avalon + +})); \ No newline at end of file diff --git a/static/src/js/lib/simditor/simditor-autosave.js b/static/src/js/lib/simditor/simditor-autosave.js new file mode 100644 index 0000000..23f10be --- /dev/null +++ b/static/src/js/lib/simditor/simditor-autosave.js @@ -0,0 +1,138 @@ +(function (root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module unless amdModuleId is set + define('simditor-autosave', ["jquery","simple-module","simditor"], function (a0,b1,c2) { + return (root['SimditorAutosave'] = factory(a0,b1,c2)); + }); + } else if (typeof exports === 'object') { + // Node. Does not work with strict CommonJS, but + // only CommonJS-like environments that support module.exports, + // like Node. + module.exports = factory(require("jquery"),require("simple-module"),require("simditor")); + } else { + root['SimditorAutosave'] = factory(jQuery,SimpleModule,Simditor); + } +}(this, function ($, SimpleModule, Simditor) { + +var SimditorAutosave, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; + +SimditorAutosave = (function(superClass) { + extend(SimditorAutosave, superClass); + + function SimditorAutosave() { + return SimditorAutosave.__super__.constructor.apply(this, arguments); + } + + SimditorAutosave.pluginName = 'Autosave'; + + SimditorAutosave.prototype.opts = { + autosave: true, + autosavePath: null + }; + + SimditorAutosave.prototype._init = function() { + var currentVal, link, name, val; + this.editor = this._module; + if (!this.opts.autosave) { + return; + } + this.name = typeof this.opts.autosave === 'string' ? this.opts.autosave : 'simditor'; + if (this.opts.autosavePath) { + this.path = this.opts.autosavePath; + } else { + link = $("", { + href: location.href + }); + name = this.editor.textarea.data('autosave') || this.name; + this.path = "/" + (link[0].pathname.replace(/\/$/g, "").replace(/^\//g, "")) + "/autosave/" + name + "/"; + } + if (!this.path) { + return; + } + this.editor.on("valuechanged", (function(_this) { + return function() { + return _this.storage.set(_this.path, _this.editor.getValue()); + }; + })(this)); + this.editor.el.closest('form').on('ajax:success.simditor-' + this.editor.id, (function(_this) { + return function(e) { + return _this.storage.remove(_this.path); + }; + })(this)); + val = this.storage.get(this.path); + if (!val) { + return; + } + currentVal = this.editor.textarea.val(); + if (val === currentVal) { + return; + } + if (this.editor.textarea.is('[data-autosave-confirm]')) { + if (confirm(this.editor.textarea.data('autosave-confirm') || 'Are you sure to restore unsaved changes?')) { + return this.editor.setValue(val); + } else { + return this.storage.remove(this.path); + } + } else { + return this.editor.setValue(val); + } + }; + + SimditorAutosave.prototype.storage = { + supported: function() { + var error; + try { + localStorage.setItem('_storageSupported', 'yes'); + localStorage.removeItem('_storageSupported'); + return true; + } catch (_error) { + error = _error; + return false; + } + }, + set: function(key, val, session) { + var storage; + if (session == null) { + session = false; + } + if (!this.supported()) { + return; + } + storage = session ? sessionStorage : localStorage; + return storage.setItem(key, val); + }, + get: function(key, session) { + var storage; + if (session == null) { + session = false; + } + if (!this.supported()) { + return; + } + storage = session ? sessionStorage : localStorage; + return storage[key]; + }, + remove: function(key, session) { + var storage; + if (session == null) { + session = false; + } + if (!this.supported()) { + return; + } + storage = session ? sessionStorage : localStorage; + return storage.removeItem(key); + } + }; + + return SimditorAutosave; + +})(SimpleModule); + +Simditor.connect(SimditorAutosave); + +return SimditorAutosave; + +})); diff --git a/static/src/js/utils/uploader.js b/static/src/js/utils/uploader.js index a4ce038..e6d3817 100644 --- a/static/src/js/utils/uploader.js +++ b/static/src/js/utils/uploader.js @@ -1,6 +1,6 @@ -define("uploader", ["webUploader", "csrfToken"], function(webuploader,csrfTokenHeader){ - function uploader(selector, server, onSuccess, beforeUpload) { - var Webuploader= webuploader.create({ +define("uploader", ["webUploader", "csrfToken"], function (webuploader, csrfTokenHeader) { + function uploader(selector, server, onSuccess, uploadProgress) { + var Webuploader = webuploader.create({ auto: true, // swf文件路径 swf: "/static/img/Uploader.swf", @@ -11,11 +11,16 @@ define("uploader", ["webUploader", "csrfToken"], function(webuploader,csrfTokenH pick: selector, // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！ resize: false, - uploadBeforeSend : csrfTokenHeader + uploadBeforeSend: csrfTokenHeader, + accept: { + title: 'testcase zip', + extensions: 'zip', + mimeTypes: 'application/zip' + } }); - Webuploader.on("uploadBeforeSend",csrfTokenHeader); + Webuploader.on("uploadBeforeSend", csrfTokenHeader); Webuploader.on("uploadSuccess", onSuccess); - Webuploader.on("beforeFileQueued", beforeUpload); + Webuploader.on("uploadProgress", uploadProgress); return Webuploader; } diff --git a/submission/serializers.py b/submission/serializers.py index 3a5308c..dcaf701 100644 --- a/submission/serializers.py +++ b/submission/serializers.py @@ -30,3 +30,10 @@ class SubmissionRejudgeSerializer(serializers.Serializer): submission_id = serializers.CharField(max_length=40) +class CreateContestSubmissionSerializer(serializers.Serializer): + contest_id = serializers.IntegerField() + problem_id = serializers.IntegerField() + language = serializers.IntegerField() + code = serializers.CharField(max_length=3000) + + diff --git a/submission/tests.py b/submission/tests.py index 96d06f0..a6342da 100644 --- a/submission/tests.py +++ b/submission/tests.py @@ -4,8 +4,8 @@ from django.test import TestCase, Client from django.core.urlresolvers import reverse from account.models import User, REGULAR_USER, ADMIN, SUPER_ADMIN from problem.models import Problem -from contest.models import Contest -from contest.models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PUBLIC_CONTEST +from contest.models import Contest, ContestProblem +from contest.models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PROTECTED_CONTEST from submission.models import Submission from rest_framework.test import APITestCase, APIClient @@ -193,7 +193,7 @@ class SubmissionPageTest(TestCase): hint="hint1", created_by=User.objects.get(username="test1")) self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, - contest_type=PASSWORD_PUBLIC_CONTEST, show_rank=True, + contest_type=PUBLIC_CONTEST, show_rank=True, show_user_submission=True, start_time="2015-08-15T10:00:00.000Z", end_time="2015-08-15T12:00:00.000Z", @@ -203,3 +203,129 @@ class SubmissionPageTest(TestCase): language=1, code='#include "stdio.h"\nint main(){\n\treturn 0;\n}', problem_id=self.problem.id) + + +class ContestSubmissionAPITest(APITestCase): + def setUp(self): + self.client = APIClient() + self.url = reverse('contest_submission_api') + self.user1 = User.objects.create(username="test1", admin_type=SUPER_ADMIN) + self.user1.set_password("testaa") + self.user1.save() + self.user2 = User.objects.create(username="test2", admin_type=REGULAR_USER) + self.user2.set_password("testbb") + self.user2.save() + self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, + contest_type=PUBLIC_CONTEST, show_rank=True, + show_user_submission=True, + start_time="2015-08-15T10:00:00.000Z", + end_time="2015-08-30T12:00:00.000Z", + created_by=User.objects.get(username="test1")) + self.contest_problem = ContestProblem.objects.create(title="titlex", + description="descriptionx", + input_description="input1_description", + output_description="output1_description", + test_case_id="1", + samples=json.dumps([{"input": "1 1", "output": "2"}]), + time_limit=100, + memory_limit=1000, + hint="hint1", + created_by=User.objects.get(username="test1"), + contest=Contest.objects.get(title="titlex"), + sort_index="a") + + # 以下是创建比赛的提交 + def test_invalid_format(self): + self.client.login(username="test1", password="testaa") + data = {"contest_id": self.global_contest.id, "language": 1} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data["code"], 1) + + def test_contest_submission_successfully(self): + self.client.login(username="test1", password="testaa") + data = {"contest_id": self.global_contest.id, "problem_id": self.contest_problem.id, + "language": 1, "code": '#include "stdio.h"\nint main(){\n\treturn 0;\n}'} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data["code"], 0) + + def test_contest_problem_does_not_exist(self): + self.client.login(username="test1", password="testaa") + data = {"contest_id": self.global_contest.id, "problem_id": self.contest_problem.id + 10, + "language": 1, "code": '#include "stdio.h"\nint main(){\n\treturn 0;\n}'} + response = self.client.post(self.url, data=data) + self.assertEqual(response.data, {"code": 1, "data": u"题目不存在"}) + + +class ContestSubmissionAdminAPITest(APITestCase): + def setUp(self): + self.client = APIClient() + self.url = reverse('contest_submission_admin_api_view') + self.userA = User.objects.create(username="test1", admin_type=ADMIN) + self.userA.set_password("testaa") + self.userA.save() + self.userS = User.objects.create(username="test2", admin_type=SUPER_ADMIN) + self.userS.set_password("testbb") + self.userS.save() + self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1, + contest_type=PASSWORD_PROTECTED_CONTEST, show_rank=True, + show_user_submission=True, + start_time="2015-08-15T10:00:00.000Z", + end_time="2015-08-15T12:00:00.000Z", + password="aacc", created_by=self.userS + ) + self.problem = ContestProblem.objects.create(title="title1", + description="description1", + input_description="input1_description", + output_description="output1_description", + test_case_id="1", + sort_index="1", + samples=json.dumps([{"input": "1 1", "output": "2"}]), + time_limit=100, + memory_limit=1000, + hint="hint1", + contest=self.global_contest, + created_by=self.userS) + self.submission = Submission.objects.create(user_id=self.userA.id, + language=1, + code='#include "stdio.h"\nint main(){\n\treturn 0;\n}', + problem_id=self.problem.id) + self.submissionS = Submission.objects.create(user_id=self.userS.id, + language=2, + code='#include "stdio.h"\nint main(){\n\treturn 0;\n}', + problem_id=self.problem.id) + + def test_submission_contest_does_not_exist(self): + self.client.login(username="test2", password="testbb") + response = self.client.get(self.url + "?contest_id=99") + self.assertEqual(response.data["code"], 1) + + def test_submission_contest_parameter_error(self): + self.client.login(username="test2", password="testbb") + response = self.client.get(self.url) + self.assertEqual(response.data["code"], 1) + + def test_submission_access_denied(self): + self.client.login(username="test1", password="testaa") + response = self.client.get(self.url + "?problem_id=" + str(self.problem.id)) + self.assertEqual(response.data["code"], 1) + + def test_submission_access_denied_with_contest_id(self): + self.client.login(username="test1", password="testaa") + response = self.client.get(self.url + "?contest_id=" + str(self.global_contest.id)) + self.assertEqual(response.data["code"], 1) + + def test_get_submission_successfully(self): + self.client.login(username="test2", password="testbb") + response = self.client.get( + self.url + "?contest_id=" + str(self.global_contest.id) + "&problem_id=" + str(self.problem.id)) + self.assertEqual(response.data["code"], 0) + + def test_get_submission_successfully_problem(self): + self.client.login(username="test2", password="testbb") + response = self.client.get(self.url + "?problem_id=" + str(self.problem.id)) + self.assertEqual(response.data["code"], 0) + + def test_get_submission_problem_do_not_exist(self): + self.client.login(username="test2", password="testbb") + response = self.client.get(self.url + "?problem_id=9999") + self.assertEqual(response.data["code"], 1) \ No newline at end of file diff --git a/submission/views.py b/submission/views.py index caa2e68..e9eaa44 100644 --- a/submission/views.py +++ b/submission/views.py @@ -5,27 +5,29 @@ import logging import redis from django.shortcuts import render from django.core.paginator import Paginator - from rest_framework.views import APIView from judge.judger_controller.tasks import judge -from judge.judger_controller.settings import redis_config from account.decorators import login_required, super_admin_required -from account.models import SUPER_ADMIN, User, REGULAR_USER - +from account.models import SUPER_ADMIN, User from problem.models import Problem from contest.models import ContestProblem, Contest -from announcement.models import Announcement +from contest.decorators import check_user_contest_permission from utils.shortcuts import serializer_invalid_response, error_response, success_response, error_page, paginate - +from utils.cache import get_cache_redis from .models import Submission from .serializers import (CreateSubmissionSerializer, SubmissionSerializer, - SubmissionhareSerializer, SubmissionRejudgeSerializer) - + SubmissionhareSerializer, SubmissionRejudgeSerializer, + CreateContestSubmissionSerializer) logger = logging.getLogger("app_info") +def _judge(submission_id, time_limit, memory_limit, test_case_id): + judge.delay(submission_id, time_limit, memory_limit, test_case_id) + get_cache_redis().incr("judge_queue_length") + + class SubmissionAPIView(APIView): @login_required def post(self, request): @@ -41,17 +43,16 @@ class SubmissionAPIView(APIView): problem = Problem.objects.get(id=data["problem_id"]) except Problem.DoesNotExist: return error_response(u"题目不存在") - submission = Submission.objects.create(user_id=request.user.id, language=int(data["language"]), - code=data["code"], problem_id=problem.id) + submission = Submission.objects.create(user_id=request.user.id, + language=int(data["language"]), + code=data["code"], + problem_id=problem.id) try: - judge.delay(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id) + _judge(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id) except Exception as e: logger.error(e) return error_response(u"提交判题任务失败") - r = redis.Redis(host=redis_config["host"], port=redis_config["port"], db=redis_config["db"]) - r.incr("judge_queue_length") - return success_response({"submission_id": submission.id}) else: return serializer_invalid_response(serializer) @@ -71,6 +72,37 @@ class SubmissionAPIView(APIView): return success_response(response_data) +class ContestSubmissionAPIView(APIView): + @check_user_contest_permission + def post(self, request): + """ + 创建比赛的提交 + --- + request_serializer: CreateContestSubmissionSerializer + """ + serializer = CreateContestSubmissionSerializer(data=request.data) + if serializer.is_valid(): + data = serializer.data + contest = Contest.objects.get(id=data["contest_id"]) + try: + problem = ContestProblem.objects.get(contest=contest, id=data["problem_id"]) + except ContestProblem.DoesNotExist: + return error_response(u"题目不存在") + submission = Submission.objects.create(user_id=request.user.id, + language=int(data["language"]), + contest_id=contest.id, + code=data["code"], + problem_id=problem.id) + try: + _judge(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id) + except Exception as e: + logger.error(e) + return error_response(u"提交判题任务失败") + return success_response({"submission_id": submission.id}) + else: + return serializer_invalid_response(serializer) + + @login_required def problem_my_submissions_list_page(request, problem_id): """ @@ -81,11 +113,11 @@ def problem_my_submissions_list_page(request, problem_id): except Problem.DoesNotExist: return error_page(request, u"问题不存在") - submissions = Submission.objects.filter(user_id=request.user.id, problem_id=problem.id, - contest_id__isnull=True).order_by("-create_time"). \ + submissions = Submission.objects.filter(user_id=request.user.id, problem_id=problem.id,contest_id__isnull=True).\ + order_by("-create_time"). \ values("id", "result", "create_time", "accepted_answer_time", "language") - return render(request, "oj/problem/my_submissions_list.html", + return render(request, "oj/submission/problem_my_submissions_list.html", {"submissions": submissions, "problem": problem}) @@ -119,17 +151,13 @@ def my_submission(request, submission_id): except Submission.DoesNotExist: return error_page(request, u"提交不存在") - if submission.contest_id: - try: - problem = ContestProblem.objects.get(id=submission.problem_id, - visible=True) - except ContestProblem.DoesNotExist: - return error_page(request, u"提交不存在") - else: - try: + try: + if submission.contest_id: + problem = ContestProblem.objects.get(id=submission.problem_id, visible=True) + else: problem = Problem.objects.get(id=submission.problem_id, visible=True) - except Problem.DoesNotExist: - return error_page(request, u"提交不存在") + except Exception: + return error_page(request, u"提交不存在") if submission.info: try: @@ -139,12 +167,13 @@ def my_submission(request, submission_id): else: info = None user = User.objects.get(id=submission.user_id) - return render(request, "oj/problem/my_submission.html", + return render(request, "oj/submission/my_submission.html", {"submission": submission, "problem": problem, "info": info, "user": user, "can_share": result["can_share"]}) class SubmissionAdminAPIView(APIView): + @super_admin_required def get(self, request): problem_id = request.GET.get("problem_id", None) if not problem_id: @@ -164,7 +193,8 @@ def my_submission_list_page(request, page=1): submissions = Submission.objects.filter(contest_id__isnull=True) else: submissions = Submission.objects.filter(user_id=request.user.id, contest_id__isnull=True) - submissions = submissions.values("id", "user_id", "problem_id", "result", "create_time", "accepted_answer_time", "language").order_by("-create_time") + submissions = submissions.values("id", "user_id", "problem_id", "result", "create_time", "accepted_answer_time", + "language").order_by("-create_time") language = request.GET.get("language", None) filter = None @@ -238,24 +268,42 @@ class SubmissionRejudgeAdminAPIView(APIView): serializer = SubmissionRejudgeSerializer(data=request.data) if serializer.is_valid(): submission_id = serializer.data["submission_id"] + # 目前只考虑前台公开题目的重新判题 try: - submission = Submission.objects.get(id=submission_id) + submission = Submission.objects.get(id=submission_id, contest_id__isnull=True) except Submission.DoesNotExist: return error_response(u"提交不存在") - # 目前只考虑前台公开题目的重新判题 + try: problem = Problem.objects.get(id=submission.problem_id) except Problem.DoesNotExist: return error_response(u"题目不存在") try: - judge.delay(submission_id, problem.time_limit, problem.memory_limit, problem.test_case_id) + _judge(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id) except Exception as e: logger.error(e) return error_response(u"提交判题任务失败") - - # 增加redis 中判题队列长度的计数器 - r = redis.Redis(host=redis_config["host"], port=redis_config["port"], db=redis_config["db"]) - r.incr("judge_queue_length") return success_response(u"任务提交成功") else: - return serializer_invalid_response(serializer) \ No newline at end of file + return serializer_invalid_response(serializer) + + +class ContestSubmissionAdminAPIView(APIView): + @check_user_contest_permission + def get(self, request): + """ + 查询比赛提交,单个比赛题目提交的adminAPI + --- + response_serializer: SubmissionSerializer + """ + problem_id = request.GET.get("problem_id", None) + contest_id = request.GET.get("contest_id", None) + + # 需要 problem_id 和 contest_id 两个参数 否则会在check_user_contest_permission 的时候被拦截 + if problem_id: + submissions = Submission.objects.filter(contest_id=contest_id, problem_id=problem_id).order_by("-create_time") + # 需要 contest_id 参数 + else: + submissions = Submission.objects.filter(contest_id=contest_id).order_by("-create_time") + + return paginate(request, submissions, SubmissionSerializer) diff --git a/template/src/admin/admin.html b/template/src/admin/admin.html index bde4fb9..37493d7 100644 --- a/template/src/admin/admin.html +++ b/template/src/admin/admin.html @@ -69,8 +69,8 @@ diff --git a/template/src/admin/announcement/announcement.html b/template/src/admin/announcement/announcement.html index f08ccb0..ab19406 100644 --- a/template/src/admin/announcement/announcement.html +++ b/template/src/admin/announcement/announcement.html @@ -7,7 +7,6 @@ 创建时间 更新时间 创建者 - 类型 可见 @@ -17,7 +16,6 @@ {{ el.create_time|date("yyyy-MM-dd HH:mm:ss")}} {{ el.last_update_time|date("yyyy-MM-dd HH:mm:ss")}} {{ el.created_by.username }} - @@ -28,12 +26,10 @@
- 页数：{{ page }}/{{ totalPage }}   - - +
-
+

编辑公告

@@ -42,37 +38,19 @@ ms-duplex="newTitle">
- +
-
- -
- - 全局可见 - - - 小组内可见 - -
- -
-
- -
-   {{ el.name }} -
-
  
-

添加公告

+

发布公告

@@ -84,36 +62,12 @@
- + +
-
- -
- - - - - - -
- -
-
- -
-   {{ el.name }} -
-
diff --git a/template/src/admin/problem/add_problem.html b/template/src/admin/problem/add_problem.html index 37c48bb..0a706ad 100644 --- a/template/src/admin/problem/add_problem.html +++ b/template/src/admin/problem/add_problem.html @@ -10,8 +10,7 @@
- -

请填写题目描述

+
@@ -105,6 +104,7 @@ 请将所有测试用例打包在一个文件中上传，所有文件要在压缩包的根目录，且输入输出文件名要以从1开始连续数字标识要对应例如：
1.in 1.out 2.in 2.out +

上传进度%

@@ -125,7 +125,7 @@
- +
diff --git a/template/src/admin/problem/edit_problem.html b/template/src/admin/problem/edit_problem.html index d7c9743..b8a6fa8 100644 --- a/template/src/admin/problem/edit_problem.html +++ b/template/src/admin/problem/edit_problem.html @@ -16,8 +16,7 @@
- -

请填写题目描述

+
@@ -111,6 +110,7 @@ 请将所有测试用例打包在一个文件中上传，所有文件要在压缩包的根目录，且输入输出文件名要以从1开始连续数字标识要对应例如：
1.in 1.out 2.in 2.out +

上传进度%

编号
@@ -131,7 +131,7 @@
- +
diff --git a/template/src/admin/problem/problem_list.html b/template/src/admin/problem/problem_list.html index 284d2da..3fa5ac5 100644 --- a/template/src/admin/problem/problem_list.html +++ b/template/src/admin/problem/problem_list.html @@ -6,7 +6,7 @@
- +

@@ -38,9 +38,7 @@
- 页数：{{ page }}/{{ totalPage }}   - - +
\ No newline at end of file diff --git a/template/src/admin/problem/submission_list.html b/template/src/admin/problem/submission_list.html index e0880af..8c0840a 100644 --- a/template/src/admin/problem/submission_list.html +++ b/template/src/admin/problem/submission_list.html @@ -27,9 +27,7 @@
编号
- 页数：{{ page }}/{{ totalPage }}   - - +
\ No newline at end of file diff --git a/template/src/admin/user/user_list.html b/template/src/admin/user/user_list.html index 8e8c0f4..937696e 100644 --- a/template/src/admin/user/user_list.html +++ b/template/src/admin/user/user_list.html @@ -16,7 +16,6 @@ ID 用户名 注册时间 - 最近登陆 真实姓名 电子邮箱 用户类型 @@ -26,7 +25,6 @@ {{ el.id }} {{ el.username }} {{ el.create_time|date("yyyy-MM-dd HH:mm:ss")}} - {{ el.last_login|date("yyyy-MM-dd HH:mm:ss")}} {{ el.real_name }} {{ el.email }} {{ userType[el.admin_type]}} @@ -39,17 +37,15 @@
- 页数：{{ page }}/{{ totalPage }}   - - +
-
+

修改用户信息

-
+
- +
-
@@ -80,7 +76,7 @@
- +
diff --git a/template/src/oj/account/oauth.html b/template/src/oj/account/oauth.html new file mode 100644 index 0000000..2713d19 --- /dev/null +++ b/template/src/oj/account/oauth.html @@ -0,0 +1,24 @@ +{% extends "oj_base.html" %} +{% block title %} + 授权登录 +{% endblock %} +{% block body %} +
+
+ {% if request.user.is_authenticated %} +

3秒钟后将跳转到{{ callback }}

+ + {% else %} + + {% endif %} + + +
+
+{% endblock %} +{% block js_block %} + +{% endblock %} \ No newline at end of file diff --git a/template/src/oj/contest/contest_problem.html b/template/src/oj/contest/contest_problem.html deleted file mode 100644 index cf60ef8..0000000 --- a/template/src/oj/contest/contest_problem.html +++ /dev/null @@ -1,103 +0,0 @@ -{% extends 'oj_base.html' %} -{% block title %} - {{ contest_problem.title }} -{% endblock %} -{% block body %} -
- -

{{ contest_problem.title }}

- -

发布时间 : {{ contest_problem.create_time }}   - 时间限制 : {{ contest_problem.time_limit }}ms   - 内存限制 : {{ contest_problem.memory_limit }}M -

- -
-
- - -
{{ contest_problem.description|safe }}
-
-
- - -

{{ contest_problem.input_description }}

- -
- -
- - -

{{ contest_problem.output_description }}

-
- {% for item in samples %} -
- - 复制 - 
{{ item.input }}
-
-
- - 
{{ item.output }}
-
- {% endfor %} - - {% if contest_problem.hint %} -
- -
{{ contest_problem.hint|safe }}
-
- {% endif %} - {% if show_submit_code_area %} -
- -
- - - -
-
-
- - -
-
-
- - -
- {% endif %} - {% if show_warning %} - - {% endif %} -
-
-
-
-
-
-
-{% endblock %} -{% block js_block %} - -{% endblock %} \ No newline at end of file diff --git a/template/src/oj/contest/contest_problems_list.html b/template/src/oj/contest/contest_problems_list.html index e35e28e..056ba6c 100644 --- a/template/src/oj/contest/contest_problems_list.html +++ b/template/src/oj/contest/contest_problems_list.html @@ -3,66 +3,66 @@ 比赛题目列表 {% endblock %} {% block body %} -{% load problem %} -
+ {% load problem %} +
-
-
+
+
- + -
- - -
-
- - - - - - - - - - - {% for item in contest_problems %} - - - - - - - {% endfor %} - -
#题目通过率
- - - {{ item.sort_index }} - - {{ item.title }} - {{ item|accepted_radio }}
-
-
+ +
+
+ + + + + + + + + + + {% for item in contest_problems %} + + + + + + + {% endfor %} + +
#题目通过率
+ + + {{ item.sort_index }} + + {{ item.title }} + {{ item|accepted_radio }}
+ +
+
+ +
-
{% endblock %} {% block js_block %} diff --git a/template/src/oj/contest/contest_rank.html b/template/src/oj/contest/contest_rank.html index e065105..b14eb28 100644 --- a/template/src/oj/contest/contest_rank.html +++ b/template/src/oj/contest/contest_rank.html @@ -75,14 +75,14 @@
    {% if paging_info.previous_page %} {% endif %} {% if paging_info.next_page %} {% endif %} diff --git a/template/src/oj/contest/my_submission.html b/template/src/oj/contest/my_submission.html deleted file mode 100644 index 1e09103..0000000 --- a/template/src/oj/contest/my_submission.html +++ /dev/null @@ -1,74 +0,0 @@ -{% extends 'oj_base.html' %} -{% block title %} - 我的提交详情 -{% endblock %} -{% block css_block %} - -{% endblock %} -{% block body %} - {% load submission %} -
    - - {% include "oj/problem/_problem_header.html" %} -
    -
    -

    运行结果 : - {{ submission.result|translate_result }} - -

    - {% ifequal submission.result 0 %} -

    时间 : {{ submission.accepted_answer_time }}ms 语言 : - {{ submission.language|translate_language }} -

    - {% endifequal %} - {% ifequal submission.result 4 %} -

    {{ submission.info }}

    - {% endifequal %} -

    提交时间 : {{ submission.create_time }}

    -
    -
    - {% ifequal request.user.admin_type 2 %} -

    本调试信息仅超级管理员可见

    - {% ifequal submission.result 7 %} - 
    System Error: {{ submission.info }}
    - {% else %} - 
    {{ info }}
    - {% endifequal %} - - {% endifequal %} - - -
    - -
    -
    - -{% endblock %} -{% block js_block %} - -{% endblock %} \ No newline at end of file diff --git a/template/src/oj/contest/my_submissions_list.html b/template/src/oj/contest/my_submissions_list.html deleted file mode 100644 index 638318a..0000000 --- a/template/src/oj/contest/my_submissions_list.html +++ /dev/null @@ -1,52 +0,0 @@ -{% extends 'oj_base.html' %} -{% block title %} - 我的提交列表 -{% endblock %} -{% block body %} - - {% load submission %} -
    - - {% include "oj/problem/_problem_header.html" %} - - - - - - - - - - - - {% for item in submissions %} - - - - - - - - {% endfor %} - - -
    #提交时间语言运行时间结果
    {{ forloop.counter }}{{ item.create_time }} - {{ item.language|translate_language }} - - {% if item.accepted_answer_time %} - {{ item.accepted_answer_time }}ms - {% else %} - -- - {% endif %} - - {{ item.result|translate_result }} -
    -
    -{% endblock %} \ No newline at end of file diff --git a/template/src/oj/problem/_problem_header.html b/template/src/oj/problem/_problem_header.html index afb89cd..a2da6c7 100644 --- a/template/src/oj/problem/_problem_header.html +++ b/template/src/oj/problem/_problem_header.html @@ -1,6 +1,8 @@

    {{ problem.title }}

    -

    发布时间 : {{ problem.create_time }}   - 时间限制 : {{ problem.time_limit }}ms   - 内存限制 : {{ problem.memory_limit }}M +

    + 发布时间: {{ problem.create_time }}   + {% if problem.last_update_time %}最后更新: {{ problem.last_update_time }}  {% endif %} + 时间限制: {{ problem.time_limit }}ms   + 内存限制: {{ problem.memory_limit }}M

    \ No newline at end of file diff --git a/template/src/oj/problem/_problem_main_info.html b/template/src/oj/problem/_problem_main_info.html new file mode 100644 index 0000000..cdc80a0 --- /dev/null +++ b/template/src/oj/problem/_problem_main_info.html @@ -0,0 +1,29 @@ +
    + + +
    {{ problem.description|safe }}
    +
    +
    + + +

    {{ problem.input_description }}

    +
    +
    + + +

    {{ problem.output_description }}

    +
    + {% for item in samples %} +
    + + 复制 + 
    +{{ item.input }}
    + +
    +
    + + 
    +{{ item.output }}
    +
    + {% endfor %} \ No newline at end of file diff --git a/template/src/oj/problem/_submit_problem.html b/template/src/oj/problem/_submit_problem.html new file mode 100644 index 0000000..f21f45d --- /dev/null +++ b/template/src/oj/problem/_submit_problem.html @@ -0,0 +1,25 @@ +
    + +
    + + + +
    +
    +
    + + +
    +
    +
    + + +
    \ No newline at end of file diff --git a/template/src/oj/problem/contest_problem.html b/template/src/oj/problem/contest_problem.html new file mode 100644 index 0000000..b844ec1 --- /dev/null +++ b/template/src/oj/problem/contest_problem.html @@ -0,0 +1,42 @@ +{% extends 'oj_base.html' %} +{% block title %} + {{ problem.title }} +{% endblock %} +{% block body %} +
    + + {% include "oj/problem/_problem_header.html" %} +
    + {% include "oj/problem/_problem_main_info.html" %} + {% if problem.hint %} +
    + + +
    {{ problem.hint|safe }}
    +
    + {% endif %} + {% if show_submit_code_area %} + {% include "oj/problem/_submit_problem.html" %} + {% endif %} + {% if show_warning %} + + {% endif %} +
    +
    +
    +
    +
    +{% endblock %} +{% block js_block %} + +{% endblock %} \ No newline at end of file diff --git a/template/src/oj/problem/problem.html b/template/src/oj/problem/problem.html index d7c360b..99e8729 100644 --- a/template/src/oj/problem/problem.html +++ b/template/src/oj/problem/problem.html @@ -15,35 +15,7 @@ {% include "oj/problem/_problem_header.html" %}
    -
    - - -
    {{ problem.description|safe }}
    -
    -
    - - -

    {{ problem.input_description }}

    -
    -
    - - -

    {{ problem.output_description }}

    -
    - {% for item in samples %} -
    - - 复制 - 
    -{{ item.input }}
    - -
    -
    - - 
    -{{ item.output }}
    -
    - {% endfor %} + {% include "oj/problem/_problem_main_info.html" %}
    @@ -67,31 +39,7 @@
    {{ problem.source }}
    {% endif %} -
    - -
    - - - -
    -
    -
    - - -
    -
    -
    - - -
    + {% include "oj/problem/_submit_problem.html" %}
    diff --git a/template/src/oj/problem/my_submission.html b/template/src/oj/submission/my_submission.html similarity index 94% rename from template/src/oj/problem/my_submission.html rename to template/src/oj/submission/my_submission.html index c458cd5..9611cd8 100644 --- a/template/src/oj/problem/my_submission.html +++ b/template/src/oj/submission/my_submission.html @@ -36,7 +36,7 @@ {% include "oj/problem/_problem_header.html" %}
    -

    运行结果 : +

    运行结果: {{ submission.result|translate_result }}

    @@ -44,14 +44,14 @@

    作者：{{ user.username }}

    {% endifnotequal %} {% ifequal submission.result 0 %} -

    时间 : {{ submission.accepted_answer_time }}ms 语言 : +

    时间: {{ submission.accepted_answer_time }}ms 语言 : {{ submission.language|translate_language }}

    {% endifequal %} {% ifequal submission.result 4 %} 
    {{ submission.info }}
    {% endifequal %} -

    提交时间 : {{ submission.create_time }}

    +

    提交时间: {{ submission.create_time }}

    {% ifequal request.user.admin_type 2 %} diff --git a/template/src/oj/problem/my_submissions_list.html b/template/src/oj/submission/problem_my_submissions_list.html similarity index 70% rename from template/src/oj/problem/my_submissions_list.html rename to template/src/oj/submission/problem_my_submissions_list.html index faa9d62..5931601 100644 --- a/template/src/oj/problem/my_submissions_list.html +++ b/template/src/oj/submission/problem_my_submissions_list.html @@ -7,10 +7,19 @@ {% load submission %}
    {% include "oj/problem/_problem_header.html" %} {% if submissions %} diff --git a/template/src/utils/reset_password_email.html b/template/src/utils/reset_password_email.html index 3852adb..f4c8b93 100644 --- a/template/src/utils/reset_password_email.html +++ b/template/src/utils/reset_password_email.html @@ -8,7 +8,7 @@ - Online Judge + {{ website_name }} 密码找回邮件 @@ -32,7 +32,7 @@ - 您刚刚在 青岛大学在线评测系统 使用了找回密码功能。 + 您刚刚在 {{ website_name }} 使用了找回密码功能。 diff --git a/utils/templatetags/announcement_list.py b/utils/templatetags/announcement_list.py index 1b2f331..04fa6a5 100644 --- a/utils/templatetags/announcement_list.py +++ b/utils/templatetags/announcement_list.py @@ -5,7 +5,7 @@ from announcement.models import Announcement def public_announcement_list(): - return Announcement.objects.filter(is_global=True, visible=True).order_by("-create_time") + return Announcement.objects.filter(visible=True).order_by("-create_time") register = template.Library() register.assignment_tag(public_announcement_list, name="public_announcement_list") \ No newline at end of file