зеркало из https://github.com/mozilla/gecko-dev.git
Merge m-c to inbound, a=merge
This commit is contained in:
Wes Kocher
Коммит
78f3a19dd3
|
|
@ -710,6 +710,9 @@ var settingsToObserve = {
|
||||||
'ui.touch.radius.bottommm': {
|
'ui.touch.radius.bottommm': {
|
||||||
resetToPref: true
|
resetToPref: true
|
||||||
},
|
},
|
||||||
|
'ui.click_hold_context_menus.delay': {
|
||||||
|
resetToPref: true
|
||||||
|
},
|
||||||
'wap.UAProf.tagname': 'x-wap-profile',
|
'wap.UAProf.tagname': 'x-wap-profile',
|
||||||
'wap.UAProf.url': ''
|
'wap.UAProf.url': ''
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
|
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
|
||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="df7683e4f7329c567deb487d11317578c6930246"/>
|
<project name="gaia" path="gaia" remote="mozillaorg" revision="c64d6e345aa477f2a24b676e84a47020a00d015d"/>
|
||||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||||
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
|
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||||
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
||||||
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
||||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="25554535ee69d4c0c24a51f6a55bbabe5cb0a6b8"/>
|
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="0c28789b9957913be975eb002a22323f93585d4c"/>
|
||||||
<!-- Stock Android things -->
|
<!-- Stock Android things -->
|
||||||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
|
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
|
||||||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
|
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
|
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
|
||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="df7683e4f7329c567deb487d11317578c6930246"/>
|
<project name="gaia" path="gaia" remote="mozillaorg" revision="c64d6e345aa477f2a24b676e84a47020a00d015d"/>
|
||||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||||
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
|
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||||
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
||||||
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
||||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="25554535ee69d4c0c24a51f6a55bbabe5cb0a6b8"/>
|
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="0c28789b9957913be975eb002a22323f93585d4c"/>
|
||||||
<!-- Stock Android things -->
|
<!-- Stock Android things -->
|
||||||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
|
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
|
||||||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
|
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
|
||||||
|
|
|
||||||
|
|
@ -19,11 +19,11 @@
|
||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="df7683e4f7329c567deb487d11317578c6930246"/>
|
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="c64d6e345aa477f2a24b676e84a47020a00d015d"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||||
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="4ace9aaee0e048dfda11bb787646c59982a3dc80"/>
|
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="4ace9aaee0e048dfda11bb787646c59982a3dc80"/>
|
||||||
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="e8c6824471c8722340249166b8884c38bd4d8a26"/>
|
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="c72c9278ddc2f442d193474993d36e7f2cfb08c4"/>
|
||||||
<project name="moztt" path="external/moztt" remote="b2g" revision="31a7849fe9a8b743d6f5e5facc212f0ef9d57499"/>
|
<project name="moztt" path="external/moztt" remote="b2g" revision="31a7849fe9a8b743d6f5e5facc212f0ef9d57499"/>
|
||||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="34ea6163f9f0e0122fb0bb03607eccdca31ced7a"/>
|
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="34ea6163f9f0e0122fb0bb03607eccdca31ced7a"/>
|
||||||
<!-- Stock Android things -->
|
<!-- Stock Android things -->
|
||||||
|
|
|
||||||
|
|
@ -17,10 +17,10 @@
|
||||||
</project>
|
</project>
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="df7683e4f7329c567deb487d11317578c6930246"/>
|
<project name="gaia" path="gaia" remote="mozillaorg" revision="c64d6e345aa477f2a24b676e84a47020a00d015d"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
||||||
<project name="moztt" path="external/moztt" remote="b2g" revision="31a7849fe9a8b743d6f5e5facc212f0ef9d57499"/>
|
<project name="moztt" path="external/moztt" remote="b2g" revision="31a7849fe9a8b743d6f5e5facc212f0ef9d57499"/>
|
||||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="25554535ee69d4c0c24a51f6a55bbabe5cb0a6b8"/>
|
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="0c28789b9957913be975eb002a22323f93585d4c"/>
|
||||||
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
||||||
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
||||||
<!-- Stock Android things -->
|
<!-- Stock Android things -->
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
|
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
|
||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="df7683e4f7329c567deb487d11317578c6930246"/>
|
<project name="gaia" path="gaia" remote="mozillaorg" revision="c64d6e345aa477f2a24b676e84a47020a00d015d"/>
|
||||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
||||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||||
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
||||||
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
||||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="25554535ee69d4c0c24a51f6a55bbabe5cb0a6b8"/>
|
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="0c28789b9957913be975eb002a22323f93585d4c"/>
|
||||||
<!-- Stock Android things -->
|
<!-- Stock Android things -->
|
||||||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="f92a936f2aa97526d4593386754bdbf02db07a12"/>
|
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="f92a936f2aa97526d4593386754bdbf02db07a12"/>
|
||||||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="6e47ff2790f5656b5b074407829ceecf3e6188c4"/>
|
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="6e47ff2790f5656b5b074407829ceecf3e6188c4"/>
|
||||||
|
|
@ -128,7 +128,7 @@
|
||||||
<!-- Emulator specific things -->
|
<!-- Emulator specific things -->
|
||||||
<project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="72ffdf71c68a96309212eb13d63560d66db14c9e"/>
|
<project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="72ffdf71c68a96309212eb13d63560d66db14c9e"/>
|
||||||
<project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="8d4018ebd33ac3f1a043b2d54bc578028656a659"/>
|
<project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="8d4018ebd33ac3f1a043b2d54bc578028656a659"/>
|
||||||
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="2e752628276803d9f261c3c770cfaa8aef5a0c4f"/>
|
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="b1f6e6797468ecce33acdb780a84cd0bbb751dd9"/>
|
||||||
<project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="f37bd545063039e30a92f2550ae78c0e6e4e2d08"/>
|
<project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="f37bd545063039e30a92f2550ae78c0e6e4e2d08"/>
|
||||||
<project name="platform_external_wpa_supplicant_8" path="external/wpa_supplicant_8" remote="b2g" revision="0c6a6547cd1fd302fa2b0f6e375654df36bf0ec4"/>
|
<project name="platform_external_wpa_supplicant_8" path="external/wpa_supplicant_8" remote="b2g" revision="0c6a6547cd1fd302fa2b0f6e375654df36bf0ec4"/>
|
||||||
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="aa763fa9180a222547824ae6b6064e4851c15a86"/>
|
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="aa763fa9180a222547824ae6b6064e4851c15a86"/>
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
<project name="platform_build" path="build" remote="b2g" revision="c9d4fe680662ee44a4bdea42ae00366f5df399cf">
|
<project name="platform_build" path="build" remote="b2g" revision="c9d4fe680662ee44a4bdea42ae00366f5df399cf">
|
||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="df7683e4f7329c567deb487d11317578c6930246"/>
|
<project name="gaia" path="gaia" remote="mozillaorg" revision="c64d6e345aa477f2a24b676e84a47020a00d015d"/>
|
||||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
||||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||||
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
||||||
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
||||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="25554535ee69d4c0c24a51f6a55bbabe5cb0a6b8"/>
|
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="0c28789b9957913be975eb002a22323f93585d4c"/>
|
||||||
<!-- Stock Android things -->
|
<!-- Stock Android things -->
|
||||||
<project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="ffc05a232799fe8fcb3e47b7440b52b1fb4244c0"/>
|
<project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="ffc05a232799fe8fcb3e47b7440b52b1fb4244c0"/>
|
||||||
<project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="337e0ef5e40f02a1ae59b90db0548976c70a7226"/>
|
<project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="337e0ef5e40f02a1ae59b90db0548976c70a7226"/>
|
||||||
|
|
|
||||||
|
|
@ -19,11 +19,11 @@
|
||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="df7683e4f7329c567deb487d11317578c6930246"/>
|
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="c64d6e345aa477f2a24b676e84a47020a00d015d"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||||
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="4ace9aaee0e048dfda11bb787646c59982a3dc80"/>
|
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="4ace9aaee0e048dfda11bb787646c59982a3dc80"/>
|
||||||
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="e8c6824471c8722340249166b8884c38bd4d8a26"/>
|
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="c72c9278ddc2f442d193474993d36e7f2cfb08c4"/>
|
||||||
<project name="moztt" path="external/moztt" remote="b2g" revision="31a7849fe9a8b743d6f5e5facc212f0ef9d57499"/>
|
<project name="moztt" path="external/moztt" remote="b2g" revision="31a7849fe9a8b743d6f5e5facc212f0ef9d57499"/>
|
||||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="34ea6163f9f0e0122fb0bb03607eccdca31ced7a"/>
|
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="34ea6163f9f0e0122fb0bb03607eccdca31ced7a"/>
|
||||||
<!-- Stock Android things -->
|
<!-- Stock Android things -->
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
|
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
|
||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="df7683e4f7329c567deb487d11317578c6930246"/>
|
<project name="gaia" path="gaia" remote="mozillaorg" revision="c64d6e345aa477f2a24b676e84a47020a00d015d"/>
|
||||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||||
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
|
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||||
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
||||||
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
||||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="25554535ee69d4c0c24a51f6a55bbabe5cb0a6b8"/>
|
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="0c28789b9957913be975eb002a22323f93585d4c"/>
|
||||||
<!-- Stock Android things -->
|
<!-- Stock Android things -->
|
||||||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
|
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
|
||||||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
|
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"git": {
|
"git": {
|
||||||
"git_revision": "df7683e4f7329c567deb487d11317578c6930246",
|
"git_revision": "c64d6e345aa477f2a24b676e84a47020a00d015d",
|
||||||
"remote": "https://git.mozilla.org/releases/gaia.git",
|
"remote": "https://git.mozilla.org/releases/gaia.git",
|
||||||
"branch": ""
|
"branch": ""
|
||||||
},
|
},
|
||||||
"revision": "f228e30f97290c71151b622ae44190dd300f26b8",
|
"revision": "1c6a621575bb216f8a1266624522c5241155e2e8",
|
||||||
"repo_path": "integration/gaia-central"
|
"repo_path": "integration/gaia-central"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
|
<project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
|
||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="df7683e4f7329c567deb487d11317578c6930246"/>
|
<project name="gaia" path="gaia" remote="mozillaorg" revision="c64d6e345aa477f2a24b676e84a47020a00d015d"/>
|
||||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||||
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
|
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||||
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
||||||
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
||||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="25554535ee69d4c0c24a51f6a55bbabe5cb0a6b8"/>
|
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="0c28789b9957913be975eb002a22323f93585d4c"/>
|
||||||
<!-- Stock Android things -->
|
<!-- Stock Android things -->
|
||||||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="f92a936f2aa97526d4593386754bdbf02db07a12"/>
|
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="f92a936f2aa97526d4593386754bdbf02db07a12"/>
|
||||||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="6e47ff2790f5656b5b074407829ceecf3e6188c4"/>
|
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="6e47ff2790f5656b5b074407829ceecf3e6188c4"/>
|
||||||
|
|
|
||||||
|
|
@ -18,10 +18,10 @@
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||||
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
|
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
|
||||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="df7683e4f7329c567deb487d11317578c6930246"/>
|
<project name="gaia" path="gaia" remote="mozillaorg" revision="c64d6e345aa477f2a24b676e84a47020a00d015d"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
||||||
<project name="moztt" path="external/moztt" remote="b2g" revision="31a7849fe9a8b743d6f5e5facc212f0ef9d57499"/>
|
<project name="moztt" path="external/moztt" remote="b2g" revision="31a7849fe9a8b743d6f5e5facc212f0ef9d57499"/>
|
||||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="25554535ee69d4c0c24a51f6a55bbabe5cb0a6b8"/>
|
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="0c28789b9957913be975eb002a22323f93585d4c"/>
|
||||||
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
||||||
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
||||||
<!-- Stock Android things -->
|
<!-- Stock Android things -->
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
<project name="platform_build" path="build" remote="b2g" revision="c9d4fe680662ee44a4bdea42ae00366f5df399cf">
|
<project name="platform_build" path="build" remote="b2g" revision="c9d4fe680662ee44a4bdea42ae00366f5df399cf">
|
||||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||||
</project>
|
</project>
|
||||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="df7683e4f7329c567deb487d11317578c6930246"/>
|
<project name="gaia" path="gaia" remote="mozillaorg" revision="c64d6e345aa477f2a24b676e84a47020a00d015d"/>
|
||||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||||
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
|
<project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
|
||||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="7938df689aa87769fad3f2cf9097fb4ecb106a43"/>
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||||
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
<project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
|
||||||
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
<project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
|
||||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="25554535ee69d4c0c24a51f6a55bbabe5cb0a6b8"/>
|
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="0c28789b9957913be975eb002a22323f93585d4c"/>
|
||||||
<!-- Stock Android things -->
|
<!-- Stock Android things -->
|
||||||
<project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="ffc05a232799fe8fcb3e47b7440b52b1fb4244c0"/>
|
<project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="ffc05a232799fe8fcb3e47b7440b52b1fb4244c0"/>
|
||||||
<project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="337e0ef5e40f02a1ae59b90db0548976c70a7226"/>
|
<project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="337e0ef5e40f02a1ae59b90db0548976c70a7226"/>
|
||||||
|
|
|
||||||
|
|
@ -1104,9 +1104,6 @@ var PageInfoListener = {
|
||||||
|
|
||||||
serializeElementInfo: function(document, url, type, alt, item, isBG)
|
serializeElementInfo: function(document, url, type, alt, item, isBG)
|
||||||
{
|
{
|
||||||
// Interface for image loading content.
|
|
||||||
const nsIImageLoadingContent = Components.interfaces.nsIImageLoadingContent;
|
|
||||||
|
|
||||||
let result = {};
|
let result = {};
|
||||||
|
|
||||||
let imageText;
|
let imageText;
|
||||||
|
|
@ -1130,10 +1127,9 @@ var PageInfoListener = {
|
||||||
result.mimeType = item.type;
|
result.mimeType = item.type;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!result.mimeType && !isBG && item instanceof nsIImageLoadingContent) {
|
if (!result.mimeType && !isBG && item instanceof Ci.nsIImageLoadingContent) {
|
||||||
// Interface for image loading content.
|
// Interface for image loading content.
|
||||||
const nsIImageLoadingContent = Components.interfaces.nsIImageLoadingContent;
|
let imageRequest = item.getRequest(Ci.nsIImageLoadingContent.CURRENT_REQUEST);
|
||||||
let imageRequest = item.getRequest(nsIImageLoadingContent.CURRENT_REQUEST);
|
|
||||||
if (imageRequest) {
|
if (imageRequest) {
|
||||||
result.mimeType = imageRequest.mimeType;
|
result.mimeType = imageRequest.mimeType;
|
||||||
let image = !(imageRequest.imageStatus & imageRequest.STATUS_ERROR) && imageRequest.image;
|
let image = !(imageRequest.imageStatus & imageRequest.STATUS_ERROR) && imageRequest.image;
|
||||||
|
|
@ -1158,7 +1154,18 @@ var PageInfoListener = {
|
||||||
result.HTMLVideoElement = item instanceof content.HTMLVideoElement;
|
result.HTMLVideoElement = item instanceof content.HTMLVideoElement;
|
||||||
result.HTMLAudioElement = item instanceof content.HTMLAudioElement;
|
result.HTMLAudioElement = item instanceof content.HTMLAudioElement;
|
||||||
|
|
||||||
if (!isBG) {
|
if (isBG) {
|
||||||
|
// Items that are showing this image as a background
|
||||||
|
// image might not necessarily have a width or height,
|
||||||
|
// so we'll dynamically generate an image and send up the
|
||||||
|
// natural dimensions.
|
||||||
|
let img = content.document.createElement("img");
|
||||||
|
img.src = url;
|
||||||
|
result.naturalWidth = img.naturalWidth;
|
||||||
|
result.naturalHeight = img.naturalHeight;
|
||||||
|
} else {
|
||||||
|
// Otherwise, we can use the current width and height
|
||||||
|
// of the image.
|
||||||
result.width = item.width;
|
result.width = item.width;
|
||||||
result.height = item.height;
|
result.height = item.height;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -895,6 +895,14 @@ function makePreview(row)
|
||||||
// "width" and "height" attributes must be set to newImage,
|
// "width" and "height" attributes must be set to newImage,
|
||||||
// even if there is no "width" or "height attribute in item;
|
// even if there is no "width" or "height attribute in item;
|
||||||
// otherwise, the preview image cannot be displayed correctly.
|
// otherwise, the preview image cannot be displayed correctly.
|
||||||
|
// Since the image might have been loaded out-of-process, we expect
|
||||||
|
// the item to tell us its width / height dimensions. Failing that
|
||||||
|
// the item should tell us the natural dimensions of the image. Finally
|
||||||
|
// failing that, we'll assume that the image was never loaded in the
|
||||||
|
// other process (this can be true for favicons, for example), and so
|
||||||
|
// we'll assume that we can use the natural dimensions of the newImage
|
||||||
|
// we just created. If the natural dimensions of newImage are not known
|
||||||
|
// then the image is probably broken.
|
||||||
if (!isBG) {
|
if (!isBG) {
|
||||||
newImage.width = ("width" in item && item.width) || newImage.naturalWidth;
|
newImage.width = ("width" in item && item.width) || newImage.naturalWidth;
|
||||||
newImage.height = ("height" in item && item.height) || newImage.naturalHeight;
|
newImage.height = ("height" in item && item.height) || newImage.naturalHeight;
|
||||||
|
|
@ -902,8 +910,8 @@ function makePreview(row)
|
||||||
else {
|
else {
|
||||||
// the Width and Height of an HTML tag should not be used for its background image
|
// the Width and Height of an HTML tag should not be used for its background image
|
||||||
// (for example, "table" can have "width" or "height" attributes)
|
// (for example, "table" can have "width" or "height" attributes)
|
||||||
newImage.width = newImage.naturalWidth;
|
newImage.width = item.naturalWidth || newImage.naturalWidth;
|
||||||
newImage.height = newImage.naturalHeight;
|
newImage.height = item.naturalHeight || newImage.naturalHeight;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.SVGImageElement) {
|
if (item.SVGImageElement) {
|
||||||
|
|
|
||||||
|
|
@ -243,10 +243,12 @@
|
||||||
see bug 492960 comment 20. -->
|
see bug 492960 comment 20. -->
|
||||||
<menupopup id="customizationPanelItemContextMenu">
|
<menupopup id="customizationPanelItemContextMenu">
|
||||||
<menuitem oncommand="gCustomizeMode.addToToolbar(document.popupNode)"
|
<menuitem oncommand="gCustomizeMode.addToToolbar(document.popupNode)"
|
||||||
|
closemenu="single"
|
||||||
class="customize-context-moveToToolbar"
|
class="customize-context-moveToToolbar"
|
||||||
accesskey="&customizeMenu.moveToToolbar.accesskey;"
|
accesskey="&customizeMenu.moveToToolbar.accesskey;"
|
||||||
label="&customizeMenu.moveToToolbar.label;"/>
|
label="&customizeMenu.moveToToolbar.label;"/>
|
||||||
<menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
|
<menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
|
||||||
|
closemenu="single"
|
||||||
class="customize-context-removeFromPanel"
|
class="customize-context-removeFromPanel"
|
||||||
accesskey="&customizeMenu.removeFromMenu.accesskey;"
|
accesskey="&customizeMenu.removeFromMenu.accesskey;"
|
||||||
label="&customizeMenu.removeFromMenu.label;"/>
|
label="&customizeMenu.removeFromMenu.label;"/>
|
||||||
|
|
|
||||||
|
|
@ -178,8 +178,9 @@ PlacesTreeView.prototype = {
|
||||||
|
|
||||||
let row = -1;
|
let row = -1;
|
||||||
let useNodeIndex = typeof(aNodeIndex) == "number";
|
let useNodeIndex = typeof(aNodeIndex) == "number";
|
||||||
if (parent == this._rootNode)
|
if (parent == this._rootNode) {
|
||||||
row = useNodeIndex ? aNodeIndex : this._rootNode.getChildIndex(aNode);
|
row = useNodeIndex ? aNodeIndex : this._rootNode.getChildIndex(aNode);
|
||||||
|
}
|
||||||
else if (useNodeIndex && typeof(aParentRow) == "number") {
|
else if (useNodeIndex && typeof(aParentRow) == "number") {
|
||||||
// If we have both the row of the parent node, and the node's index, we
|
// If we have both the row of the parent node, and the node's index, we
|
||||||
// can avoid searching the rows array if the parent is a plain container.
|
// can avoid searching the rows array if the parent is a plain container.
|
||||||
|
|
@ -855,8 +856,7 @@ PlacesTreeView.prototype = {
|
||||||
.then(aLivemark => {
|
.then(aLivemark => {
|
||||||
this._controller.cacheLivemarkInfo(aNode, aLivemark);
|
this._controller.cacheLivemarkInfo(aNode, aLivemark);
|
||||||
let properties = this._cellProperties.get(aNode);
|
let properties = this._cellProperties.get(aNode);
|
||||||
this._cellProperties.set(aNode, properties += " livemark ");
|
this._cellProperties.set(aNode, properties += " livemark");
|
||||||
|
|
||||||
// The livemark attribute is set as a cell property on the title cell.
|
// The livemark attribute is set as a cell property on the title cell.
|
||||||
this._invalidateCellValue(aNode, this.COLUMN_TYPE_TITLE);
|
this._invalidateCellValue(aNode, this.COLUMN_TYPE_TITLE);
|
||||||
}, Components.utils.reportError);
|
}, Components.utils.reportError);
|
||||||
|
|
@ -1175,7 +1175,8 @@ PlacesTreeView.prototype = {
|
||||||
PlacesUtils.livemarks.getLivemark({ id: node.itemId })
|
PlacesUtils.livemarks.getLivemark({ id: node.itemId })
|
||||||
.then(aLivemark => {
|
.then(aLivemark => {
|
||||||
this._controller.cacheLivemarkInfo(node, aLivemark);
|
this._controller.cacheLivemarkInfo(node, aLivemark);
|
||||||
properties += " livemark";
|
let props = this._cellProperties.get(node);
|
||||||
|
this._cellProperties.set(node, props += " livemark");
|
||||||
// The livemark attribute is set as a cell property on the title cell.
|
// The livemark attribute is set as a cell property on the title cell.
|
||||||
this._invalidateCellValue(node, this.COLUMN_TYPE_TITLE);
|
this._invalidateCellValue(node, this.COLUMN_TYPE_TITLE);
|
||||||
}, () => undefined);
|
}, () => undefined);
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
The MIT License (MIT)
|
||||||
|
|
||||||
|
Copyright (c) 2015 Dan Abramov
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
"react-redux" uses UMD style loading to work in many different environments.
|
||||||
|
It assumes that "react" and "redux" are both included via `require("react")`
|
||||||
|
as in node or browserify, but the paths to our react and redux installation are different.
|
||||||
|
|
||||||
|
If upgrading react-redux, define the correct paths and replace the require statements
|
||||||
|
for the module.exports case with the correct paths.
|
||||||
|
|
||||||
|
Path to react: "devtools/client/shared/vendor/react"
|
||||||
|
Path to redux: "devtools/client/shared/vendor/redux"
|
||||||
|
|
@ -12,6 +12,7 @@ if CONFIG['DEBUG_JS_MODULES']:
|
||||||
]
|
]
|
||||||
|
|
||||||
modules += [
|
modules += [
|
||||||
|
'react-redux.js',
|
||||||
'react.js',
|
'react.js',
|
||||||
'redux.js',
|
'redux.js',
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,724 @@
|
||||||
|
var REACT_PATH = "devtools/client/shared/vendor/react";
|
||||||
|
var REDUX_PATH = "devtools/client/shared/vendor/redux";
|
||||||
|
|
||||||
|
(function webpackUniversalModuleDefinition(root, factory) {
|
||||||
|
if(typeof exports === 'object' && typeof module === 'object')
|
||||||
|
module.exports = factory(require(REACT_PATH), require(REDUX_PATH));
|
||||||
|
else if(typeof define === 'function' && define.amd)
|
||||||
|
define(["react", "redux"], factory);
|
||||||
|
else if(typeof exports === 'object')
|
||||||
|
exports["ReactRedux"] = factory(require("react"), require("redux"));
|
||||||
|
else
|
||||||
|
root["ReactRedux"] = factory(root["React"], root["Redux"]);
|
||||||
|
})(this, function(__WEBPACK_EXTERNAL_MODULE_10__, __WEBPACK_EXTERNAL_MODULE_11__) {
|
||||||
|
return /******/ (function(modules) { // webpackBootstrap
|
||||||
|
/******/ // The module cache
|
||||||
|
/******/ var installedModules = {};
|
||||||
|
|
||||||
|
/******/ // The require function
|
||||||
|
/******/ function __webpack_require__(moduleId) {
|
||||||
|
|
||||||
|
/******/ // Check if module is in cache
|
||||||
|
/******/ if(installedModules[moduleId])
|
||||||
|
/******/ return installedModules[moduleId].exports;
|
||||||
|
|
||||||
|
/******/ // Create a new module (and put it into the cache)
|
||||||
|
/******/ var module = installedModules[moduleId] = {
|
||||||
|
/******/ exports: {},
|
||||||
|
/******/ id: moduleId,
|
||||||
|
/******/ loaded: false
|
||||||
|
/******/ };
|
||||||
|
|
||||||
|
/******/ // Execute the module function
|
||||||
|
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
|
||||||
|
|
||||||
|
/******/ // Flag the module as loaded
|
||||||
|
/******/ module.loaded = true;
|
||||||
|
|
||||||
|
/******/ // Return the exports of the module
|
||||||
|
/******/ return module.exports;
|
||||||
|
/******/ }
|
||||||
|
|
||||||
|
|
||||||
|
/******/ // expose the modules object (__webpack_modules__)
|
||||||
|
/******/ __webpack_require__.m = modules;
|
||||||
|
|
||||||
|
/******/ // expose the module cache
|
||||||
|
/******/ __webpack_require__.c = installedModules;
|
||||||
|
|
||||||
|
/******/ // __webpack_public_path__
|
||||||
|
/******/ __webpack_require__.p = "";
|
||||||
|
|
||||||
|
/******/ // Load entry module and return exports
|
||||||
|
/******/ return __webpack_require__(0);
|
||||||
|
/******/ })
|
||||||
|
/************************************************************************/
|
||||||
|
/******/ ([
|
||||||
|
/* 0 */
|
||||||
|
/***/ function(module, exports, __webpack_require__) {
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
exports.__esModule = true;
|
||||||
|
|
||||||
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
|
||||||
|
|
||||||
|
var _react = __webpack_require__(10);
|
||||||
|
|
||||||
|
var _react2 = _interopRequireDefault(_react);
|
||||||
|
|
||||||
|
var _componentsCreateAll = __webpack_require__(2);
|
||||||
|
|
||||||
|
var _componentsCreateAll2 = _interopRequireDefault(_componentsCreateAll);
|
||||||
|
|
||||||
|
var _createAll = _componentsCreateAll2['default'](_react2['default']);
|
||||||
|
|
||||||
|
var Provider = _createAll.Provider;
|
||||||
|
var connect = _createAll.connect;
|
||||||
|
exports.Provider = Provider;
|
||||||
|
exports.connect = connect;
|
||||||
|
|
||||||
|
/***/ },
|
||||||
|
/* 1 */
|
||||||
|
/***/ function(module, exports) {
|
||||||
|
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
exports.__esModule = true;
|
||||||
|
exports["default"] = createStoreShape;
|
||||||
|
|
||||||
|
function createStoreShape(PropTypes) {
|
||||||
|
return PropTypes.shape({
|
||||||
|
subscribe: PropTypes.func.isRequired,
|
||||||
|
dispatch: PropTypes.func.isRequired,
|
||||||
|
getState: PropTypes.func.isRequired
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = exports["default"];
|
||||||
|
|
||||||
|
/***/ },
|
||||||
|
/* 2 */
|
||||||
|
/***/ function(module, exports, __webpack_require__) {
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
exports.__esModule = true;
|
||||||
|
exports['default'] = createAll;
|
||||||
|
|
||||||
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
|
||||||
|
|
||||||
|
var _createProvider = __webpack_require__(4);
|
||||||
|
|
||||||
|
var _createProvider2 = _interopRequireDefault(_createProvider);
|
||||||
|
|
||||||
|
var _createConnect = __webpack_require__(3);
|
||||||
|
|
||||||
|
var _createConnect2 = _interopRequireDefault(_createConnect);
|
||||||
|
|
||||||
|
function createAll(React) {
|
||||||
|
var Provider = _createProvider2['default'](React);
|
||||||
|
var connect = _createConnect2['default'](React);
|
||||||
|
|
||||||
|
return { Provider: Provider, connect: connect };
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = exports['default'];
|
||||||
|
|
||||||
|
/***/ },
|
||||||
|
/* 3 */
|
||||||
|
/***/ function(module, exports, __webpack_require__) {
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
exports.__esModule = true;
|
||||||
|
|
||||||
|
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
|
||||||
|
|
||||||
|
exports['default'] = createConnect;
|
||||||
|
|
||||||
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
|
||||||
|
|
||||||
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
|
||||||
|
|
||||||
|
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
|
||||||
|
|
||||||
|
var _utilsCreateStoreShape = __webpack_require__(1);
|
||||||
|
|
||||||
|
var _utilsCreateStoreShape2 = _interopRequireDefault(_utilsCreateStoreShape);
|
||||||
|
|
||||||
|
var _utilsShallowEqual = __webpack_require__(6);
|
||||||
|
|
||||||
|
var _utilsShallowEqual2 = _interopRequireDefault(_utilsShallowEqual);
|
||||||
|
|
||||||
|
var _utilsIsPlainObject = __webpack_require__(5);
|
||||||
|
|
||||||
|
var _utilsIsPlainObject2 = _interopRequireDefault(_utilsIsPlainObject);
|
||||||
|
|
||||||
|
var _utilsWrapActionCreators = __webpack_require__(7);
|
||||||
|
|
||||||
|
var _utilsWrapActionCreators2 = _interopRequireDefault(_utilsWrapActionCreators);
|
||||||
|
|
||||||
|
var _hoistNonReactStatics = __webpack_require__(8);
|
||||||
|
|
||||||
|
var _hoistNonReactStatics2 = _interopRequireDefault(_hoistNonReactStatics);
|
||||||
|
|
||||||
|
var _invariant = __webpack_require__(9);
|
||||||
|
|
||||||
|
var _invariant2 = _interopRequireDefault(_invariant);
|
||||||
|
|
||||||
|
var defaultMapStateToProps = function defaultMapStateToProps() {
|
||||||
|
return {};
|
||||||
|
};
|
||||||
|
var defaultMapDispatchToProps = function defaultMapDispatchToProps(dispatch) {
|
||||||
|
return { dispatch: dispatch };
|
||||||
|
};
|
||||||
|
var defaultMergeProps = function defaultMergeProps(stateProps, dispatchProps, parentProps) {
|
||||||
|
return _extends({}, parentProps, stateProps, dispatchProps);
|
||||||
|
};
|
||||||
|
|
||||||
|
function getDisplayName(Component) {
|
||||||
|
return Component.displayName || Component.name || 'Component';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Helps track hot reloading.
|
||||||
|
var nextVersion = 0;
|
||||||
|
|
||||||
|
function createConnect(React) {
|
||||||
|
var Component = React.Component;
|
||||||
|
var PropTypes = React.PropTypes;
|
||||||
|
|
||||||
|
var storeShape = _utilsCreateStoreShape2['default'](PropTypes);
|
||||||
|
|
||||||
|
return function connect(mapStateToProps, mapDispatchToProps, mergeProps) {
|
||||||
|
var options = arguments.length <= 3 || arguments[3] === undefined ? {} : arguments[3];
|
||||||
|
|
||||||
|
var shouldSubscribe = Boolean(mapStateToProps);
|
||||||
|
var finalMapStateToProps = mapStateToProps || defaultMapStateToProps;
|
||||||
|
var finalMapDispatchToProps = _utilsIsPlainObject2['default'](mapDispatchToProps) ? _utilsWrapActionCreators2['default'](mapDispatchToProps) : mapDispatchToProps || defaultMapDispatchToProps;
|
||||||
|
var finalMergeProps = mergeProps || defaultMergeProps;
|
||||||
|
var shouldUpdateStateProps = finalMapStateToProps.length > 1;
|
||||||
|
var shouldUpdateDispatchProps = finalMapDispatchToProps.length > 1;
|
||||||
|
var _options$pure = options.pure;
|
||||||
|
var pure = _options$pure === undefined ? true : _options$pure;
|
||||||
|
|
||||||
|
// Helps track hot reloading.
|
||||||
|
var version = nextVersion++;
|
||||||
|
|
||||||
|
function computeStateProps(store, props) {
|
||||||
|
var state = store.getState();
|
||||||
|
var stateProps = shouldUpdateStateProps ? finalMapStateToProps(state, props) : finalMapStateToProps(state);
|
||||||
|
|
||||||
|
_invariant2['default'](_utilsIsPlainObject2['default'](stateProps), '`mapStateToProps` must return an object. Instead received %s.', stateProps);
|
||||||
|
return stateProps;
|
||||||
|
}
|
||||||
|
|
||||||
|
function computeDispatchProps(store, props) {
|
||||||
|
var dispatch = store.dispatch;
|
||||||
|
|
||||||
|
var dispatchProps = shouldUpdateDispatchProps ? finalMapDispatchToProps(dispatch, props) : finalMapDispatchToProps(dispatch);
|
||||||
|
|
||||||
|
_invariant2['default'](_utilsIsPlainObject2['default'](dispatchProps), '`mapDispatchToProps` must return an object. Instead received %s.', dispatchProps);
|
||||||
|
return dispatchProps;
|
||||||
|
}
|
||||||
|
|
||||||
|
function _computeNextState(stateProps, dispatchProps, parentProps) {
|
||||||
|
var mergedProps = finalMergeProps(stateProps, dispatchProps, parentProps);
|
||||||
|
_invariant2['default'](_utilsIsPlainObject2['default'](mergedProps), '`mergeProps` must return an object. Instead received %s.', mergedProps);
|
||||||
|
return mergedProps;
|
||||||
|
}
|
||||||
|
|
||||||
|
return function wrapWithConnect(WrappedComponent) {
|
||||||
|
var Connect = (function (_Component) {
|
||||||
|
_inherits(Connect, _Component);
|
||||||
|
|
||||||
|
Connect.prototype.shouldComponentUpdate = function shouldComponentUpdate(nextProps, nextState) {
|
||||||
|
if (!pure) {
|
||||||
|
this.updateStateProps(nextProps);
|
||||||
|
this.updateDispatchProps(nextProps);
|
||||||
|
this.updateState(nextProps);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
var storeChanged = nextState.storeState !== this.state.storeState;
|
||||||
|
var propsChanged = !_utilsShallowEqual2['default'](nextProps, this.props);
|
||||||
|
var mapStateProducedChange = false;
|
||||||
|
var dispatchPropsChanged = false;
|
||||||
|
|
||||||
|
if (storeChanged || propsChanged && shouldUpdateStateProps) {
|
||||||
|
mapStateProducedChange = this.updateStateProps(nextProps);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (propsChanged && shouldUpdateDispatchProps) {
|
||||||
|
dispatchPropsChanged = this.updateDispatchProps(nextProps);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (propsChanged || mapStateProducedChange || dispatchPropsChanged) {
|
||||||
|
this.updateState(nextProps);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
|
||||||
|
function Connect(props, context) {
|
||||||
|
_classCallCheck(this, Connect);
|
||||||
|
|
||||||
|
_Component.call(this, props, context);
|
||||||
|
this.version = version;
|
||||||
|
this.store = props.store || context.store;
|
||||||
|
|
||||||
|
_invariant2['default'](this.store, 'Could not find "store" in either the context or ' + ('props of "' + this.constructor.displayName + '". ') + 'Either wrap the root component in a <Provider>, ' + ('or explicitly pass "store" as a prop to "' + this.constructor.displayName + '".'));
|
||||||
|
|
||||||
|
this.stateProps = computeStateProps(this.store, props);
|
||||||
|
this.dispatchProps = computeDispatchProps(this.store, props);
|
||||||
|
this.state = { storeState: null };
|
||||||
|
this.updateState();
|
||||||
|
}
|
||||||
|
|
||||||
|
Connect.prototype.computeNextState = function computeNextState() {
|
||||||
|
var props = arguments.length <= 0 || arguments[0] === undefined ? this.props : arguments[0];
|
||||||
|
|
||||||
|
return _computeNextState(this.stateProps, this.dispatchProps, props);
|
||||||
|
};
|
||||||
|
|
||||||
|
Connect.prototype.updateStateProps = function updateStateProps() {
|
||||||
|
var props = arguments.length <= 0 || arguments[0] === undefined ? this.props : arguments[0];
|
||||||
|
|
||||||
|
var nextStateProps = computeStateProps(this.store, props);
|
||||||
|
if (_utilsShallowEqual2['default'](nextStateProps, this.stateProps)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.stateProps = nextStateProps;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
Connect.prototype.updateDispatchProps = function updateDispatchProps() {
|
||||||
|
var props = arguments.length <= 0 || arguments[0] === undefined ? this.props : arguments[0];
|
||||||
|
|
||||||
|
var nextDispatchProps = computeDispatchProps(this.store, props);
|
||||||
|
if (_utilsShallowEqual2['default'](nextDispatchProps, this.dispatchProps)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.dispatchProps = nextDispatchProps;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
Connect.prototype.updateState = function updateState() {
|
||||||
|
var props = arguments.length <= 0 || arguments[0] === undefined ? this.props : arguments[0];
|
||||||
|
|
||||||
|
this.nextState = this.computeNextState(props);
|
||||||
|
};
|
||||||
|
|
||||||
|
Connect.prototype.isSubscribed = function isSubscribed() {
|
||||||
|
return typeof this.unsubscribe === 'function';
|
||||||
|
};
|
||||||
|
|
||||||
|
Connect.prototype.trySubscribe = function trySubscribe() {
|
||||||
|
if (shouldSubscribe && !this.unsubscribe) {
|
||||||
|
this.unsubscribe = this.store.subscribe(this.handleChange.bind(this));
|
||||||
|
this.handleChange();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
Connect.prototype.tryUnsubscribe = function tryUnsubscribe() {
|
||||||
|
if (this.unsubscribe) {
|
||||||
|
this.unsubscribe();
|
||||||
|
this.unsubscribe = null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
Connect.prototype.componentDidMount = function componentDidMount() {
|
||||||
|
this.trySubscribe();
|
||||||
|
};
|
||||||
|
|
||||||
|
Connect.prototype.componentWillUnmount = function componentWillUnmount() {
|
||||||
|
this.tryUnsubscribe();
|
||||||
|
};
|
||||||
|
|
||||||
|
Connect.prototype.handleChange = function handleChange() {
|
||||||
|
if (!this.unsubscribe) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.setState({
|
||||||
|
storeState: this.store.getState()
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
Connect.prototype.getWrappedInstance = function getWrappedInstance() {
|
||||||
|
return this.refs.wrappedInstance;
|
||||||
|
};
|
||||||
|
|
||||||
|
Connect.prototype.render = function render() {
|
||||||
|
return React.createElement(WrappedComponent, _extends({ ref: 'wrappedInstance'
|
||||||
|
}, this.nextState));
|
||||||
|
};
|
||||||
|
|
||||||
|
return Connect;
|
||||||
|
})(Component);
|
||||||
|
|
||||||
|
Connect.displayName = 'Connect(' + getDisplayName(WrappedComponent) + ')';
|
||||||
|
Connect.WrappedComponent = WrappedComponent;
|
||||||
|
Connect.contextTypes = {
|
||||||
|
store: storeShape
|
||||||
|
};
|
||||||
|
Connect.propTypes = {
|
||||||
|
store: storeShape
|
||||||
|
};
|
||||||
|
|
||||||
|
if (true) {
|
||||||
|
Connect.prototype.componentWillUpdate = function componentWillUpdate() {
|
||||||
|
if (this.version === version) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// We are hot reloading!
|
||||||
|
this.version = version;
|
||||||
|
|
||||||
|
// Update the state and bindings.
|
||||||
|
this.trySubscribe();
|
||||||
|
this.updateStateProps();
|
||||||
|
this.updateDispatchProps();
|
||||||
|
this.updateState();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return _hoistNonReactStatics2['default'](Connect, WrappedComponent);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = exports['default'];
|
||||||
|
|
||||||
|
/***/ },
|
||||||
|
/* 4 */
|
||||||
|
/***/ function(module, exports, __webpack_require__) {
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
exports.__esModule = true;
|
||||||
|
exports['default'] = createProvider;
|
||||||
|
|
||||||
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
|
||||||
|
|
||||||
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
|
||||||
|
|
||||||
|
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
|
||||||
|
|
||||||
|
var _utilsCreateStoreShape = __webpack_require__(1);
|
||||||
|
|
||||||
|
var _utilsCreateStoreShape2 = _interopRequireDefault(_utilsCreateStoreShape);
|
||||||
|
|
||||||
|
function isUsingOwnerContext(React) {
|
||||||
|
var version = React.version;
|
||||||
|
|
||||||
|
if (typeof version !== 'string') {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
var sections = version.split('.');
|
||||||
|
var major = parseInt(sections[0], 10);
|
||||||
|
var minor = parseInt(sections[1], 10);
|
||||||
|
|
||||||
|
return major === 0 && minor === 13;
|
||||||
|
}
|
||||||
|
|
||||||
|
function createProvider(React) {
|
||||||
|
var Component = React.Component;
|
||||||
|
var PropTypes = React.PropTypes;
|
||||||
|
var Children = React.Children;
|
||||||
|
|
||||||
|
var storeShape = _utilsCreateStoreShape2['default'](PropTypes);
|
||||||
|
var requireFunctionChild = isUsingOwnerContext(React);
|
||||||
|
|
||||||
|
var didWarnAboutChild = false;
|
||||||
|
function warnAboutFunctionChild() {
|
||||||
|
if (didWarnAboutChild || requireFunctionChild) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
didWarnAboutChild = true;
|
||||||
|
console.error( // eslint-disable-line no-console
|
||||||
|
'With React 0.14 and later versions, you no longer need to ' + 'wrap <Provider> child into a function.');
|
||||||
|
}
|
||||||
|
function warnAboutElementChild() {
|
||||||
|
if (didWarnAboutChild || !requireFunctionChild) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
didWarnAboutChild = true;
|
||||||
|
console.error( // eslint-disable-line no-console
|
||||||
|
'With React 0.13, you need to ' + 'wrap <Provider> child into a function. ' + 'This restriction will be removed with React 0.14.');
|
||||||
|
}
|
||||||
|
|
||||||
|
var didWarnAboutReceivingStore = false;
|
||||||
|
function warnAboutReceivingStore() {
|
||||||
|
if (didWarnAboutReceivingStore) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
didWarnAboutReceivingStore = true;
|
||||||
|
console.error( // eslint-disable-line no-console
|
||||||
|
'<Provider> does not support changing `store` on the fly. ' + 'It is most likely that you see this error because you updated to ' + 'Redux 2.x and React Redux 2.x which no longer hot reload reducers ' + 'automatically. See https://github.com/rackt/react-redux/releases/' + 'tag/v2.0.0 for the migration instructions.');
|
||||||
|
}
|
||||||
|
|
||||||
|
var Provider = (function (_Component) {
|
||||||
|
_inherits(Provider, _Component);
|
||||||
|
|
||||||
|
Provider.prototype.getChildContext = function getChildContext() {
|
||||||
|
return { store: this.store };
|
||||||
|
};
|
||||||
|
|
||||||
|
function Provider(props, context) {
|
||||||
|
_classCallCheck(this, Provider);
|
||||||
|
|
||||||
|
_Component.call(this, props, context);
|
||||||
|
this.store = props.store;
|
||||||
|
}
|
||||||
|
|
||||||
|
Provider.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
|
||||||
|
var store = this.store;
|
||||||
|
var nextStore = nextProps.store;
|
||||||
|
|
||||||
|
if (store !== nextStore) {
|
||||||
|
warnAboutReceivingStore();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
Provider.prototype.render = function render() {
|
||||||
|
var children = this.props.children;
|
||||||
|
|
||||||
|
if (typeof children === 'function') {
|
||||||
|
warnAboutFunctionChild();
|
||||||
|
children = children();
|
||||||
|
} else {
|
||||||
|
warnAboutElementChild();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Children.only(children);
|
||||||
|
};
|
||||||
|
|
||||||
|
return Provider;
|
||||||
|
})(Component);
|
||||||
|
|
||||||
|
Provider.childContextTypes = {
|
||||||
|
store: storeShape.isRequired
|
||||||
|
};
|
||||||
|
Provider.propTypes = {
|
||||||
|
store: storeShape.isRequired,
|
||||||
|
children: (requireFunctionChild ? PropTypes.func : PropTypes.element).isRequired
|
||||||
|
};
|
||||||
|
|
||||||
|
return Provider;
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = exports['default'];
|
||||||
|
|
||||||
|
/***/ },
|
||||||
|
/* 5 */
|
||||||
|
/***/ function(module, exports) {
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
exports.__esModule = true;
|
||||||
|
exports['default'] = isPlainObject;
|
||||||
|
var fnToString = function fnToString(fn) {
|
||||||
|
return Function.prototype.toString.call(fn);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {any} obj The object to inspect.
|
||||||
|
* @returns {boolean} True if the argument appears to be a plain object.
|
||||||
|
*/
|
||||||
|
|
||||||
|
function isPlainObject(obj) {
|
||||||
|
if (!obj || typeof obj !== 'object') {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var proto = typeof obj.constructor === 'function' ? Object.getPrototypeOf(obj) : Object.prototype;
|
||||||
|
|
||||||
|
if (proto === null) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
var constructor = proto.constructor;
|
||||||
|
|
||||||
|
return typeof constructor === 'function' && constructor instanceof constructor && fnToString(constructor) === fnToString(Object);
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = exports['default'];
|
||||||
|
|
||||||
|
/***/ },
|
||||||
|
/* 6 */
|
||||||
|
/***/ function(module, exports) {
|
||||||
|
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
exports.__esModule = true;
|
||||||
|
exports["default"] = shallowEqual;
|
||||||
|
|
||||||
|
function shallowEqual(objA, objB) {
|
||||||
|
if (objA === objB) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
var keysA = Object.keys(objA);
|
||||||
|
var keysB = Object.keys(objB);
|
||||||
|
|
||||||
|
if (keysA.length !== keysB.length) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test for A's keys different from B.
|
||||||
|
var hasOwn = Object.prototype.hasOwnProperty;
|
||||||
|
for (var i = 0; i < keysA.length; i++) {
|
||||||
|
if (!hasOwn.call(objB, keysA[i]) || objA[keysA[i]] !== objB[keysA[i]]) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = exports["default"];
|
||||||
|
|
||||||
|
/***/ },
|
||||||
|
/* 7 */
|
||||||
|
/***/ function(module, exports, __webpack_require__) {
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
exports.__esModule = true;
|
||||||
|
exports['default'] = wrapActionCreators;
|
||||||
|
|
||||||
|
var _redux = __webpack_require__(11);
|
||||||
|
|
||||||
|
function wrapActionCreators(actionCreators) {
|
||||||
|
return function (dispatch) {
|
||||||
|
return _redux.bindActionCreators(actionCreators, dispatch);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = exports['default'];
|
||||||
|
|
||||||
|
/***/ },
|
||||||
|
/* 8 */
|
||||||
|
/***/ function(module, exports) {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copyright 2015, Yahoo! Inc.
|
||||||
|
* Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
|
||||||
|
*/
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
var REACT_STATICS = {
|
||||||
|
childContextTypes: true,
|
||||||
|
contextTypes: true,
|
||||||
|
defaultProps: true,
|
||||||
|
displayName: true,
|
||||||
|
getDefaultProps: true,
|
||||||
|
mixins: true,
|
||||||
|
propTypes: true,
|
||||||
|
type: true
|
||||||
|
};
|
||||||
|
|
||||||
|
var KNOWN_STATICS = {
|
||||||
|
name: true,
|
||||||
|
length: true,
|
||||||
|
prototype: true,
|
||||||
|
caller: true,
|
||||||
|
arguments: true,
|
||||||
|
arity: true
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = function hoistNonReactStatics(targetComponent, sourceComponent) {
|
||||||
|
var keys = Object.getOwnPropertyNames(sourceComponent);
|
||||||
|
for (var i=0; i<keys.length; ++i) {
|
||||||
|
if (!REACT_STATICS[keys[i]] && !KNOWN_STATICS[keys[i]]) {
|
||||||
|
targetComponent[keys[i]] = sourceComponent[keys[i]];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return targetComponent;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/***/ },
|
||||||
|
/* 9 */
|
||||||
|
/***/ function(module, exports, __webpack_require__) {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copyright 2013-2015, Facebook, Inc.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the BSD-style license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree. An additional grant
|
||||||
|
* of patent rights can be found in the PATENTS file in the same directory.
|
||||||
|
*
|
||||||
|
* @providesModule invariant
|
||||||
|
*/
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Use invariant() to assert state which your program assumes to be true.
|
||||||
|
*
|
||||||
|
* Provide sprintf-style format (only %s is supported) and arguments
|
||||||
|
* to provide information about what broke and what you were
|
||||||
|
* expecting.
|
||||||
|
*
|
||||||
|
* The invariant message will be stripped in production, but the invariant
|
||||||
|
* will remain to ensure logic does not differ in production.
|
||||||
|
*/
|
||||||
|
|
||||||
|
var invariant = function(condition, format, a, b, c, d, e, f) {
|
||||||
|
if (true) {
|
||||||
|
if (format === undefined) {
|
||||||
|
throw new Error('invariant requires an error message argument');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!condition) {
|
||||||
|
var error;
|
||||||
|
if (format === undefined) {
|
||||||
|
error = new Error(
|
||||||
|
'Minified exception occurred; use the non-minified dev environment ' +
|
||||||
|
'for the full error message and additional helpful warnings.'
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
var args = [a, b, c, d, e, f];
|
||||||
|
var argIndex = 0;
|
||||||
|
error = new Error(
|
||||||
|
'Invariant Violation: ' +
|
||||||
|
format.replace(/%s/g, function() { return args[argIndex++]; })
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
error.framesToPop = 1; // we don't care about invariant's own frame
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = invariant;
|
||||||
|
|
||||||
|
|
||||||
|
/***/ },
|
||||||
|
/* 10 */
|
||||||
|
/***/ function(module, exports) {
|
||||||
|
|
||||||
|
module.exports = __WEBPACK_EXTERNAL_MODULE_10__;
|
||||||
|
|
||||||
|
/***/ },
|
||||||
|
/* 11 */
|
||||||
|
/***/ function(module, exports) {
|
||||||
|
|
||||||
|
module.exports = __WEBPACK_EXTERNAL_MODULE_11__;
|
||||||
|
|
||||||
|
/***/ }
|
||||||
|
/******/ ])
|
||||||
|
});
|
||||||
|
;
|
||||||
|
|
@ -19,7 +19,7 @@ function basicTest(aIcc) {
|
||||||
// The emulator's hard coded mcc and mnc codes.
|
// The emulator's hard coded mcc and mnc codes.
|
||||||
// See it here {B2G_HOME}/external/qemu/telephony/android_modem.c#L2465.
|
// See it here {B2G_HOME}/external/qemu/telephony/android_modem.c#L2465.
|
||||||
is(iccInfo.mcc, 310);
|
is(iccInfo.mcc, 310);
|
||||||
is(iccInfo.mnc, 260);
|
is(iccInfo.mnc, 410);
|
||||||
// Phone number is hardcoded in MSISDN
|
// Phone number is hardcoded in MSISDN
|
||||||
// See {B2G_HOME}/external/qemu/telephony/sim_card.c, in asimcard_io().
|
// See {B2G_HOME}/external/qemu/telephony/sim_card.c, in asimcard_io().
|
||||||
is(iccInfo.msisdn, "15555215554");
|
is(iccInfo.msisdn, "15555215554");
|
||||||
|
|
|
||||||
|
|
@ -6,16 +6,16 @@ MARIONETTE_HEAD_JS = "head.js";
|
||||||
|
|
||||||
const TEST_DATA = [
|
const TEST_DATA = [
|
||||||
// mvno type, mvno data, request success, expected result
|
// mvno type, mvno data, request success, expected result
|
||||||
// Emulator's hard coded IMSI: 310260000000000
|
// Emulator's hard coded IMSI: 310410000000000
|
||||||
["imsi", "3102600", true, true ],
|
["imsi", "3104100", true, true ],
|
||||||
// x and X means skip the comparison.
|
// x and X means skip the comparison.
|
||||||
["imsi", "31026xx0", true, true ],
|
["imsi", "31041xx0", true, true ],
|
||||||
["imsi", "310260x0x", true, true ],
|
["imsi", "310410x0x", true, true ],
|
||||||
["imsi", "310260X00", true, true ],
|
["imsi", "310410X00", true, true ],
|
||||||
["imsi", "310260XX1", true, false ],
|
["imsi", "310410XX1", true, false ],
|
||||||
["imsi", "31026012", true, false ],
|
["imsi", "31041012", true, false ],
|
||||||
["imsi", "310260000000000", true, true ],
|
["imsi", "310410000000000", true, true ],
|
||||||
["imsi", "310260000000000123", true, false ],
|
["imsi", "310410000000000123", true, false ],
|
||||||
["imsi", "", false, "InvalidParameter"],
|
["imsi", "", false, "InvalidParameter"],
|
||||||
// Emulator's hard coded SPN: Android
|
// Emulator's hard coded SPN: Android
|
||||||
["spn", "Android", true, true ],
|
["spn", "Android", true, true ],
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ MARIONETTE_HEAD_JS = "head.js";
|
||||||
// Start tests
|
// Start tests
|
||||||
startTestCommon(function() {
|
startTestCommon(function() {
|
||||||
// The emulator's hard coded operatoer's mcc and mnc codes.
|
// The emulator's hard coded operatoer's mcc and mnc codes.
|
||||||
is(mobileConnection.lastKnownNetwork, "310-260");
|
is(mobileConnection.lastKnownNetwork, "310-410");
|
||||||
// The emulator's hard coded icc's mcc, mnc codes and spn.
|
// The emulator's hard coded icc's mcc, mnc codes and spn.
|
||||||
is(mobileConnection.lastKnownHomeNetwork, "310-260-Android");
|
is(mobileConnection.lastKnownHomeNetwork, "310-410-Android");
|
||||||
}, ["mobilenetwork"]);
|
}, ["mobilenetwork"]);
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ function isHomeNetwork(network) {
|
||||||
is(network.longName, "Android");
|
is(network.longName, "Android");
|
||||||
is(network.shortName, "Android");
|
is(network.shortName, "Android");
|
||||||
is(network.mcc, "310");
|
is(network.mcc, "310");
|
||||||
is(network.mnc, "260");
|
is(network.mnc, "410");
|
||||||
}
|
}
|
||||||
|
|
||||||
function isRoamingNetwork(network) {
|
function isRoamingNetwork(network) {
|
||||||
|
|
@ -42,7 +42,7 @@ function testGetNetworks() {
|
||||||
return getNetworks()
|
return getNetworks()
|
||||||
.then(function resolve(aNetworks) {
|
.then(function resolve(aNetworks) {
|
||||||
// The emulator RIL server should always return 2 networks:
|
// The emulator RIL server should always return 2 networks:
|
||||||
// {"longName":"Android","shortName":"Android","mcc":310,"mnc":260,"state":"available"}
|
// {"longName":"Android","shortName":"Android","mcc":310,"mnc":410,"state":"available"}
|
||||||
// {"longName":"TelKila","shortName":"TelKila","mcc":310,"mnc":295,"state":"available"}
|
// {"longName":"TelKila","shortName":"TelKila","mcc":310,"mnc":295,"state":"available"}
|
||||||
is(aNetworks.length, 2);
|
is(aNetworks.length, 2);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ function check(aLongName, aShortName) {
|
||||||
is(network.longName, aLongName, "network.longName");
|
is(network.longName, aLongName, "network.longName");
|
||||||
is(network.shortName, aShortName, "network.shortName");
|
is(network.shortName, aShortName, "network.shortName");
|
||||||
is(network.mcc, "310", "network.mcc");
|
is(network.mcc, "310", "network.mcc");
|
||||||
is(network.mnc, "260", "network.mnc");
|
is(network.mnc, "410", "network.mnc");
|
||||||
}
|
}
|
||||||
|
|
||||||
function test(aLongName, aShortName) {
|
function test(aLongName, aShortName) {
|
||||||
|
|
|
||||||
|
|
@ -948,9 +948,20 @@ NetworkStatsDB.prototype = {
|
||||||
let request = aStore.openCursor(range).onsuccess = function(event) {
|
let request = aStore.openCursor(range).onsuccess = function(event) {
|
||||||
var cursor = event.target.result;
|
var cursor = event.target.result;
|
||||||
if (cursor){
|
if (cursor){
|
||||||
data.push({ rxBytes: cursor.value.rxBytes,
|
// We use rxTotalBytes/txTotalBytes instead of rxBytes/txBytes for
|
||||||
txBytes: cursor.value.txBytes,
|
// the first (oldest) sample. The rx/txTotalBytes fields record
|
||||||
date: new Date(cursor.value.timestamp + offset) });
|
// accumulative usage amount, which means even if old samples were
|
||||||
|
// expired and removed from the Database, we can still obtain the
|
||||||
|
// correct network usage.
|
||||||
|
if (data.length == 0) {
|
||||||
|
data.push({ rxBytes: cursor.value.rxTotalBytes,
|
||||||
|
txBytes: cursor.value.txTotalBytes,
|
||||||
|
date: new Date(cursor.value.timestamp + offset) });
|
||||||
|
} else {
|
||||||
|
data.push({ rxBytes: cursor.value.rxBytes,
|
||||||
|
txBytes: cursor.value.txBytes,
|
||||||
|
date: new Date(cursor.value.timestamp + offset) });
|
||||||
|
}
|
||||||
cursor.continue();
|
cursor.continue();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -981,9 +992,20 @@ NetworkStatsDB.prototype = {
|
||||||
foundData.rxBytes += cursor.value.rxBytes;
|
foundData.rxBytes += cursor.value.rxBytes;
|
||||||
foundData.txBytes += cursor.value.txBytes;
|
foundData.txBytes += cursor.value.txBytes;
|
||||||
} else {
|
} else {
|
||||||
data.push({ rxBytes: cursor.value.rxBytes,
|
// We use rxTotalBytes/txTotalBytes instead of rxBytes/txBytes
|
||||||
txBytes: cursor.value.txBytes,
|
// for the first (oldest) sample. The rx/txTotalBytes fields
|
||||||
date: new Date(cursor.value.timestamp + offset) });
|
// record accumulative usage amount, which means even if old
|
||||||
|
// samples were expired and removed from the Database, we can
|
||||||
|
// still obtain the correct network usage.
|
||||||
|
if (data.length == 0) {
|
||||||
|
data.push({ rxBytes: cursor.value.rxTotalBytes,
|
||||||
|
txBytes: cursor.value.txTotalBytes,
|
||||||
|
date: new Date(cursor.value.timestamp + offset) });
|
||||||
|
} else {
|
||||||
|
data.push({ rxBytes: cursor.value.rxBytes,
|
||||||
|
txBytes: cursor.value.txBytes,
|
||||||
|
date: new Date(cursor.value.timestamp + offset) });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cursor.continue();
|
cursor.continue();
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -797,22 +797,26 @@ add_test(function test_findBrowsingTrafficStats() {
|
||||||
stats.push({ appId: 1008, isInBrowser: 0,
|
stats.push({ appId: 1008, isInBrowser: 0,
|
||||||
serviceType: serviceType, network: networkMobile,
|
serviceType: serviceType, network: networkMobile,
|
||||||
timestamp: saveDate + (sampleRate * i),
|
timestamp: saveDate + (sampleRate * i),
|
||||||
rxBytes: 200, txBytes: 100});
|
rxBytes: 200, txBytes: 100,
|
||||||
|
rxTotalBytes: 200, txTotalBytes: 100});
|
||||||
// Browser of system app.
|
// Browser of system app.
|
||||||
stats.push({ appId: 1008, isInBrowser: 1,
|
stats.push({ appId: 1008, isInBrowser: 1,
|
||||||
serviceType: serviceType, network: networkMobile,
|
serviceType: serviceType, network: networkMobile,
|
||||||
timestamp: saveDate + (sampleRate * i),
|
timestamp: saveDate + (sampleRate * i),
|
||||||
rxBytes: 1000, txBytes: 500});
|
rxBytes: 1000, txBytes: 500,
|
||||||
|
rxTotalBytes: 1000, txTotalBytes: 500});
|
||||||
// Another app.
|
// Another app.
|
||||||
stats.push({ appId: 1021, isInBrowser: 0,
|
stats.push({ appId: 1021, isInBrowser: 0,
|
||||||
serviceType: serviceType, network: networkMobile,
|
serviceType: serviceType, network: networkMobile,
|
||||||
timestamp: saveDate + (sampleRate * i),
|
timestamp: saveDate + (sampleRate * i),
|
||||||
rxBytes: 300, txBytes: 150});
|
rxBytes: 300, txBytes: 150,
|
||||||
|
rxTotalBytes: 300, txTotalBytes: 150});
|
||||||
// Browser of another app.
|
// Browser of another app.
|
||||||
stats.push({ appId: 1021, isInBrowser: 1,
|
stats.push({ appId: 1021, isInBrowser: 1,
|
||||||
serviceType: serviceType, network: networkMobile,
|
serviceType: serviceType, network: networkMobile,
|
||||||
timestamp: saveDate + (sampleRate * i),
|
timestamp: saveDate + (sampleRate * i),
|
||||||
rxBytes: 600, txBytes: 300});
|
rxBytes: 600, txBytes: 300,
|
||||||
|
rxTotalBytes: 600, txTotalBytes: 300});
|
||||||
}
|
}
|
||||||
|
|
||||||
prepareFind(stats, function(error, result) {
|
prepareFind(stats, function(error, result) {
|
||||||
|
|
@ -853,22 +857,26 @@ add_test(function test_findAppTrafficStats() {
|
||||||
stats.push({ appId: 1008, isInBrowser: 0,
|
stats.push({ appId: 1008, isInBrowser: 0,
|
||||||
serviceType: serviceType, network: networkMobile,
|
serviceType: serviceType, network: networkMobile,
|
||||||
timestamp: saveDate + (sampleRate * i),
|
timestamp: saveDate + (sampleRate * i),
|
||||||
rxBytes: 200, txBytes: 100});
|
rxBytes: 200, txBytes: 100,
|
||||||
|
rxTotalBytes: 200, txTotalBytes: 100});
|
||||||
// Browser of system app.
|
// Browser of system app.
|
||||||
stats.push({ appId: 1008, isInBrowser: 1,
|
stats.push({ appId: 1008, isInBrowser: 1,
|
||||||
serviceType: serviceType, network: networkMobile,
|
serviceType: serviceType, network: networkMobile,
|
||||||
timestamp: saveDate + (sampleRate * i),
|
timestamp: saveDate + (sampleRate * i),
|
||||||
rxBytes: 1000, txBytes: 500});
|
rxBytes: 1000, txBytes: 500,
|
||||||
|
rxTotalBytes: 1000, txTotalBytes: 500});
|
||||||
// Another app.
|
// Another app.
|
||||||
stats.push({ appId: 1021, isInBrowser: 0,
|
stats.push({ appId: 1021, isInBrowser: 0,
|
||||||
serviceType: serviceType, network: networkMobile,
|
serviceType: serviceType, network: networkMobile,
|
||||||
timestamp: saveDate + (sampleRate * i),
|
timestamp: saveDate + (sampleRate * i),
|
||||||
rxBytes: 300, txBytes: 150});
|
rxBytes: 300, txBytes: 150,
|
||||||
|
rxTotalBytes: 300, txTotalBytes: 150});
|
||||||
// Browser of another app.
|
// Browser of another app.
|
||||||
stats.push({ appId: 1021, isInBrowser: 1,
|
stats.push({ appId: 1021, isInBrowser: 1,
|
||||||
serviceType: serviceType, network: networkMobile,
|
serviceType: serviceType, network: networkMobile,
|
||||||
timestamp: saveDate + (sampleRate * i),
|
timestamp: saveDate + (sampleRate * i),
|
||||||
rxBytes: 600, txBytes: 300});
|
rxBytes: 600, txBytes: 300,
|
||||||
|
rxTotalBytes: 600, txTotalBytes: 300});
|
||||||
}
|
}
|
||||||
|
|
||||||
prepareFind(stats, function(error, result) {
|
prepareFind(stats, function(error, result) {
|
||||||
|
|
|
||||||
|
|
@ -581,11 +581,11 @@ this.PlacesUtils = {
|
||||||
if (PlacesUtils.nodeIsFolder(node) &&
|
if (PlacesUtils.nodeIsFolder(node) &&
|
||||||
node.type != Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT &&
|
node.type != Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT &&
|
||||||
asQuery(node).queryOptions.excludeItems) {
|
asQuery(node).queryOptions.excludeItems) {
|
||||||
let node = PlacesUtils.getFolderContents(node.itemId, false, true).root;
|
let folderRoot = PlacesUtils.getFolderContents(node.itemId, false, true).root;
|
||||||
try {
|
try {
|
||||||
return gatherDataFunc(node);
|
return gatherDataFunc(folderRoot);
|
||||||
} finally {
|
} finally {
|
||||||
node.containerOpen = false;
|
folderRoot.containerOpen = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// If we didn't create our own query, do not alter the node's state.
|
// If we didn't create our own query, do not alter the node's state.
|
||||||
|
|
|
||||||
|
|
@ -127,6 +127,7 @@
|
||||||
<li><a href="about:license#qcms">qcms License</a></li>
|
<li><a href="about:license#qcms">qcms License</a></li>
|
||||||
<li><a href="about:license#qrcode-generator">QR Code Generator License</a></li>
|
<li><a href="about:license#qrcode-generator">QR Code Generator License</a></li>
|
||||||
<li><a href="about:license#react">React License</a></li>
|
<li><a href="about:license#react">React License</a></li>
|
||||||
|
<li><a href="about:license#react-redux">React-Redux License</a></li>
|
||||||
<li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li>
|
<li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li>
|
||||||
<li><a href="about:license#redux">Redux License</a></li>
|
<li><a href="about:license#redux">Redux License</a></li>
|
||||||
<li><a href="about:license#hunspell-ru">Russian Spellchecking Dictionary License</a></li>
|
<li><a href="about:license#hunspell-ru">Russian Spellchecking Dictionary License</a></li>
|
||||||
|
|
@ -4480,6 +4481,34 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
|
|
||||||
|
<h1><a id="react-redux"></a>React-Redux License</h1>
|
||||||
|
|
||||||
|
<p>This license applies to the file
|
||||||
|
<span class="path">devtools/client/shared/vendor/react-redux.js</span>.</p>
|
||||||
|
<pre>
|
||||||
|
Copyright (c) 2015 Dan Abramov
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
</pre>
|
||||||
|
|
||||||
|
<hr>
|
||||||
|
|
||||||
<h1><a id="xdg"></a>Red Hat xdg_user_dir_lookup License</h1>
|
<h1><a id="xdg"></a>Red Hat xdg_user_dir_lookup License</h1>
|
||||||
|
|
||||||
<p>This license applies to the
|
<p>This license applies to the
|
||||||
|
|
|
||||||
|
|
@ -18,88 +18,88 @@
|
||||||
<xul:vbox flex="1">
|
<xul:vbox flex="1">
|
||||||
|
|
||||||
<xul:hbox>
|
<xul:hbox>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #FFFFFF" color="#FFFFFF"/>
|
<xul:image class="colorpickertile cp-light" color="#FFFFFF"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #FFCCCC" color="#FFCCCC"/>
|
<xul:image class="colorpickertile cp-light" color="#FFCCCC"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #FFCC99" color="#FFCC99"/>
|
<xul:image class="colorpickertile cp-light" color="#FFCC99"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #FFFF99" color="#FFFF99"/>
|
<xul:image class="colorpickertile cp-light" color="#FFFF99"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #FFFFCC" color="#FFFFCC"/>
|
<xul:image class="colorpickertile cp-light" color="#FFFFCC"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #99FF99" color="#99FF99"/>
|
<xul:image class="colorpickertile cp-light" color="#99FF99"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #99FFFF" color="#99FFFF"/>
|
<xul:image class="colorpickertile cp-light" color="#99FFFF"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #CCFFFF" color="#CCFFFF"/>
|
<xul:image class="colorpickertile cp-light" color="#CCFFFF"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #CCCCFF" color="#CCCCFF"/>
|
<xul:image class="colorpickertile cp-light" color="#CCCCFF"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #FFCCFF" color="#FFCCFF"/>
|
<xul:image class="colorpickertile cp-light" color="#FFCCFF"/>
|
||||||
</xul:hbox>
|
</xul:hbox>
|
||||||
<xul:hbox>
|
<xul:hbox>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #CCCCCC" color="#CCCCCC"/>
|
<xul:image class="colorpickertile" color="#CCCCCC"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #FF6666" color="#FF6666"/>
|
<xul:image class="colorpickertile" color="#FF6666"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #FF9966" color="#FF9966"/>
|
<xul:image class="colorpickertile" color="#FF9966"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #FFFF66" color="#FFFF66"/>
|
<xul:image class="colorpickertile cp-light" color="#FFFF66"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #FFFF33" color="#FFFF33"/>
|
<xul:image class="colorpickertile cp-light" color="#FFFF33"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #66FF99" color="#66FF99"/>
|
<xul:image class="colorpickertile cp-light" color="#66FF99"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #33FFFF" color="#33FFFF"/>
|
<xul:image class="colorpickertile cp-light" color="#33FFFF"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #66FFFF" color="#66FFFF"/>
|
<xul:image class="colorpickertile cp-light" color="#66FFFF"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #9999FF" color="#9999FF"/>
|
<xul:image class="colorpickertile" color="#9999FF"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #FF99FF" color="#FF99FF"/>
|
<xul:image class="colorpickertile" color="#FF99FF"/>
|
||||||
</xul:hbox>
|
</xul:hbox>
|
||||||
<xul:hbox>
|
<xul:hbox>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #C0C0C0" color="#C0C0C0"/>
|
<xul:image class="colorpickertile" color="#C0C0C0"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #FF0000" color="#FF0000"/>
|
<xul:image class="colorpickertile" color="#FF0000"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #FF9900" color="#FF9900"/>
|
<xul:image class="colorpickertile" color="#FF9900"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #FFCC66" color="#FFCC66"/>
|
<xul:image class="colorpickertile" color="#FFCC66"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #FFFF00" color="#FFFF00"/>
|
<xul:image class="colorpickertile cp-light" color="#FFFF00"/>
|
||||||
<xul:spacer class="colorpickertile cp-light" style="background-color: #33FF33" color="#33FF33"/>
|
<xul:image class="colorpickertile cp-light" color="#33FF33"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #66CCCC" color="#66CCCC"/>
|
<xul:image class="colorpickertile" color="#66CCCC"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #33CCFF" color="#33CCFF"/>
|
<xul:image class="colorpickertile" color="#33CCFF"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #6666CC" color="#6666CC"/>
|
<xul:image class="colorpickertile" color="#6666CC"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #CC66CC" color="#CC66CC"/>
|
<xul:image class="colorpickertile" color="#CC66CC"/>
|
||||||
</xul:hbox>
|
</xul:hbox>
|
||||||
<xul:hbox>
|
<xul:hbox>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #999999" color="#999999"/>
|
<xul:image class="colorpickertile" color="#999999"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #CC0000" color="#CC0000"/>
|
<xul:image class="colorpickertile" color="#CC0000"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #FF6600" color="#FF6600"/>
|
<xul:image class="colorpickertile" color="#FF6600"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #FFCC33" color="#FFCC33"/>
|
<xul:image class="colorpickertile" color="#FFCC33"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #FFCC00" color="#FFCC00"/>
|
<xul:image class="colorpickertile" color="#FFCC00"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #33CC00" color="#33CC00"/>
|
<xul:image class="colorpickertile" color="#33CC00"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #00CCCC" color="#00CCCC"/>
|
<xul:image class="colorpickertile" color="#00CCCC"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #3366FF" color="#3366FF"/>
|
<xul:image class="colorpickertile" color="#3366FF"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #6633FF" color="#6633FF"/>
|
<xul:image class="colorpickertile" color="#6633FF"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #CC33CC" color="#CC33CC"/>
|
<xul:image class="colorpickertile" color="#CC33CC"/>
|
||||||
</xul:hbox>
|
</xul:hbox>
|
||||||
<xul:hbox>
|
<xul:hbox>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #666666" color="#666666"/>
|
<xul:image class="colorpickertile" color="#666666"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #990000" color="#990000"/>
|
<xul:image class="colorpickertile" color="#990000"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #CC6600" color="#CC6600"/>
|
<xul:image class="colorpickertile" color="#CC6600"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #CC9933" color="#CC9933"/>
|
<xul:image class="colorpickertile" color="#CC9933"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #999900" color="#999900"/>
|
<xul:image class="colorpickertile" color="#999900"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #009900" color="#009900"/>
|
<xul:image class="colorpickertile" color="#009900"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #339999" color="#339999"/>
|
<xul:image class="colorpickertile" color="#339999"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #3333FF" color="#3333FF"/>
|
<xul:image class="colorpickertile" color="#3333FF"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #6600CC" color="#6600CC"/>
|
<xul:image class="colorpickertile" color="#6600CC"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #993399" color="#993399"/>
|
<xul:image class="colorpickertile" color="#993399"/>
|
||||||
</xul:hbox>
|
</xul:hbox>
|
||||||
<xul:hbox>
|
<xul:hbox>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #333333" color="#333333"/>
|
<xul:image class="colorpickertile" color="#333333"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #660000" color="#660000"/>
|
<xul:image class="colorpickertile" color="#660000"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #993300" color="#993300"/>
|
<xul:image class="colorpickertile" color="#993300"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #996633" color="#996633"/>
|
<xul:image class="colorpickertile" color="#996633"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #666600" color="#666600"/>
|
<xul:image class="colorpickertile" color="#666600"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #006600" color="#006600"/>
|
<xul:image class="colorpickertile" color="#006600"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #336666" color="#336666"/>
|
<xul:image class="colorpickertile" color="#336666"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #000099" color="#000099"/>
|
<xul:image class="colorpickertile" color="#000099"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #333399" color="#333399"/>
|
<xul:image class="colorpickertile" color="#333399"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #663366" color="#663366"/>
|
<xul:image class="colorpickertile" color="#663366"/>
|
||||||
</xul:hbox>
|
</xul:hbox>
|
||||||
<xul:hbox>
|
<xul:hbox>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #000000" color="#000000"/>
|
<xul:image class="colorpickertile" color="#000000"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #330000" color="#330000"/>
|
<xul:image class="colorpickertile" color="#330000"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #663300" color="#663300"/>
|
<xul:image class="colorpickertile" color="#663300"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #663333" color="#663333"/>
|
<xul:image class="colorpickertile" color="#663333"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #333300" color="#333300"/>
|
<xul:image class="colorpickertile" color="#333300"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #003300" color="#003300"/>
|
<xul:image class="colorpickertile" color="#003300"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #003333" color="#003333"/>
|
<xul:image class="colorpickertile" color="#003333"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #000066" color="#000066"/>
|
<xul:image class="colorpickertile" color="#000066"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #330099" color="#330099"/>
|
<xul:image class="colorpickertile" color="#330099"/>
|
||||||
<xul:spacer class="colorpickertile" style="background-color: #330033" color="#330033"/>
|
<xul:image class="colorpickertile" color="#330033"/>
|
||||||
</xul:hbox>
|
</xul:hbox>
|
||||||
</xul:vbox>
|
</xul:vbox>
|
||||||
<!-- Something to take tab focus
|
<!-- Something to take tab focus
|
||||||
|
|
@ -198,6 +198,17 @@
|
||||||
this.mIsPopup = false;
|
this.mIsPopup = false;
|
||||||
this.mDoOnSelect = true;
|
this.mDoOnSelect = true;
|
||||||
|
|
||||||
|
let imageEls = this.mBox.querySelectorAll("image");
|
||||||
|
// We set the background of the picker tiles here using images in
|
||||||
|
// order for the color to show up even when author colors are
|
||||||
|
// disabled or the user is using high contrast mode.
|
||||||
|
for (let el of imageEls) {
|
||||||
|
let dataURI = "data:image/svg+xml,<svg style='background-color: " +
|
||||||
|
encodeURIComponent(el.getAttribute("color")) +
|
||||||
|
"' xmlns='http://www.w3.org/2000/svg' />";
|
||||||
|
el.setAttribute("src", dataURI);
|
||||||
|
}
|
||||||
|
|
||||||
this.hoverCell(this.mBox.childNodes[0].childNodes[0]);
|
this.hoverCell(this.mBox.childNodes[0].childNodes[0]);
|
||||||
|
|
||||||
// used to capture keydown at the document level
|
// used to capture keydown at the document level
|
||||||
|
|
@ -420,7 +431,7 @@
|
||||||
</resources>
|
</resources>
|
||||||
|
|
||||||
<content>
|
<content>
|
||||||
<xul:hbox class="colorpicker-button-colorbox" anonid="colorbox" flex="1" xbl:inherits="disabled"/>
|
<xul:image class="colorpicker-button-colorbox" anonid="colorbox" flex="1" xbl:inherits="disabled"/>
|
||||||
|
|
||||||
<xul:panel class="colorpicker-button-menupopup"
|
<xul:panel class="colorpicker-button-menupopup"
|
||||||
anonid="colorpopup" noautofocus="true" level="top"
|
anonid="colorpopup" noautofocus="true" level="top"
|
||||||
|
|
@ -441,7 +452,10 @@
|
||||||
return this.getAttribute("color");
|
return this.getAttribute("color");
|
||||||
]]></getter>
|
]]></getter>
|
||||||
<setter><![CDATA[
|
<setter><![CDATA[
|
||||||
this.mColorBox.style.backgroundColor = val;
|
this.mColorBox.setAttribute("src",
|
||||||
|
"data:image/svg+xml,<svg style='background-color: " +
|
||||||
|
encodeURIComponent(val) +
|
||||||
|
"' xmlns='http://www.w3.org/2000/svg' />");
|
||||||
this.setAttribute("color", val);
|
this.setAttribute("color", val);
|
||||||
return val;
|
return val;
|
||||||
]]></setter>
|
]]></setter>
|
||||||
|
|
@ -450,7 +464,10 @@
|
||||||
<method name="initialize">
|
<method name="initialize">
|
||||||
<body><![CDATA[
|
<body><![CDATA[
|
||||||
this.mColorBox = document.getAnonymousElementByAttribute(this, "anonid", "colorbox");
|
this.mColorBox = document.getAnonymousElementByAttribute(this, "anonid", "colorbox");
|
||||||
this.mColorBox.style.backgroundColor = this.color;
|
this.mColorBox.setAttribute("src",
|
||||||
|
"data:image/svg+xml,<svg style='background-color: " +
|
||||||
|
encodeURIComponent(this.color) +
|
||||||
|
"' xmlns='http://www.w3.org/2000/svg' />");
|
||||||
|
|
||||||
var popup = document.getAnonymousElementByAttribute(this, "anonid", "colorpopup")
|
var popup = document.getAnonymousElementByAttribute(this, "anonid", "colorpopup")
|
||||||
popup._colorPicker = this;
|
popup._colorPicker = this;
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче